Request 2027 (accepted)

Overview

Request 2027 (accepted)

Fix log rotation on Plesk systems

Created by vanmeeuwen over 7 years ago
In state accepted

Submit chwala

Submit package Kolab:Winterfell / chwala to package Kolab:16 / chwala

chwala.spec Changed

@@ -23,10 +23,16 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
+%if 0%{?plesk}
+%global httpd_group roundcube_sysgroup
+%global httpd_name httpd
+%global httpd_user roundcube_sysuser
+%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
+%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
@@ -47,8 +53,14 @@
 
 Requires:       php-pear(HTTP_Request2)
 Requires:       php-Smarty >= 3.1.7
+
+Requires(post): roundcubemail(core)
+
+%if 0%{?plesk} < 1
 Requires:       roundcubemail
 Requires:       roundcubemail-plugins-kolab
+%endif
+
 %if 0%{?suse_version}
 Requires:       http_daemon
 %else
@@ -75,16 +87,24 @@
 
 %install
 mkdir -p \
+%if 0%{?plesk} < 1
     %{buildroot}/%{_ap_sysconfdir}/conf.d \
+%endif
     %{buildroot}/%{_datadir}/%{name} \
     %{buildroot}/%{_localstatedir}/cache/%{name} \
     %{buildroot}/%{_localstatedir}/lib/%{name} \
     %{buildroot}/%{_localstatedir}/log/%{name}
 
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cp -pr %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/chwala
+
+%if 0%{?plesk} < 1
 install -pm 644 doc/chwala.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/chwala.conf
 
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/chwala
+sed -i \
+    -e 's/apache apache/%{httpd_user} %{httpd_group}/g' \
+    %{buildroot}%{_sysconfdir}/logrotate.d/chwala
+%endif
 
 rm -rf public_html/skins/default/images/mimetypes/_css.sh
 cp -a lib public_html %{buildroot}/usr/share/%{name}
@@ -103,7 +123,9 @@
 
 pushd lib/drivers/kolab/plugins
 rm -rf kolab_auth kolab_folders libkolab
+%if 0%{?plesk} < 1
 ln -s ../../../../../roundcubemail/plugins/kolab_auth kolab_auth
+%endif
 ln -s ../../../../../roundcubemail/plugins/kolab_folders kolab_folders
 ln -s ../../../../../roundcubemail/plugins/libkolab libkolab
 popd
@@ -133,7 +155,9 @@
 
 %files
 %doc README.md LICENSE doc/SQL/
+%if 0%{?plesk} < 1
 %{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_datadir}/%{name}
 %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/cache/%{name}
@@ -141,6 +165,9 @@
 %attr(0750,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Wed May 10 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5-0.2.git
+- Fix log rotation on Plesk systems
+
 * Tue Nov 15 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5-0.1.git
 - Check in 0.5 snapshot
 
@@ -156,9 +183,6 @@
 * Sun Jan 11 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.3.0-1
 - Release of version 0.3.0
 
-* Thu Feb 25 2014 Daniel Hoffend <dh@dotlan.net> - 0.2-4
-- applied fix for recent libkolab changes
-
 * Thu Jan 23 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2-3
 - Correct any suhosin.session.encrypt setting using .htaccess
 - Correct source of chwala.conf

chwala.dsc Changed

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.tar.gz/postinst Changed

@@ -3,10 +3,13 @@
 set -e
 
 fixperms() {
-    chown -R www-data:adm \
+    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")
+    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")
+    chown -R ${user}:${group} \
         /var/cache/chwala \
         /var/lib/chwala \
         /var/log/chwala
+
     chmod 750 \
         /var/cache/chwala \
         /var/lib/chwala \
@@ -26,11 +29,15 @@
 case "$1" in
     configure)
         fixperms
-        a2enmod rewrite >/dev/null 2>&1 || true
-        if [ -e "/etc/apache2/sites-available/chwala.conf" -a ! -e "/etc/apache2/sites-enabled/chwala.conf" ]; then
-            a2ensite chwala.conf
+        if [ ! -f "/etc/plesk-release" ]; then
+            a2enmod rewrite >/dev/null 2>&1 || true
+
+            if [ -e "/etc/apache2/sites-available/chwala.conf" -a ! -e "/etc/apache2/sites-enabled/chwala.conf" ]; then
+                a2ensite chwala.conf
+            fi
+
+            reload_apache reload
         fi
-        reload_apache reload
     ;;
 esac

Build Results
RPM Lint

Refresh

Comments for request 2027 0

Request History

vanmeeuwen created request over 7 years ago

Fix log rotation on Plesk systems

vanmeeuwen accepted review over 7 years ago

vanmeeuwen approved review over 7 years ago

vanmeeuwen accepted review over 7 years ago

vanmeeuwen accepted request over 7 years ago