diff options
| -rw-r--r-- | etc/bgpd.conf | 4 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 7 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplg.8 | 8 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplg.c | 4 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplgsh.8 | 10 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplgsh.c | 4 | ||||
| -rw-r--r-- | usr.sbin/nginx/conf/nginx.conf | 4 | ||||
| -rw-r--r-- | usr.sbin/slowcgi/slowcgi.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/slowcgi/slowcgi.c | 4 |
9 files changed, 28 insertions, 23 deletions
diff --git a/etc/bgpd.conf b/etc/bgpd.conf index 1542fb53d8f..977cbb0c52b 100644 --- a/etc/bgpd.conf +++ b/etc/bgpd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: bgpd.conf,v 1.13 2012/04/27 12:02:47 phessler Exp $ +# $OpenBSD: bgpd.conf,v 1.14 2013/06/02 14:11:38 florian Exp $ # sample bgpd configuration file # see bgpd.conf(5) @@ -19,7 +19,7 @@ router-id 10.0.0.1 # network 10.0.1.0/24 # restricted socket for bgplg(8) -# socket "/var/www/logs/bgpd.rsock" restricted +# socket "/var/www/run/bgpd.rsock" restricted # neighbors and peers group "peering AS65002" { diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index 582cf2b28f5..81f66e4639b 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.230 2013/06/01 20:07:11 stsp Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.231 2013/06/02 14:11:38 florian Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -1479,6 +1479,11 @@ bin type=dir uname=root gname=daemon mode=755 #./www/bin .. +#./www/run +run type=dir uname=root gname=daemon mode=755 +#./www/run +.. + #./www .. diff --git a/usr.bin/bgplg/bgplg.8 b/usr.bin/bgplg/bgplg.8 index b9f5e1d80b9..2d96a367376 100644 --- a/usr.bin/bgplg/bgplg.8 +++ b/usr.bin/bgplg/bgplg.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bgplg.8,v 1.10 2013/06/01 18:47:55 reyk Exp $ +.\" $OpenBSD: bgplg.8,v 1.11 2013/06/02 14:11:38 florian Exp $ .\" .\" Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 1 2013 $ +.Dd $Mdocdate: June 2 2013 $ .Dt BGPLG 8 .Os .Sh NAME @@ -103,7 +103,7 @@ to have .Xr bgpd 8 open a second, restricted, control socket: .Pp -.Dl socket \&"/var/www/logs/bgpd.rsock\&" restricted +.Dl socket \&"/var/www/run/bgpd.rsock\&" restricted .It Start the Apache HyperText Transfer Protocol server. See @@ -124,7 +124,7 @@ HTML header. Optional .Nm HTML footer. -.It Pa /var/www/logs/bgpd.rsock +.It Pa /var/www/run/bgpd.rsock Position of the second, restricted, control socket of .Xr bgpd 8 . .El diff --git a/usr.bin/bgplg/bgplg.c b/usr.bin/bgplg/bgplg.c index a855424ca3b..dc4007abb61 100644 --- a/usr.bin/bgplg/bgplg.c +++ b/usr.bin/bgplg/bgplg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgplg.c,v 1.10 2013/06/01 18:47:55 reyk Exp $ */ +/* $OpenBSD: bgplg.c,v 1.11 2013/06/02 14:11:38 florian Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> @@ -35,7 +35,7 @@ #define INC_HEAD "/conf/bgplg.head" #define INC_FOOT "/conf/bgplg.foot" -#define BGPDSOCK "/logs/bgpd.rsock" +#define BGPDSOCK "/run/bgpd.rsock" #define BGPCTL "/bin/bgpctl", "-s", BGPDSOCK #define PING "/bin/ping" #define TRACEROUTE "/bin/traceroute" diff --git a/usr.bin/bgplg/bgplgsh.8 b/usr.bin/bgplg/bgplgsh.8 index cc5d140551f..5d7c4872548 100644 --- a/usr.bin/bgplg/bgplgsh.8 +++ b/usr.bin/bgplg/bgplgsh.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bgplgsh.8,v 1.8 2013/06/01 18:47:55 reyk Exp $ +.\" $OpenBSD: bgplgsh.8,v 1.9 2013/06/02 14:11:38 florian Exp $ .\" .\" Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 1 2013 $ +.Dd $Mdocdate: June 2 2013 $ .Dt BGPLGSH 8 .Os .Sh NAME @@ -74,11 +74,11 @@ to have .Xr bgpd 8 open a second, restricted, control socket: .Pp -.Dl socket \&"/var/www/logs/bgpd.rsock\&" restricted +.Dl socket \&"/var/www/run/bgpd.rsock\&" restricted .El .Sh FILES -.Bl -tag -width "/var/www/conf/bgpd.rsockXX" -compact -.It Pa /var/www/logs/bgpd.rsock +.Bl -tag -width "/var/www/run/bgpd.rsockXX" -compact +.It Pa /var/www/run/bgpd.rsock Position of the second, restricted, control socket of .Xr bgpd 8 . .El diff --git a/usr.bin/bgplg/bgplgsh.c b/usr.bin/bgplg/bgplgsh.c index 2af9d17d149..5d4e1adda69 100644 --- a/usr.bin/bgplg/bgplgsh.c +++ b/usr.bin/bgplg/bgplgsh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgplgsh.c,v 1.4 2013/06/01 18:47:55 reyk Exp $ */ +/* $OpenBSD: bgplgsh.c,v 1.5 2013/06/02 14:11:38 florian Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org> @@ -34,7 +34,7 @@ #include "bgplg.h" -#define BGPDSOCK "/var/www/logs/bgpd.rsock" +#define BGPDSOCK "/var/www/run/bgpd.rsock" #define BGPCTL "/usr/sbin/bgpctl", "-s", BGPDSOCK #define PING "/sbin/ping" #define TRACEROUTE "/usr/sbin/traceroute" diff --git a/usr.sbin/nginx/conf/nginx.conf b/usr.sbin/nginx/conf/nginx.conf index ddfb5a8ac67..10848932c00 100644 --- a/usr.sbin/nginx/conf/nginx.conf +++ b/usr.sbin/nginx/conf/nginx.conf @@ -1,4 +1,4 @@ -# $OpenBSD: nginx.conf,v 1.13 2013/06/01 14:06:20 naddy Exp $ +# $OpenBSD: nginx.conf,v 1.14 2013/06/02 14:11:38 florian Exp $ #user www; worker_processes 1; @@ -59,7 +59,7 @@ http { # FastCGI to CGI wrapper server # #location /cgi-bin/ { - # fastcgi_pass unix:logs/slowcgi.sock; + # fastcgi_pass unix:run/slowcgi.sock; # fastcgi_split_path_info ^(/cgi-bin/[^/]+)(.*); # fastcgi_param PATH_INFO $fastcgi_path_info; # include fastcgi_params; diff --git a/usr.sbin/slowcgi/slowcgi.8 b/usr.sbin/slowcgi/slowcgi.8 index 4bd899dcd36..87e0bf0dccd 100644 --- a/usr.sbin/slowcgi/slowcgi.8 +++ b/usr.sbin/slowcgi/slowcgi.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: slowcgi.8,v 1.2 2013/05/23 16:23:16 jmc Exp $ +.\" $OpenBSD: slowcgi.8,v 1.3 2013/06/02 14:11:38 florian Exp $ .\" .\" Copyright (c) 2013 Florian Obser <florian@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 23 2013 $ +.Dd $Mdocdate: June 2 2013 $ .Dt SLOWCGI 8 .Os .Sh NAME @@ -29,7 +29,7 @@ is a server which implements the FastCGI Protocol to execute CGI scripts. .Pp .Nm opens a socket at -.Pa /var/www/logs/slowcgi.sock , +.Pa /var/www/run/slowcgi.sock , owned by root:www, with permissions 0660. It then diff --git a/usr.sbin/slowcgi/slowcgi.c b/usr.sbin/slowcgi/slowcgi.c index a227602cd11..b377977e03e 100644 --- a/usr.sbin/slowcgi/slowcgi.c +++ b/usr.sbin/slowcgi/slowcgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slowcgi.c,v 1.3 2013/05/23 16:13:08 florian Exp $ */ +/* $OpenBSD: slowcgi.c,v 1.4 2013/06/02 14:11:38 florian Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> * Copyright (c) 2013 Florian Obser <florian@openbsd.org> @@ -253,7 +253,7 @@ main(int argc, char *argv[]) event_init(); - slowcgi_listen("/var/www/logs/slowcgi.sock", pw->pw_gid); + slowcgi_listen("/var/www/run/slowcgi.sock", pw->pw_gid); if (chroot(pw->pw_dir) == -1) lerr(1, "chroot(%s)", pw->pw_dir); |