* [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd
@ 2012-07-18 18:59 Benedikt Boehm (hollow)
0 siblings, 0 replies; 6+ messages in thread
From: Benedikt Boehm (hollow) @ 2012-07-18 18:59 UTC (permalink / raw
To: gentoo-commits
hollow 12/07/18 18:59:46
Modified: nginx.initd
Log:
version bump. fixes #403921, #404239 and #421059
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.2 www-servers/nginx/files/nginx.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?r1=1.1&r2=1.2
Index: nginx.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nginx.initd 11 Feb 2012 10:17:30 -0000 1.1
+++ nginx.initd 18 Jul 2012 18:59:46 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.1 2012/02/11 10:17:30 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.2 2012/07/18 18:59:46 hollow Exp $
extra_commands="configtest"
extra_started_commands="upgrade reload"
@@ -15,7 +15,8 @@
command="/usr/sbin/nginx"
command_args="-c ${nginx_config}"
-pidfile="/var/run/nginx.pid"
+pidfile=${pidfile:-/var/run/nginx.pid}
+
depend() {
need net
@@ -76,6 +77,9 @@
}
configtest() {
+ mkdir -p /var/log/nginx || return 1
+ mkdir -p /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi} || return 1
+
ebegin "Checking nginx' configuration"
${command} -c ${nginx_config} -t -q
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd
@ 2012-11-26 8:12 Benedikt Boehm (hollow)
0 siblings, 0 replies; 6+ messages in thread
From: Benedikt Boehm (hollow) @ 2012-11-26 8:12 UTC (permalink / raw
To: gentoo-commits
hollow 12/11/26 08:12:11
Modified: nginx.initd
Log:
remove old versions and add some path checks to init script
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.3 www-servers/nginx/files/nginx.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?r1=1.2&r2=1.3
Index: nginx.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nginx.initd 18 Jul 2012 18:59:46 -0000 1.2
+++ nginx.initd 26 Nov 2012 08:12:11 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.2 2012/07/18 18:59:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.3 2012/11/26 08:12:11 hollow Exp $
extra_commands="configtest"
extra_started_commands="upgrade reload"
@@ -77,8 +77,8 @@
}
configtest() {
- mkdir -p /var/log/nginx || return 1
- mkdir -p /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi} || return 1
+ checkpath -d -m 0755 -o root:root /var/log/nginx
+ checkpath -d -m 0755 -o nginx:nginx /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
ebegin "Checking nginx' configuration"
${command} -c ${nginx_config} -t -q
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd
@ 2012-12-10 8:57 Benedikt Boehm (hollow)
0 siblings, 0 replies; 6+ messages in thread
From: Benedikt Boehm (hollow) @ 2012-12-10 8:57 UTC (permalink / raw
To: gentoo-commits
hollow 12/12/10 08:57:32
Modified: nginx.initd
Log:
fix #444726, #445930, #446668
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.4 www-servers/nginx/files/nginx.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?r1=1.3&r2=1.4
Index: nginx.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nginx.initd 26 Nov 2012 08:12:11 -0000 1.3
+++ nginx.initd 10 Dec 2012 08:57:32 -0000 1.4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.3 2012/11/26 08:12:11 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.4 2012/12/10 08:57:32 hollow Exp $
extra_commands="configtest"
extra_started_commands="upgrade reload"
@@ -11,12 +11,13 @@
description_upgrade="Upgrade the nginx binary without losing connections."
description_reload="Reload the nginx configuration without losing connections."
-nginx_config="/etc/nginx/nginx.conf"
+nginx_config=${nginx_config:-/etc/nginx/nginx.conf}
command="/usr/sbin/nginx"
command_args="-c ${nginx_config}"
pidfile=${pidfile:-/var/run/nginx.pid}
-
+user=${user:-nginx}
+group=${group:-nginx}
depend() {
need net
@@ -78,7 +79,7 @@
configtest() {
checkpath -d -m 0755 -o root:root /var/log/nginx
- checkpath -d -m 0755 -o nginx:nginx /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
+ checkpath -d -m 0755 -o ${user}:${group} /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
ebegin "Checking nginx' configuration"
${command} -c ${nginx_config} -t -q
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd
@ 2012-12-20 8:11 Benedikt Boehm (hollow)
0 siblings, 0 replies; 6+ messages in thread
From: Benedikt Boehm (hollow) @ 2012-12-20 8:11 UTC (permalink / raw
To: gentoo-commits
hollow 12/12/20 08:11:46
Modified: nginx.initd
Log:
fix #446734
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.5 www-servers/nginx/files/nginx.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?r1=1.4&r2=1.5
Index: nginx.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nginx.initd 10 Dec 2012 08:57:32 -0000 1.4
+++ nginx.initd 20 Dec 2012 08:11:46 -0000 1.5
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.4 2012/12/10 08:57:32 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.5 2012/12/20 08:11:46 hollow Exp $
extra_commands="configtest"
extra_started_commands="upgrade reload"
@@ -78,8 +78,8 @@
}
configtest() {
- checkpath -d -m 0755 -o root:root /var/log/nginx
- checkpath -d -m 0755 -o ${user}:${group} /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
+ checkpath -q -d -m 0755 -o root:root /var/log/nginx
+ checkpath -q -d -m 0755 -o ${user}:${group} /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
ebegin "Checking nginx' configuration"
${command} -c ${nginx_config} -t -q
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd
@ 2012-12-27 6:56 Benedikt Boehm (hollow)
0 siblings, 0 replies; 6+ messages in thread
From: Benedikt Boehm (hollow) @ 2012-12-27 6:56 UTC (permalink / raw
To: gentoo-commits
hollow 12/12/27 06:56:27
Modified: nginx.initd
Log:
fix #448712
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.6 www-servers/nginx/files/nginx.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?r1=1.5&r2=1.6
Index: nginx.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nginx.initd 20 Dec 2012 08:11:46 -0000 1.5
+++ nginx.initd 27 Dec 2012 06:56:27 -0000 1.6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.5 2012/12/20 08:11:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.6 2012/12/27 06:56:27 hollow Exp $
extra_commands="configtest"
extra_started_commands="upgrade reload"
@@ -79,6 +79,7 @@
configtest() {
checkpath -q -d -m 0755 -o root:root /var/log/nginx
+ checkpath -q -d -m 0755 -o ${user}:${group} /var/tmp/nginx
checkpath -q -d -m 0755 -o ${user}:${group} /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
ebegin "Checking nginx' configuration"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd
@ 2013-03-31 1:55 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-03-31 1:55 UTC (permalink / raw
To: gentoo-commits
robbat2 13/03/31 01:55:20
Modified: nginx.initd
Log:
Version bump per bug #456224, as requested by actown@osuosl.org.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path
1.7 www-servers/nginx/files/nginx.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.initd?r1=1.6&r2=1.7
Index: nginx.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v
retrieving revision 1.6
retrieving revision 1.7
diff -p -w -b -B -u -u -r1.6 -r1.7
--- nginx.initd 27 Dec 2012 06:56:27 -0000 1.6
+++ nginx.initd 31 Mar 2013 01:55:20 -0000 1.7
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.6 2012/12/27 06:56:27 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.7 2013/03/31 01:55:20 robbat2 Exp $
extra_commands="configtest"
extra_started_commands="upgrade reload"
@@ -15,7 +15,7 @@ nginx_config=${nginx_config:-/etc/nginx/
command="/usr/sbin/nginx"
command_args="-c ${nginx_config}"
-pidfile=${pidfile:-/var/run/nginx.pid}
+pidfile=${pidfile:-/run/nginx.pid}
user=${user:-nginx}
group=${group:-nginx}
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-31 1:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-10 8:57 [gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.initd Benedikt Boehm (hollow)
-- strict thread matches above, loose matches on Subject: below --
2013-03-31 1:55 Robin H. Johnson (robbat2)
2012-12-27 6:56 Benedikt Boehm (hollow)
2012-12-20 8:11 Benedikt Boehm (hollow)
2012-11-26 8:12 Benedikt Boehm (hollow)
2012-07-18 18:59 Benedikt Boehm (hollow)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox