Merge pull request #596 in ZP/z-push from feature/ZP-1162-create-a-nginx-config-package to develop

* commit '1696d11f':
  ZP-1162 nginx config package for rhel/centos/suse/fedora.
  ZP-1162 nginx config package for rhel/centos/suse/fedora. Replaced tabs with spaces.
  ZP-1162 nginx config package for debian/ubuntu.

build/deb/debian.control

@@ -113,3 +113,9 @@ Architecture: all
 Depends: ${misc:Depends}, z-push-autodiscover (= ${binary:Version}), apache2, libapache2-mod-php | libapache2-mod-php5
 Description: Z-Push autodiscover apache configuration
  Z-push autodiscover apache configuration files
+
+Package: z-push-config-nginx
+Architecture: all
+Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), nginx, nginx-common
+Description: Z-Push nginx configuration
+ Z-push nginx configuration files
\ No newline at end of file

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

+config/nginx/z-push.conf /etc/nginx/sites-available/
\ No newline at end of file

build/deb/debian.z-push-config-nginx.postinst

+#!/bin/sh
+# postinst script for z-push-config-nginx
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Use debconf
+. /usr/share/debconf/confmodule
+
+set_perms() {
+        USER=$1
+        GROUP=$2
+        MODE=$3
+        FILE=$4
+        if ! dpkg-statoverride --list $FILE > /dev/null 2>&1; then
+            chown -R $USER:$GROUP $FILE
+            chmod -R $MODE $FILE
+        fi
+}
+
+case "$1" in
+    configure|reconfigure)
+        # Get nginx user and its default group
+        USER=`grep user /etc/nginx/nginx.conf | awk '{gsub(";", ""); print $2}'`
+        GROUP=`id -gn $USER`
+        # Set permissions
+        set_perms $USER $GROUP 700 /var/lib/z-push
+        set_perms $USER $GROUP 700 /var/log/z-push
+
+        if [ -f /etc/nginx/sites-available/z-push.conf ]; then
+            ln -s /etc/nginx/sites-available/z-push.conf /etc/nginx/sites-enabled/
+            service nginx reload
+        fi
+        ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+        ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
\ No newline at end of file

build/deb/debian.z-push-config-nginx.postrm

+#!/bin/sh
+# postrm script for z-push-config-nginx
+
+set -e
+
+# Use debconf
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    purge|abort-install)
+        if [ -f /etc/nginx/sites-available/z-push.conf ]; then
+            echo "Remove /etc/nginx/sites-available/z-push.conf and restart nginx"
+            rm /etc/nginx/sites-enabled/z-push.conf
+            rm /etc/nginx/sites-available/z-push.conf
+            ucf --purge /etc/nginx/sites-available/z-push.conf
+            service nginx reload
+        fi
+        ;;
+
+    remove|upgrade|failed-upgrade|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0

build/rpm/z-push.spec

@@ -13,11 +13,11 @@ BuildRoot:  %_tmppath/%name-%version-build
 %if 0%{?suse_version}
     %define apache_dir %_sysconfdir/apache2
 %else
-	%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
-		%define apache_dir /opt/rh/httpd24/root/etc/httpd/
-	%else
-		%define apache_dir %_sysconfdir/httpd
-	%endif
+    %if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
+        %define apache_dir /opt/rh/httpd24/root/etc/httpd/
+    %else
+        %define apache_dir %_sysconfdir/httpd
+    %endif
 %endif
 
 %description
@@ -281,6 +281,15 @@ Requires:   httpd
 %description -n %name-config-apache-autodiscover
 Z-push autodiscover apache configuration files
 
+# CONFIG NGINX
+%package -n %name-config-nginx
+Summary:    Z-Push nginx configuration
+Group:      Productivity/Networking/Email/Utilities
+Requires:   nginx
+
+%description -n %name-config-nginx
+Z-push nginx configuration files
+
 %prep
 %setup -q
 
@@ -383,6 +392,10 @@ install -Dpm 644 config/apache2/z-push.conf \
 install -Dpm 644 config/apache2/z-push-autodiscover.conf \
     "$b/%apache_dir/conf.d/z-push-autodiscover.conf";
 
+# NGINX
+mkdir -p "$b/%_sysconfdir/nginx/sites-available/";
+install -Dpm 644 config/nginx/z-push.conf "$b/%_sysconfdir/nginx/sites-available/z-push.conf"
+
 # MANPAGES
 mkdir -p "$b/%_mandir/man1"
 cp man/*.1 "$b/%_mandir/man1"
@@ -402,6 +415,10 @@ cp man/*.1 "$b/%_mandir/man1"
     service httpd reload || true
 %endif
 
+%post -n %name-config-nginx
+ln -s "%_sysconfdir/nginx/sites-available/z-push.conf" "%_sysconfdir/nginx/sites-enabled/"
+service nginx reload
+
 %postun -n %name-config-apache
 %if 0%{?suse_version}
     service apache2 reload || true
@@ -416,16 +433,20 @@ cp man/*.1 "$b/%_mandir/man1"
     service httpd reload || true
 %endif
 
+%postun -n %name-config-nginx
+rm -f "%_sysconfdir/nginx/sites-available/z-push.conf" "%_sysconfdir/nginx/sites-enabled/"
+service nginx reload
+
 # COMMON
 %files -n %name-common
 %defattr(-, root, root)
 %dir %_sysconfdir/z-push
 
 %if 0%{?suse_version}
-	%config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/policies.ini
+    %config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/policies.ini
     %config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/z-push.conf.php
 %else
-	%config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/policies.ini
+    %config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/policies.ini
     %config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/z-push.conf.php
 %endif
 
@@ -631,4 +652,14 @@ cp man/*.1 "$b/%_mandir/man1"
 %dir %apache_dir/conf.d
 %config(noreplace) %attr(0640,root,root) %apache_dir/conf.d/z-push-autodiscover.conf
 
+# NGINX CONFIG
+%files -n %name-config-nginx
+%dir %_sysconfdir/nginx
+%dir %_sysconfdir/nginx/sites-available
+%dir %_sysconfdir/nginx/sites-enabled
+%config(noreplace) %attr(0640,nginx,nginx) %_sysconfdir/nginx/sites-available/z-push.conf
+%config(noreplace) %attr(0640,nginx,nginx) %_sysconfdir/z-push/*.php
+%attr(750,nginx,nginx) %dir %_localstatedir/lib/z-push
+%attr(750,nginx,nginx) %dir %_localstatedir/log/z-push
+
 %changelog