summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2014-03-15 00:59:51 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2014-03-15 00:59:51 +0000
commit84c33302afc3722a049e4adf940e4f61ce2e0524 (patch)
tree827cac91fd99cdd10948d1bbe78157ca1a3e8861
parent353325addc17b5c09d9fd1982197a056417004d6 (diff)
httpd_flags was still used here; remove it.
Add a log socket in /var/www/dev/log if nginx is enabled, it is needed as the openlog() call is done after chrooting. ok brad@ florian@ deraadt@
-rw-r--r--etc/rc.d/syslogd4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index 8f82c846e59..06062bfef04 100644
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: syslogd,v 1.1 2011/07/06 18:55:36 robert Exp $
+# $OpenBSD: syslogd,v 1.2 2014/03/15 00:59:50 sthen Exp $
daemon="/usr/sbin/syslogd"
@@ -9,7 +9,7 @@ daemon="/usr/sbin/syslogd"
pexp="syslogd: \[priv\]"
rc_pre() {
- [ X"${httpd_flags}" != X"-u" ] && rm -f /var/www/dev/log && \
+ [ X"${nginx_flags}" != X"-u" ] && rm -f /var/www/dev/log && \
daemon_flags="${daemon_flags} -a /var/www/dev/log"
[ X"${named_flags}" != X"NO" ] && rm -f /var/named/dev/log && \
daemon_flags="${daemon_flags} -a /var/named/dev/log"