svn commit: r257694 - in head/etc: . defaults namedb periodic/daily rc.d
Gleb Smirnoff
glebius at FreeBSD.org
Tue Nov 5 09:30:08 UTC 2013
Author: glebius
Date: Tue Nov 5 09:30:06 2013
New Revision: 257694
URL: http://svnweb.freebsd.org/changeset/base/257694
Log:
Remove remnants of BIND from /etc, since there is no BIND in base now.
Sorry, that would break users running head and BIND from ports, since
ports rely on these scripts. The ports will be fixed soon.
Reviewed by: erwin
Deleted:
head/etc/namedb/
head/etc/periodic/daily/470.status-named
head/etc/rc.d/named
Modified:
head/etc/defaults/periodic.conf
head/etc/defaults/rc.conf
head/etc/freebsd-update.conf
head/etc/rc.d/Makefile
head/etc/rc.d/ntpdate
head/etc/rc.d/rpcbind
head/etc/rc.d/syslogd
Modified: head/etc/defaults/periodic.conf
==============================================================================
--- head/etc/defaults/periodic.conf Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/defaults/periodic.conf Tue Nov 5 09:30:06 2013 (r257694)
@@ -137,10 +137,6 @@ daily_status_mail_rejects_enable="YES"
daily_status_mail_rejects_logs=3 # How many logs to check
daily_status_mail_rejects_shorten="NO" # Shorten output
-# 470.status-named
-daily_status_named_enable="YES"
-daily_status_named_usedns="YES" # DNS lookups are ok
-
# 480.status-ntpd
daily_status_ntpd_enable="NO" # Check NTP status
Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/defaults/rc.conf Tue Nov 5 09:30:06 2013 (r257694)
@@ -256,6 +256,7 @@ hostapd_enable="NO" # Run hostap daemon
syslogd_enable="YES" # Run syslog daemon (or NO).
syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
syslogd_flags="-s" # Flags to syslogd (if enabled).
+altlog_proglist="" # List of chrooted applicatioins in /var
inetd_enable="NO" # Run the network daemon dispatcher (YES/NO).
inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one.
inetd_flags="-wW -C 60" # Optional flags to inetd
@@ -267,23 +268,6 @@ hastd_program="/sbin/hastd" # path to ha
hastd_flags="" # Optional flags to hastd.
ctld_enable="NO" # CAM Target Layer / iSCSI target daemon.
local_unbound_enable="NO" # local caching resolver
-#
-# named. It may be possible to run named in a sandbox, man security for
-# details.
-#
-named_enable="NO" # Run named, the DNS server (or NO).
-named_program="/usr/sbin/named" # Path to named, if you want a different one.
-named_conf="/etc/namedb/named.conf" # Path to the configuration file
-#named_flags="" # Use this for flags OTHER than -u and -c
-named_uid="bind" # User to run named as
-named_chrootdir="/var/named" # Chroot directory (or "" not to auto-chroot it)
-named_chroot_autoupdate="YES" # Automatically install/update chrooted
- # components of named. See /etc/rc.d/named.
-named_symlink_enable="YES" # Symlink the chrooted pid file
-named_wait="NO" # Wait for working name service before exiting
-named_wait_host="localhost" # Hostname to check if named_wait is enabled
-named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf
-named_auto_forward_only="NO" # Do "forward only" instead of "forward first"
#
# kerberos. Do not run the admin daemons on slave servers
Modified: head/etc/freebsd-update.conf
==============================================================================
--- head/etc/freebsd-update.conf Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/freebsd-update.conf Tue Nov 5 09:30:06 2013 (r257694)
@@ -35,7 +35,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.
# When upgrading to a new FreeBSD release, files which match MergeChanges
# will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/ /boot/device.hints
+MergeChanges /etc/ /boot/device.hints
### Default configuration options:
Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/rc.d/Makefile Tue Nov 5 09:30:06 2013 (r257694)
@@ -90,7 +90,6 @@ FILES= DAEMON \
mroute6d \
mrouted \
msgs \
- named \
natd \
netif \
netoptions \
Modified: head/etc/rc.d/ntpdate
==============================================================================
--- head/etc/rc.d/ntpdate Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/rc.d/ntpdate Tue Nov 5 09:30:06 2013 (r257694)
@@ -4,7 +4,7 @@
#
# PROVIDE: ntpdate
-# REQUIRE: NETWORKING syslogd named
+# REQUIRE: NETWORKING syslogd
# KEYWORD: nojail
. /etc/rc.subr
Modified: head/etc/rc.d/rpcbind
==============================================================================
--- head/etc/rc.d/rpcbind Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/rc.d/rpcbind Tue Nov 5 09:30:06 2013 (r257694)
@@ -4,7 +4,7 @@
#
# PROVIDE: rpcbind
-# REQUIRE: NETWORKING ntpdate syslogd named
+# REQUIRE: NETWORKING ntpdate syslogd
# KEYWORD: shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/syslogd
==============================================================================
--- head/etc/rc.d/syslogd Tue Nov 5 07:45:20 2013 (r257693)
+++ head/etc/rc.d/syslogd Tue Nov 5 09:30:06 2013 (r257694)
@@ -21,7 +21,6 @@ extra_commands="reload"
sockfile="/var/run/syslogd.sockets"
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
syslogd_precmd()
{
More information about the svn-src-all
mailing list