Commit 487197fd authored by Sebastian Kummer's avatar Sebastian Kummer

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

* commit 'ef386019':
  ZP-1162 Do not reload nginx after installing Z-Push.
parents 2c27dcbd ef386019
...@@ -394,7 +394,6 @@ install -Dpm 644 config/apache2/z-push-autodiscover.conf \ ...@@ -394,7 +394,6 @@ install -Dpm 644 config/apache2/z-push-autodiscover.conf \
# NGINX # NGINX
mkdir -p "$b/%_sysconfdir/nginx/sites-available/"; mkdir -p "$b/%_sysconfdir/nginx/sites-available/";
mkdir -p "$b/%_sysconfdir/nginx/sites-enabled/";
install -Dpm 644 config/nginx/z-push.conf "$b/%_sysconfdir/nginx/sites-available/z-push.conf" install -Dpm 644 config/nginx/z-push.conf "$b/%_sysconfdir/nginx/sites-available/z-push.conf"
# MANPAGES # MANPAGES
...@@ -417,8 +416,7 @@ cp man/*.1 "$b/%_mandir/man1" ...@@ -417,8 +416,7 @@ cp man/*.1 "$b/%_mandir/man1"
%endif %endif
%post -n %name-config-nginx %post -n %name-config-nginx
ln -s "%_sysconfdir/nginx/sites-available/z-push.conf" "%_sysconfdir/nginx/sites-enabled/" echo -e "\033[0;33mEdit %_sysconfdir/nginx/sites-available/z-push.conf, enable it and reload nginx.\n\033[0m"
service nginx reload
%postun -n %name-config-apache %postun -n %name-config-apache
%if 0%{?suse_version} %if 0%{?suse_version}
......
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