From 0c020b6812a7f5a4ad5f5ae6b1644ead20c58e74 Mon Sep 17 00:00:00 2001 From: lukem Date: Mon, 21 Aug 2000 23:06:22 +0000 Subject: [PATCH] migrate guts of these /etc/foo.conf config files into /etc/default/foo.conf, and source the latter in the former. this makes it easier for a sysadmin to upgrade the default files without affecting local config, and retains the semantics that the /etc/foo.conf files are the actual files that are edited (as opposed to /etc/foo.local.conf or /etc/foo.conf.local or whatever, which isn't as intuitive). --- etc/daily.conf | 20 ++---- etc/monthly.conf | 8 ++- etc/rc.conf | 171 ++-------------------------------------------- etc/security.conf | 23 ++----- etc/weekly.conf | 10 ++- 5 files changed, 32 insertions(+), 200 deletions(-) diff --git a/etc/daily.conf b/etc/daily.conf index 4e6c70a95e8b..468c61ec0957 100644 --- a/etc/daily.conf +++ b/etc/daily.conf @@ -1,16 +1,10 @@ -# $NetBSD: daily.conf,v 1.2 1997/01/20 06:08:36 mycroft Exp $ +# $NetBSD: daily.conf,v 1.3 2000/08/21 23:06:22 lukem Exp $ # # see daily.conf(5) for more information. -find_core=YES -expire_news=NO -purge_accounting=YES -run_msgs=YES -run_calendar=YES -check_uucp=YES -check_disks=YES -check_mailq=YES -check_network=YES -run_fsck=NO -run_rdist=YES -run_security=YES +if [ -r /etc/default/daily.conf ]; then + . /etc/default/daily.conf +fi + +# Add local overrides below +# diff --git a/etc/monthly.conf b/etc/monthly.conf index 2e14b0bd7611..3070fb77bdbc 100644 --- a/etc/monthly.conf +++ b/etc/monthly.conf @@ -1,4 +1,10 @@ -# $NetBSD: monthly.conf,v 1.1 1997/01/05 11:21:12 mrg Exp $ +# $NetBSD: monthly.conf,v 1.2 2000/08/21 23:06:22 lukem Exp $ # # see monthly.conf(5) for more information. +if [ -r /etc/default/monthly.conf ]; then + . /etc/default/monthly.conf +fi + +# Add local overrides below +# diff --git a/etc/rc.conf b/etc/rc.conf index 1e741b13e113..07ec1dd47892 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.93 2000/08/21 14:48:39 abs Exp $ +# $NetBSD: rc.conf,v 1.94 2000/08/21 23:06:23 lukem Exp $ # # see rc.conf(5) for more information. # @@ -6,174 +6,13 @@ # passed to the program on the command line. # -# Uncomment this if you want to use local paths in rc. -# -#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin +if [ -r /etc/default/rc.conf ]; then + . /etc/default/rc.conf +fi # If this is not set to YES, the system will drop into single-user mode. # rc_configured=NO -# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown. +# Add local overrides below # -do_rcshutdown=YES - -# Basic network configuration -# - -# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu). -# If blank, use /etc/myname. -# -hostname="" - -# If there's only one way out of your network, set this to the hostname -# or the IP address of the router that will get your packets off the LAN. -# If blank, use /etc/mygate. -# -defaultroute="" - -# The NIS domain name (formerly known as Yellow Pages); not in any way -# related to Internet domain names. -# If blank, use /etc/defaultdomain. -# -domainname="" - -# Filesystems to mount early in boot-up. -# Note that `/var' is needed in $critical_filesystems_beforenet (or -# implied as part of `/') as certain services that need /var (such as -# dhclient) may be needed to get the network operational enough to mount -# the $critical_filesystems. -# -critical_filesystems_beforenet="/var" -critical_filesystems="/usr" - -# Set this to YES if you have purposefully setup no swap partitions and -# don't want to be warned about it. -# -no_swap=NO - -# One-time actions and programs on boot-up. -# -lkm=NO # run /etc/rc.lkm -savecore=YES savecore_flags="-z" -clear_tmp=YES # clear /tmp after reboot -update_motd=YES # updates /etc/motd -dmesg=YES dmesg_flags="" # write /var/run/dmesg.boot -accounting=NO # needs /var/account/acct - -# NOTE: default coredump name now set in /etc/sysctl.conf - -# Security setting. If $securelevel is non-empty, the system securelevel -# is set to this value early in the boot sequence. Otherwise the default -# action is taken (see init(8)). -# -securelevel="" # securelevel to set to - -# To set the IP address of an interface either use -# ifconfig_xxN="IP-NO" -# where xxN is the interface. If this variable is not set then -# contents of the file /etc/ifconfig.xxN is used. - -# Networking startup. -# -ipfilter=NO # uses /etc/ipf.conf -ipnat=NO # uses /etc/ipnat.conf -ipsec=NO # uses /etc/ipsec.conf -ipmon=NO ipmon_flags="-sn" # syslog ipfilter messages -auto_ifconfig=YES # config all avail. interfaces -net_interfaces="" # used only if above is NO -flushroutes=YES # flush routes in netstart -dhclient=NO # behave as a DHCP client -dhclient_flags="" # blank: config all interfaces -ntpdate=NO ntpdate_flags="-b -s" # May need '-u' thru firewall - ntpdate_hosts="" # blank: hosts in /etc/ntp.conf -ppp_peers="" # /etc/ppp/peers to call -ip6mode=host # host, autohost or router -rtsol=NO rtsol_flags="" # for ip6mode=autohost only - -# Daemons required by servers. These are not needed for strictly client use. -# - -# inetd is used to start the IP-based services enabled in /etc/inetd.conf -# -inetd=YES inetd_flags="-l" # -l logs libwrap - -# rpcbind is used to look up RPC-based services. -# -rpcbind=NO rpcbind_flags="-l" # -l logs libwrap - -# Commonly used daemons. -# -syslogd=YES syslogd_flags="-s" # -s "secure" unix domain only -cron=YES -named=NO named_flags="" -timed=NO timed_flags="" -ntpd=NO ntpd_flags="" -sendmail=NO sendmail_flags="-bd -q30m" -postfix=NO -lpd=NO lpd_flags="-s" # -s "secure" unix domain only -sshd=NO sshd_flags="" - -# Routing daemons. -# -routed=NO routed_flags="-q" -gated=NO gated_flags="" -mrouted=NO mrouted_flags="" -route6d=NO route6d_flags="" -rtsold=NO rtsold_flags="" # for ip6mode=autohost only - -# Daemons used to boot other hosts over a network. -# -rarpd=NO rarpd_flags="-a" -bootparamd=NO bootparamd_flags="" -dhcpd=NO dhcpd_flags="-q" -dhcrelay=NO dhcrelay_flags="" -rbootd=NO rbootd_flags="" -mopd=NO mopd_flags="-a" -rtadvd=NO rtadvd_flags="" - -# X11 daemons. -# -xfs=NO xfs_flags="" # X11 font server -xdm=NO xdm_flags="" # X11 display manager; needs - # wscons=YES for local displays. - -# YP (NIS) daemons. -# -ypbind=NO ypbind_flags="" -ypserv=NO ypserv_flags="-d" -yppasswdd=NO yppasswdd_flags="" - -# NFS daemons and parameters. -# -nfs_client=NO # enable client daemons -nfs_server=NO # enable server daemons - mountd_flags="" - nfsd_flags="-6tun 4" -lockd=NO lockd_flags="" -statd=NO statd_flags="" -amd=NO amd_flags="-l syslog -x error,noinfo,nostats" - amd_dir=/amd # mount dir - amd_master=/etc/amd/master # master map - -# Heimdal Kerberos 5 KDC (with Kerberos IV compatibility) -kdc=NO kdc_flags="" - -# Other daemons. -# -rwhod=NO - -# Hardware daemons. -# -apmd=NO apmd_flags="" # APM power management daemon. -screenblank=NO screenblank_flags="" # wscons and FBIO screenblanker - -# Configuration of "wscons" console driver virtual screens. -# -wscons=NO wscons_flags="" # run /etc/rc.wscons - -# Read in local configuration. -# -if [ -f /etc/rc.local.conf ]; then - . /etc/rc.local.conf -fi diff --git a/etc/security.conf b/etc/security.conf index e9a4da70f3a6..2600ef5b752b 100644 --- a/etc/security.conf +++ b/etc/security.conf @@ -1,21 +1,10 @@ -# $NetBSD: security.conf,v 1.6 2000/07/28 21:38:44 christos Exp $ +# $NetBSD: security.conf,v 1.7 2000/08/21 23:06:23 lukem Exp $ # # see security.conf(5) for more information. -check_passwd=YES -check_group=YES -check_rootdotfiles=YES -check_ftpusers=YES -check_aliases=YES -check_rhosts=YES -check_homes=YES -check_varmail=YES -check_nfs=YES -check_devices=YES -check_mtree=YES -check_disklabels=YES -check_changelist=YES +if [ -r /etc/default/security.conf ]; then + . /etc/default/security.conf +fi -run_skeyaudit=YES - -max_loginlen=8 +# Add local overrides below +# diff --git a/etc/weekly.conf b/etc/weekly.conf index e47b689017c5..9fbedd1e38d7 100644 --- a/etc/weekly.conf +++ b/etc/weekly.conf @@ -1,6 +1,10 @@ -# $NetBSD: weekly.conf,v 1.1 1997/01/05 11:21:11 mrg Exp $ +# $NetBSD: weekly.conf,v 1.2 2000/08/21 23:06:22 lukem Exp $ # # see weekly.conf(5) for more information. -clean_uucp=YES -rebuild_locatedb=YES +if [ -r /etc/default/weekly.conf ]; then + . /etc/default/weekly.conf +fi + +# Add local overrides below +#