Changes - j0ke.net Open Build Service

Changes of Revision 30

[-] [+]	Changed	nginx-1.2.spec
@@ -137,6 +137,7 @@ Source6: %{traffic_rate}-%{traffic_rate_hash}.tar.bz2 Source7: %{dav}.tar.bz2 Source8: %{rtmp}.tar.bz2 +Source20: nginx.service # PATCH-FIX-UPSTREAM nginx-0.4.0-no_Werror.patch Patch: nginx-0.4.0-no_Werror.patch @@ -274,19 +275,34 @@ # %{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name} %{__install} -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%if 0%{?has_systemd} +%{__install} -D -m 0644 %{S:20} %{buildroot}%{_unitdir}/nginx.service +%endif %{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name} %{__rm} %{buildroot}/srv/www/htdocs/index.html %post %fillup_and_insserv %{pkg_name} +%if 0%{?has_systemd} +%service_add_post nginx.service +%endif + %preun %stop_on_removal %{pkg_name} +%if 0%{?has_systemd} +%service_del_preun nginx.service +%endif + %postun %restart_on_update %{pkg_name} %{insserv_cleanup} +%if 0%{?has_systemd} +%service_del_postun nginx.service +%endif + %clean %{__rm} -rf %{buildroot} @@ -294,6 +310,10 @@ /usr/sbin/groupadd -r %{ngx_user_group} &>/dev/null \|\|: /usr/sbin/useradd -g %{ngx_user_group} -s /bin/false -r -c "user for %{ngx_user_group}" -d %{ngx_home} %{ngx_user_group} &>/dev/null \|\|: +%if 0%{?has_systemd} +%service_add_pre nginx.service +%endif + %files %defattr(-,root,root,-) %dir %{ngx_conf_dir}/ @@ -332,5 +352,8 @@ %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_uwsgi} %doc CHANGES* LICENSE README %doc conf/ contrib/ +%if 0%{?has_systemd} +%{_unitdir}/nginx.service +%endif %changelog
[-] [+]	Added	nginx.service ^
@@ -0,0 +1,14 @@ +[Unit] +Description=The nginx HTTP and reverse proxy server +After=syslog.target network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/sbin/nginx -t +ExecStart=/usr/sbin/nginx +ExecReload=/bin/kill -s HUP $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID + +[Install] +WantedBy=multi-user.target