Reconcile conf.base-SoFS.

There looks to be nothing harmful in conf.base-SoFS-1.5.3, so merge it
all into conf.base-SoFS and remove the 1.5.3-specific version.

Signed-off-by: Martin Schwenke <martin@meltin.net>

1 files changed, 28 insertions, 74 deletions

diff --git a/base/root/scripts/conf.base-SoFS b/base/root/scripts/conf.base-SoFS
index aceb73e..2d51c42 100644
--- a/base/root/scripts/conf.base-SoFS
+++ b/base/root/scripts/conf.base-SoFS
@@ -1,20 +1,32 @@
 # a rough base config used by setup_samba.sh
-# created using "sofs conf backup"
+# created using "cnconfig backup"
 [CTDB_MANAGES_SAMBA]
 	yes
 
 [CTDB_MANAGES_HTTPD]
 	yes
 
+[HTTP_CONFIGURED]
+	yes
+
 [CTDB_MANAGES_VSFTPD]
 	yes
 
+[FTP_CONFIGURED]
+	yes
+
 [CTDB_MANAGES_NFS]
 	yes
 
+[NFS_CONFIGURED]
+	yes
+
 [CTDB_MANAGES_SCP]
 	yes
 
+[SCP_CONFIGURED]
+	yes
+
 [vsftpd]
 	# no anon access
 	anonymous_enable=NO
@@ -34,6 +46,8 @@
 	local_root=/var/opt/IBM/sofs/ftproot
 	log_ftp_protocol=YES
 	syslog_enable=YES
+	#show user/groupnames instead of only numeric IDs
+	text_userdb_names=YES
 
 [scpglobal]
 	allowscp
@@ -53,7 +67,7 @@
 	
 [nfssharenames]
 	#
-	#Thu Jul 24 22:43:21 EST 2008
+	#Fri Apr 17 20:42:35 EST 2009
 	/gpfs/data=data
 	
 [scpexports]
@@ -67,7 +81,7 @@
 	disable netbios = yes
 	disable spoolss = yes
 	fileid:mapping = fsname
-	use mmap = no
+	use mmap = yes
 	gpfs:sharemodes = yes
 	gpfs:leases = yes
 	passdb backend = tdbsam
@@ -97,6 +111,8 @@
 	nfs4:chown = yes
 	nfs4:acedup = merge
 	nfs4:sidmap = /etc/samba/sidmap.tdb
+	map readonly = no
+	ea support = yes
 	groupdb:backend = tdb
 	winbind:online check timeout = 30
 	template shell = /usr/bin/rssh
@@ -120,8 +136,8 @@
 	
 	[libdefaults]
 	 default_realm = EXAMPLE.COM
-	 dns_lookup_realm = false
-	 dns_lookup_kdc = false
+	 dns_lookup_realm = true
+	 dns_lookup_kdc = true
 	 ticket_lifetime = 24h
 	 forwardable = yes
 	
@@ -237,8 +253,8 @@
 	# the default is /var/log/log.ctdb
 	CTDB_LOGFILE=/var/log/log.ctdb
 	# what debug level to run at. Higher means more verbose
-	# the default is 0
-	CTDB_DEBUGLEVEL=0
+	# the default is 2
+	CTDB_DEBUGLEVEL=2
 	# set any default tuning options for ctdb
 	# use CTDB_SET_XXXX=value where XXXX is the name of the tuning
 	# variable
@@ -246,8 +262,6 @@
 	#CTDB_SET_TRAVERSETIMEOUT=60
 	#Disable the share check during monitor
 	CTDB_SAMBA_SKIP_SHARE_CHECK=yes
-	#Disable the config check during monitor
-	CTDB_SAMBA_SKIP_CONF_CHECK=yes
 	#Specify the SMB ports to check during monitor
 	CTDB_SAMBA_CHECK_PORTS="445"
 	# you can get a list of variables using "ctdb listvars"
@@ -265,71 +279,6 @@
 	CTDB_MANAGES_HTTPD=yes
 
 [/etc/sysconfig/nfs]
-	#
-	# Define which protocol versions mountd 
-	# will advertise. The values are "no" or "yes"
-	# with yes being the default
-	#MOUNTD_NFS_V1="no"
-	#MOUNTD_NFS_V2="no"
-	#MOUNTD_NFS_V3="no"
-	#
-	#
-	# Path to remote quota server. See rquotad(8)
-	#RQUOTAD="/usr/sbin/rpc.rquotad"
-	# Port rquotad should listen on.
-	#RQUOTAD_PORT=875
-	# Optinal options passed to rquotad
-	#RPCRQUOTADOPTS=""
-	#
-	#
-	# TCP port rpc.lockd should listen on.
-	#LOCKD_TCPPORT=32803
-	# UDP port rpc.lockd should listen on.
-	#LOCKD_UDPPORT=32769
-	#
-	#
-	# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
-	#RPCNFSDARGS
-	# Number of nfs server processes to be started.
-	# The default is 8. 
-	#RPCNFSDCOUNT=8
-	#
-	#
-	# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
-	#RPCMOUNTDOPTS=""
-	# Port rpc.mountd should listen on.
-	#MOUNTD_PORT=892
-	#
-	#
-	# Optional arguments passed to rpc.statd. See rpc.statd(8)
-	#STATDARG=""
-	# Port rpc.statd should listen on.
-	#STATD_PORT=662
-	# Outgoing port statd should used. The default is port
-	# is random
-	#STATD_OUTGOING_PORT=2020
-	# Specify callout program 
-	#STATD_HA_CALLOUT="/usr/local/bin/foo"
-	#
-	#
-	# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
-	#RPCIDMAPDARGS=""
-	#
-	# Set to turn on Secure NFS mounts. 
-	#SECURE_NFS="yes"
-	# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
-	#RPCGSSDARGS="-vvv"
-	# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
-	#RPCSVCGSSDARGS="-vvv"
-	# Don't load security modules in to the kernel
-	#SECURE_NFS_MODS="noload"
-	#
-	# Don't load sunrpc module.
-	#RPCMTAB="noload"
-	#
-	# should ctdb manage starting/stopping the service for you?
-	# default is to not manage it
-	CTDB_MANAGES_NFS=yes
 	STATD_PORT=32765
 	STATD_OUTGOING_PORT=32766
 	MOUNTD_PORT=32767
@@ -341,6 +290,9 @@
 	NFS_HOSTNAME="@@CLUSTER@@"
 	STATD_HOSTNAME="$NFS_HOSTNAME -H /etc/ctdb/statd-callout "
 	RPCNFSDARGS="-N 4"
+	# should ctdb manage starting/stopping the service for you?
+	# default is to not manage it
+	CTDB_MANAGES_NFS=yes
 
 [/etc/nsswitch.conf]
 	#
@@ -473,6 +425,8 @@
 	local_root=/var/opt/IBM/sofs/ftproot
 	log_ftp_protocol=YES
 	syslog_enable=YES
+	#show user/groupnames instead of only numeric IDs
+	text_userdb_names=YES
 
 [/var/opt/IBM/sofs/configs/scpexports]
 	data=/gpfs/data