Merge pull request #366 in ZP/z-push from...

Merge pull request #366 in ZP/z-push from bugfix/ZP-1044-wrong-create-user-in-logrotate-conf to develop

* commit 'e19f8b6b':
  ZP-1044 add separate logrotate file for rhel/rpm. Released under the Affero GNU General Public License (AGPL) version 3.

build/rpm/z-push.spec

@@ -267,8 +267,8 @@ 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.lr \
-    "$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";

config/z-push-rhel.lr

+/var/log/z-push/*.log {
+	size 1k
+	create apache apache
+	compress
+	rotate 4
+}