Commit cef37723 authored by Manfred Kutas's avatar Manfred Kutas

ZP-1162 nginx config package for rhel/centos/suse/fedora.

Replaced tabs with spaces.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 971e295d
...@@ -13,11 +13,11 @@ BuildRoot: %_tmppath/%name-%version-build ...@@ -13,11 +13,11 @@ BuildRoot: %_tmppath/%name-%version-build
%if 0%{?suse_version} %if 0%{?suse_version}
%define apache_dir %_sysconfdir/apache2 %define apache_dir %_sysconfdir/apache2
%else %else
%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56" %if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56"
%define apache_dir /opt/rh/httpd24/root/etc/httpd/ %define apache_dir /opt/rh/httpd24/root/etc/httpd/
%else %else
%define apache_dir %_sysconfdir/httpd %define apache_dir %_sysconfdir/httpd
%endif %endif
%endif %endif
%description %description
...@@ -281,6 +281,15 @@ Requires: httpd ...@@ -281,6 +281,15 @@ Requires: httpd
%description -n %name-config-apache-autodiscover %description -n %name-config-apache-autodiscover
Z-push autodiscover apache configuration files 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 %prep
%setup -q %setup -q
...@@ -383,6 +392,10 @@ install -Dpm 644 config/apache2/z-push.conf \ ...@@ -383,6 +392,10 @@ install -Dpm 644 config/apache2/z-push.conf \
install -Dpm 644 config/apache2/z-push-autodiscover.conf \ install -Dpm 644 config/apache2/z-push-autodiscover.conf \
"$b/%apache_dir/conf.d/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 # MANPAGES
mkdir -p "$b/%_mandir/man1" mkdir -p "$b/%_mandir/man1"
cp man/*.1 "$b/%_mandir/man1" cp man/*.1 "$b/%_mandir/man1"
...@@ -402,6 +415,10 @@ cp man/*.1 "$b/%_mandir/man1" ...@@ -402,6 +415,10 @@ cp man/*.1 "$b/%_mandir/man1"
service httpd reload || true service httpd reload || true
%endif %endif
%post -n %name-config-nginx
ln -s "$b/%_sysconfdir/nginx/sites-available/z-push.conf" "$b/%_sysconfdir/nginx/sites-enabled/"
service nginx reload
%postun -n %name-config-apache %postun -n %name-config-apache
%if 0%{?suse_version} %if 0%{?suse_version}
service apache2 reload || true service apache2 reload || true
...@@ -416,16 +433,20 @@ cp man/*.1 "$b/%_mandir/man1" ...@@ -416,16 +433,20 @@ cp man/*.1 "$b/%_mandir/man1"
service httpd reload || true service httpd reload || true
%endif %endif
%postun -n %name-config-nginx
rm -f "$b/%_sysconfdir/nginx/sites-available/z-push.conf" "$b/%_sysconfdir/nginx/sites-enabled/"
service nginx reload
# COMMON # COMMON
%files -n %name-common %files -n %name-common
%defattr(-, root, root) %defattr(-, root, root)
%dir %_sysconfdir/z-push %dir %_sysconfdir/z-push
%if 0%{?suse_version} %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 %config(noreplace) %attr(0640,root,www) %_sysconfdir/z-push/z-push.conf.php
%else %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 %config(noreplace) %attr(0640,root,apache) %_sysconfdir/z-push/z-push.conf.php
%endif %endif
...@@ -631,4 +652,14 @@ cp man/*.1 "$b/%_mandir/man1" ...@@ -631,4 +652,14 @@ cp man/*.1 "$b/%_mandir/man1"
%dir %apache_dir/conf.d %dir %apache_dir/conf.d
%config(noreplace) %attr(0640,root,root) %apache_dir/conf.d/z-push-autodiscover.conf %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 %changelog
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment