Kolab Groupware OBS

Changes of Revision 9

kolab-webadmin.spec Changed

@@ -7,9 +7,13 @@
 %endif
 
 %if 0%{?suse_version}
+%global httpd_group www
 %global httpd_name apache2
+%global httpd_user wwwrun
 %else
+%global httpd_group apache
 %global httpd_name httpd
+%global httpd_user apache
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
@@ -94,7 +98,7 @@
     useradd -r -u %{kolab_user_id} -g %{kolab_group} -d %{_localstatedir}/lib/%{kolab_user} -s /sbin/nologin \
         -c "Kolab System Account" %{kolab_user} &>/dev/null || :
 
-gpasswd -a apache kolab >/dev/null 2>&1 || :
+gpasswd -a %{httpd_user} kolab >/dev/null 2>&1 || :
 
 # Previous versions of kolab-webadmin installed separate directories for public_html/ and hosted/*,
 # that are now merged in to public_html/. For the sake of being able to serve up hosted/ and not
@@ -134,8 +138,8 @@
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
 %config(noreplace) %{_ap_sysconfdir}/conf.d/hosted-kolab.conf
 %{_datadir}/%{name}
-%attr(0770,apache,apache) %{_var}/cache/%{name}
-%attr(0770,apache,apache) %{_var}/log/%{name}
+%attr(0770,%{httpd_user},%{httpd_group}) %{_var}/cache/%{name}
+%attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
 * Fri Jul 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1-0.1