svn commit: r258121 - in stable/10/etc: . defaults namedb periodic/daily rc.d

[Gleb Smirnoff]

Author: glebius
Date: Thu Nov 14 09:14:33 2013
New Revision: 258121
URL: http://svnweb.freebsd.org/changeset/base/258121

Log:
  Merge r257694 from head:
  
    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.
  
  Approved by:	re (kib)

Deleted:
  stable/10/etc/namedb/
  stable/10/etc/periodic/daily/470.status-named
  stable/10/etc/rc.d/named
Modified:
  stable/10/etc/defaults/periodic.conf
  stable/10/etc/defaults/rc.conf
  stable/10/etc/freebsd-update.conf
  stable/10/etc/rc.d/Makefile
  stable/10/etc/rc.d/ntpdate
  stable/10/etc/rc.d/rpcbind
  stable/10/etc/rc.d/syslogd
Directory Properties:
  stable/10/etc/   (props changed)
  stable/10/etc/rc.d/   (props changed)

Modified: stable/10/etc/defaults/periodic.conf
==============================================================================
--- stable/10/etc/defaults/periodic.conf	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/defaults/periodic.conf	Thu Nov 14 09:14:33 2013	(r258121)
@@ -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: stable/10/etc/defaults/rc.conf
==============================================================================
--- stable/10/etc/defaults/rc.conf	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/defaults/rc.conf	Thu Nov 14 09:14:33 2013	(r258121)
@@ -260,6 +260,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
@@ -271,23 +272,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: stable/10/etc/freebsd-update.conf
==============================================================================
--- stable/10/etc/freebsd-update.conf	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/freebsd-update.conf	Thu Nov 14 09:14:33 2013	(r258121)
@@ -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: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/rc.d/Makefile	Thu Nov 14 09:14:33 2013	(r258121)
@@ -90,7 +90,6 @@ FILES=	DAEMON \
 	mroute6d \
 	mrouted \
 	msgs \
-	named \
 	natd \
 	netif \
 	netoptions \

Modified: stable/10/etc/rc.d/ntpdate
==============================================================================
--- stable/10/etc/rc.d/ntpdate	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/rc.d/ntpdate	Thu Nov 14 09:14:33 2013	(r258121)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ntpdate
-# REQUIRE: NETWORKING syslogd named
+# REQUIRE: NETWORKING syslogd
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: stable/10/etc/rc.d/rpcbind
==============================================================================
--- stable/10/etc/rc.d/rpcbind	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/rc.d/rpcbind	Thu Nov 14 09:14:33 2013	(r258121)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: rpcbind
-# REQUIRE: NETWORKING ntpdate syslogd named
+# REQUIRE: NETWORKING ntpdate syslogd
 # KEYWORD: shutdown
 
 . /etc/rc.subr

Modified: stable/10/etc/rc.d/syslogd
==============================================================================
--- stable/10/etc/rc.d/syslogd	Thu Nov 14 09:11:54 2013	(r258120)
+++ stable/10/etc/rc.d/syslogd	Thu Nov 14 09:14:33 2013	(r258121)
@@ -21,7 +21,6 @@ extra_commands="reload"
 
 sockfile="/var/run/syslogd.sockets"
 evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
 
 syslogd_precmd()
 {