ZP-1046 move logrotate config into config-apache packages. Released under the...

ZP-1046 move logrotate config into config-apache packages. Released under the Affero GNU General Public License (AGPL) version 3.

build/deb/debian.z-push-common.install

@@ -7,5 +7,3 @@ vendor             /usr/share/z-push/
 version.php        /usr/share/z-push/
 z-push-admin.php   /usr/share/z-push/
 z-push-top.php     /usr/share/z-push/
-
-config/z-push.lr   etc/logrotate.d/

build/deb/debian.z-push-config-apache.install

 config/apache2/z-push.conf /etc/apache2/conf-available/
+config/z-push.lr           /etc/logrotate.d/

build/rpm/z-push.spec

@@ -266,9 +266,6 @@ ln -s "%zpush_dir/z-push-top.php" "$b/%_bindir/z-push-top";
 
 mkdir -p "$b/%_localstatedir/lib/z-push";
 mkdir -p "$b/%_localstatedir/log/z-push";
-mkdir -p "$b/%_sysconfdir/logrotate.d";
-install -Dpm 644 config/z-push-rhel.lr \
-    "$b/%_sysconfdir/logrotate.d/z-push.lr"
 
 # CALDAV
 mv "$bdir/caldav/config.php" "$cdir/caldav.conf.php";
@@ -323,6 +320,9 @@ install -Dpm 644 config/apache2/z-push.conf \
     "$b/%apache_dir/conf.d/z-push.conf";
 install -Dpm 644 config/apache2/z-push-autodiscover.conf \
     "$b/%apache_dir/conf.d/z-push-autodiscover.conf";
+mkdir -p "$b/%_sysconfdir/logrotate.d";
+install -Dpm 644 config/z-push-rhel.lr \
+    "$b/%_sysconfdir/logrotate.d/z-push.lr"
 
 %post -n %name-config-apache
 %if 0%{?suse_version}