The nginx-debug package was eliminated. While here: - openSUSE/SLES 11 support was removed; - multiple nginx instances support was added for Debian/Ubuntu.
diff --git a/debian/control b/debian/control index 9210de6..f790f00 100644 --- a/debian/control +++ b/debian/control
@@ -14,14 +14,6 @@ nginx [engine x] is an HTTP and reverse proxy server, as well as a mail proxy server. -Package: nginx-debug -Architecture: any -Section: debug -Priority: extra -Depends: ${misc:Depends}, ${shlibs:Depends}, nginx (= ${binary:Version}) -Description: debug version of nginx - Not stripped version of nginx built with the debugging log support. - Package: nginx-dbg Architecture: any Section: debug
diff --git a/debian/init.d b/debian/init.d.in similarity index 87% rename from debian/init.d rename to debian/init.d.in index a3de474..eb0b0bb 100644 --- a/debian/init.d +++ b/debian/init.d.in
@@ -1,29 +1,37 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: nginx +# Provides: %%PROVIDES%% # Required-Start: $network $remote_fs $local_fs # Required-Stop: $network $remote_fs $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Start: %%DEFAULTSTART%% +# Default-Stop: %%DEFAULTSTOP%% # Short-Description: Stop/start nginx ### END INIT INFO # Author: Sergey Budnevitch <sb@nginx.com> PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=nginx -NAME=nginx -CONFFILE=/etc/nginx/nginx.conf -DAEMON=/usr/sbin/nginx -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME + +if [ -L $0 ]; then + SCRIPTNAME=`/bin/readlink -f $0` +else + SCRIPTNAME=$0 +fi + +sysconfig=`/usr/bin/basename $SCRIPTNAME` + +[ -r /etc/default/$sysconfig ] && . /etc/default/$sysconfig + +DESC=${DESC-%%PROVIDES%%} +NAME=${NAME-%%PROVIDES%%} +CONFFILE=${CONFFILE-/etc/nginx/nginx.conf} +DAEMON=${DAEMON-/usr/sbin/%%PROVIDES%%} +PIDFILE=${PIDFILE-/var/run/nginx.pid} SLEEPSEC=1 UPGRADEWAITLOOPS=5 [ -x $DAEMON ] || exit 0 -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - DAEMON_ARGS="-c $CONFFILE $DAEMON_ARGS" . /lib/init/vars.sh
diff --git a/debian/nginx-debug.default b/debian/nginx-debug.default new file mode 100644 index 0000000..c514ef7 --- /dev/null +++ b/debian/nginx-debug.default
@@ -0,0 +1,8 @@ +# Defaults for nginx initscript +# sourced by /etc/init.d/nginx-debug +NAME="nginx-debug" +DESC="nginx-debug" +DAEMON="/usr/sbin/nginx-debug" + +# Additional options that are passed to nginx +DAEMON_OPTS=""
diff --git a/debian/nginx-debug.install b/debian/nginx-debug.install deleted file mode 100644 index 333858c..0000000 --- a/debian/nginx-debug.install +++ /dev/null
@@ -1 +0,0 @@ -objs/nginx.debug usr/sbin
diff --git a/debian/rules b/debian/rules index cc9225b..6db3066 100755 --- a/debian/rules +++ b/debian/rules
@@ -13,11 +13,11 @@ override_dh_auto_configure: configure_debug override_dh_strip: - dh_strip -Xdebug --dbg-package=nginx-dbg + dh_strip --dbg-package=nginx-dbg override_dh_auto_build: dh_auto_build - mv objs/nginx objs/nginx.debug + mv objs/nginx objs/nginx-debug CFLAGS="" ./configure \ --prefix=/etc/nginx \ --sbin-path=/usr/sbin/nginx \ @@ -100,7 +100,18 @@ --with-debug override_dh_auto_install: + sed -e 's/%%PROVIDES%%/nginx/g' \ + -e 's/%%DEFAULTSTART%%/2 3 4 5/g' \ + -e 's/%%DEFAULTSTOP%%/0 1 6/g' \ + < debian/init.d.in > debian/init.d dh_auto_install + mkdir -p debian/nginx/etc/init.d debian/nginx/etc/default + sed -e 's/%%PROVIDES%%/nginx-debug/g' \ + -e 's/%%DEFAULTSTART%%//g' \ + -e 's/%%DEFAULTSTOP%%/0 1 2 3 4 5 6/g' \ + < debian/init.d.in > debian/debug.init.d + /usr/bin/install -m 755 debian/debug.init.d debian/nginx/etc/init.d/nginx-debug + /usr/bin/install -m 644 debian/nginx-debug.default debian/nginx/etc/default/nginx-debug /usr/bin/install -m 644 debian/nginx.conf debian/nginx/etc/nginx/ /usr/bin/install -m 644 conf/win-utf debian/nginx/etc/nginx/ /usr/bin/install -m 644 conf/koi-utf debian/nginx/etc/nginx/ @@ -113,3 +124,8 @@ /usr/bin/install -m 644 html/50x.html debian/nginx/usr/share/nginx/html/ /usr/bin/install -m 644 debian/nginx.vh.default.conf debian/nginx/etc/nginx/conf.d/default.conf /usr/bin/install -m 755 objs/nginx debian/nginx/usr/sbin/ + /usr/bin/install -m 755 objs/nginx-debug debian/nginx/usr/sbin/ + +override_dh_clean: + dh_clean + rm -f debian/*init.d
diff --git a/rpm/SOURCES/nginx-debug.service b/rpm/SOURCES/nginx-debug.service new file mode 100644 index 0000000..94dd62b --- /dev/null +++ b/rpm/SOURCES/nginx-debug.service
@@ -0,0 +1,16 @@ +[Unit] +Description=nginx - high performance web server +Documentation=http://nginx.org/en/docs/ +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/sbin/nginx-debug -t -c /etc/nginx/nginx.conf +ExecStart=/usr/sbin/nginx-debug -c /etc/nginx/nginx.conf +ExecReload=/bin/kill -s HUP $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID +PrivateTmp=true + +[Install] +WantedBy=multi-user.target
diff --git a/rpm/SOURCES/nginx-debug.sysconf b/rpm/SOURCES/nginx-debug.sysconf new file mode 100644 index 0000000..f79b453 --- /dev/null +++ b/rpm/SOURCES/nginx-debug.sysconf
@@ -0,0 +1,5 @@ +# Configuration file for the nginx-debug service. + +NGINX=/usr/sbin/nginx-debug +CONFFILE=/etc/nginx/nginx.conf +LOCKFILE=/var/lock/subsys/nginx-debug
diff --git a/rpm/SOURCES/nginx.init b/rpm/SOURCES/nginx.init.in similarity index 90% rename from rpm/SOURCES/nginx.init rename to rpm/SOURCES/nginx.init.in index d592617..609afee 100755 --- a/rpm/SOURCES/nginx.init +++ b/rpm/SOURCES/nginx.init.in
@@ -3,18 +3,18 @@ # nginx Startup script for nginx # # chkconfig: - 85 15 -# processname: nginx +# processname: %PROVIDES% # config: /etc/nginx/nginx.conf -# config: /etc/sysconfig/nginx +# config: /etc/sysconfig/%PROVIDES% # pidfile: /var/run/nginx.pid # description: nginx is an HTTP and reverse proxy server # ### BEGIN INIT INFO -# Provides: nginx +# Provides: %PROVIDES% # Required-Start: $local_fs $remote_fs $network # Required-Stop: $local_fs $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Start: %DEFAULTSTART% +# Default-Stop: %DEFAULTSTOP% # Short-Description: start and stop nginx ### END INIT INFO @@ -33,10 +33,10 @@ . /etc/sysconfig/$sysconfig fi -nginx=${NGINX-/usr/sbin/nginx} +nginx=${NGINX-/usr/sbin/%PROVIDES%} prog=`/bin/basename $nginx` conffile=${CONFFILE-/etc/nginx/nginx.conf} -lockfile=${LOCKFILE-/var/lock/subsys/nginx} +lockfile=${LOCKFILE-/var/lock/subsys/%PROVIDES%} pidfile=${PIDFILE-/var/run/nginx.pid} SLEEPMSEC=${SLEEPMSEC-200000} UPGRADEWAITLOOPS=${UPGRADEWAITLOOPS-5} @@ -107,7 +107,7 @@ } rh_status() { - status -p ${pidfile} ${nginx} + status -p ${pidfile} -b ${nginx} ${nginx} } # See how we were called.
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec index 7c72243..f66daa3 100644 --- a/rpm/SPECS/nginx.spec +++ b/rpm/SPECS/nginx.spec
@@ -37,13 +37,6 @@ %define with_http2 1 %endif -%if 0%{?suse_version} == 1110 -Group: Productivity/Networking/Web/Servers -BuildRequires: libopenssl-devel -Requires(pre): pwdutils -%define nginx_loggroup trusted -%endif - %if 0%{?suse_version} == 1315 Group: Productivity/Networking/Web/Servers BuildRequires: libopenssl-devel @@ -65,14 +58,15 @@ Source0: http://nginx.org/download/%{name}-%{version}.tar.gz Source1: logrotate -Source2: nginx.init +Source2: nginx.init.in Source3: nginx.sysconf Source4: nginx.conf Source5: nginx.vh.default.conf -Source7: nginx.suse.init +Source7: nginx-debug.sysconf Source8: nginx.service Source9: nginx.upgrade.sh Source10: nginx.suse.logrotate +Source11: nginx-debug.service License: 2-clause BSD-like license @@ -86,19 +80,17 @@ nginx [engine x] is an HTTP and reverse proxy server, as well as a mail proxy server. -%package debug -Summary: debug version of nginx -Group: System Environment/Daemons -Requires: nginx -%description debug -Not stripped version of nginx built with the debugging log support. - %if 0%{?suse_version} == 1315 %debug_package %endif %prep %setup -q +cp %{SOURCE2} . +sed -e 's|%%DEFAULTSTART%%|2 3 4 5|g' -e 's|%%DEFAULTSTOP%%|0 1 6|g' \ + -e 's|%%PROVIDES%%|nginx|g' < %{SOURCE2} > nginx.init +sed -e 's|%%DEFAULTSTART%%||g' -e 's|%%DEFAULTSTOP%%|0 1 2 3 4 5 6|g' \ + -e 's|%%PROVIDES%%|nginx-debug|g' < %{SOURCE2} > nginx-debug.init %build ./configure \ @@ -142,7 +134,7 @@ $* make %{?_smp_mflags} %{__mv} %{_builddir}/%{name}-%{version}/objs/nginx \ - %{_builddir}/%{name}-%{version}/objs/nginx.debug + %{_builddir}/%{name}-%{version}/objs/nginx-debug ./configure \ --prefix=%{_sysconfdir}/nginx \ --sbin-path=%{_sbindir}/nginx \ @@ -207,25 +199,24 @@ %{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig %{__install} -m 644 -p %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nginx +%{__install} -m 644 -p %{SOURCE7} \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nginx-debug %if %{use_systemd} # install systemd-specific files %{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir} %{__install} -m644 %SOURCE8 \ $RPM_BUILD_ROOT%{_unitdir}/nginx.service +%{__install} -m644 %SOURCE11 \ + $RPM_BUILD_ROOT%{_unitdir}/nginx-debug.service %{__mkdir} -p $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/nginx %{__install} -m755 %SOURCE9 \ $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/nginx/upgrade %else # install SYSV init stuff %{__mkdir} -p $RPM_BUILD_ROOT%{_initrddir} -%if 0%{?suse_version} == 1110 -%{__install} -m755 %{SOURCE7} \ - $RPM_BUILD_ROOT%{_initrddir}/nginx -%else -%{__install} -m755 %{SOURCE2} \ - $RPM_BUILD_ROOT%{_initrddir}/nginx -%endif +%{__install} -m755 nginx.init $RPM_BUILD_ROOT%{_initrddir}/nginx +%{__install} -m755 nginx-debug.init $RPM_BUILD_ROOT%{_initrddir}/nginx-debug %endif # install log rotation stuff @@ -238,8 +229,8 @@ $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/nginx %endif -%{__install} -m644 %{_builddir}/%{name}-%{version}/objs/nginx.debug \ - $RPM_BUILD_ROOT%{_sbindir}/nginx.debug +%{__install} -m755 %{_builddir}/%{name}-%{version}/objs/nginx-debug \ + $RPM_BUILD_ROOT%{_sbindir}/nginx-debug %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -248,6 +239,7 @@ %defattr(-,root,root) %{_sbindir}/nginx +%{_sbindir}/nginx-debug %dir %{_sysconfdir}/nginx %dir %{_sysconfdir}/nginx/conf.d @@ -264,12 +256,15 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/nginx %config(noreplace) %{_sysconfdir}/sysconfig/nginx +%config(noreplace) %{_sysconfdir}/sysconfig/nginx-debug %if %{use_systemd} %{_unitdir}/nginx.service +%{_unitdir}/nginx-debug.service %dir %{_libexecdir}/initscripts/legacy-actions/nginx %{_libexecdir}/initscripts/legacy-actions/nginx/* %else %{_initrddir}/nginx +%{_initrddir}/nginx-debug %endif %dir %{_datadir}/nginx @@ -279,9 +274,6 @@ %attr(0755,root,root) %dir %{_localstatedir}/cache/nginx %attr(0755,root,root) %dir %{_localstatedir}/log/nginx -%files debug -%attr(0755,root,root) %{_sbindir}/nginx.debug - %pre # Add the "nginx" user getent group %{nginx_group} >/dev/null || groupadd -r %{nginx_group} @@ -295,8 +287,10 @@ if [ $1 -eq 1 ]; then %if %{use_systemd} /usr/bin/systemctl preset nginx.service >/dev/null 2>&1 ||: + /usr/bin/systemctl preset nginx-debug.service >/dev/null 2>&1 ||: %else /sbin/chkconfig --add nginx + /sbin/chkconfig --add nginx-debug %endif # print site info cat <<BANNER @@ -338,6 +332,7 @@ %else /sbin/service nginx stop > /dev/null 2>&1 /sbin/chkconfig --del nginx + /sbin/chkconfig --del nginx-debug %endif fi