samba: Modified the logonscripts for the raatstof and xenuxlocal sites.

Corrected the smb.printers.conf file, and modified the sharedefinitions
for raatstof and xenuxlocal.

6 files changed, 102 insertions, 26 deletions

diff --git a/TODO b/TODO
index 1b3758f..79620cd 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ All:
 ----
 Add a section in the cf.services.file for netatalk.
 Move all the fake domains to bind/fake from bind/pri.
-Correct dns (and other places like samba?) to use FQDN, not only host.
 Add squid support: Search /etc/squid.conf for "YOUR OWN RULE" and add "acl localnet src $(LOCALNET)" and "http_access allow localnet".
 
 Xenux: 
@@ -13,3 +12,4 @@ Move all domain files to local-COMMON
 DONE:
 -----
 samba/netlogon/common.bat is XENUX-centric
+Correct dns (and other places like samba?) to use FQDN, not only host.
diff --git a/samba/netlogon/logon-radio-raatstof.bat b/samba/netlogon/logon-radio-raatstof.bat
index 40ab340..fbf8a5a 100644
--- a/samba/netlogon/logon-radio-raatstof.bat
+++ b/samba/netlogon/logon-radio-raatstof.bat
@@ -1,6 +1,6 @@
 rem [Global] commands

 NET TIME \\raatstof /SET /YES

-NET USE F: \\raatstof\dokumenter /YES

-NET USE U: \\raatstof\homes /YES

-NET USE P: \\raatstof\programmer /YES

+NET USE W: \\raatstof\dokumenter /YES

+NET USE X: \\raatstof\homes /YES

+NET USE Y: \\raatstof\software /YES

 
\ No newline at end of file
diff --git a/samba/netlogon/logon-xenuxlocal.bat b/samba/netlogon/logon-xenuxlocal.bat
index 7e0ab04..2293fe7 100644
--- a/samba/netlogon/logon-xenuxlocal.bat
+++ b/samba/netlogon/logon-xenuxlocal.bat
@@ -1,7 +1,7 @@
 rem [Global] commands

 @ECHO "Welcome to Xenux' network!!!"

 NET TIME \\gandalf /SET /YES

-NET USE F: \\gandalf\dokumenter /YES

-NET USE U: \\gandalf\homes /YES

-NET USE P: \\gandalf\programmer /YES

+NET USE W: \\gandalf\dokumenter /YES

+NET USE X: \\gandalf\homes /YES

+NET USE Y: \\gandalf\software /YES

 
\ No newline at end of file
diff --git a/samba/smb-printers.conf b/samba/smb-printers.conf
index ffbf935..4b3d448 100644
--- a/samba/smb-printers.conf
+++ b/samba/smb-printers.conf
@@ -1,7 +1,52 @@
-[printers]
-	comment = %S printer
-	path = /tmp
-	print command = /usr/bin/lpr -h %s
-	lprm command = /usr/bin/lprm -P%S %j
-	public = yes
-	printable = yes
+control:
+	AddInstallable = ( samba samba_reload )
+	
+	#
+	# Variables for the print spooldir
+	# You can change the rights on the dir in the "directories:"
+	# section.
+	#
+	printdir	= ( /var/spool/lpd/sharedprinter )
+	
+editfiles:
+    samba::
+	    { /etc/samba/smb-printers.conf
+		AutoCreate
+		#
+		# [netlogon]
+		#
+		BeginGroupIfNoLineMatching "^\[printers\]"
+			Append '[printers]'
+			Append '	comment = %S printer'
+			Append '	path = /tmp'
+			Append '	print command = /usr/bin/lpr -h -r %s'
+			Append '	lprm command = /usr/bin/lprm -P%S %j'
+			Append '	public = yes'
+			Append '	printable = yes'
+		EndGroup
+		DefineClasses "samba_reload"
+	    }
+
+    samba_reload::
+	    { /etc/samba/smb-printers.conf
+			LocateLineMatching "^; EDITED BY CFENGINE .*"
+			ReplaceAll '; EDITED BY CFENGINE .*$' With '; EDITED BY CFENGINE $(date)'
+			CatchAbort
+			BeginGroupIfNoMatch "^; EDITED BY CFENGINE .*"
+			    Append '; EDITED BY CFENGINE $(date)'
+			EndGroup
+	    }
+
+directories:
+    samba::
+	$(printdir)
+		mode=777
+		owmer=root
+		group=root
+
+processes:
+	"smbd"	restart "/etc/init.d/samba restart"
+
+shellcommands:
+    samba_reload::
+	"/etc/init.d/samba force-reload"
diff --git a/samba/smb-shares-radio-raatstof.conf b/samba/smb-shares-radio-raatstof.conf
index be2b5f1..99da040 100644
--- a/samba/smb-shares-radio-raatstof.conf
+++ b/samba/smb-shares-radio-raatstof.conf
@@ -1,5 +1,5 @@
 control:
-	AddInstallable = ( samba samba_reload netatalk netatalk_reload lprng lprng_reload cups cups_reload )
+	AddInstallable = ( samba samba_reload )
 	
 	#
 	# Variables for shares
@@ -14,8 +14,8 @@ control:
 	commonsharedir	= ( /home/fsadmin/COMMON )
 	datashare 	= ( /home/fsadmin/COMMON/documents )
 	softshare	= ( /home/fsadmin/COMMON/software )
+	adminshare	= ( /home/fsadmin/COMMON/admin )
 	profshare	= ( /home/fsadmin/COMMON/samba/userprofiles )
-	printdir	= ( /var/spool/lpd/sharedprinter )
 	privpcshare	= ( .pcshare )
 	privmacshare	= ( .macshare )
 	privxchngshare	= ( .xchangeshare )
@@ -53,8 +53,8 @@ editfiles:
 			Append '[userprofiles]'
 			Append '	path = $(profshare)'
 			Append '	force user = %u'
-			Append '	writable = yes'
 			Append '	browsable = no'
+			Append '	writable = yes'
 			Append '	root preexec = /bin/mkdir $(profshare)/%U \'
 			Append '		    /bin/chown %U $(profshare)/%U \'
 			Append '		    /bin/chmod 700 $(profshare)/%U'
@@ -66,6 +66,7 @@ editfiles:
 			Append '[homes]'
 			Append '	path = /home/%u/$(privpcshare)'
 			Append '	browsable = no'
+			Append '	writable = yes'
 			Append '	root preexec = /bin/mkdir /home/%u/$(privpcshare) \'
 			Append '		    /bin/chown %U /home/%u/$(privpcshare) \'
 			Append '		    /bin/chmod 644 /home/%u/$(privpcshare)'
@@ -80,8 +81,12 @@ editfiles:
 			Append '	browsable = yes'
 			Append '	guest ok = no'
 			Append '	writeable = yes'
+			Append '	create mask = 0660'
+			Append '	directory mask = 0770'
 			Append '	valid users = @$(admingrp)'
 			Append '	force group = +$(admingrp)'
+			Append '	delete veto files = Yes'
+			Append '	veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/'
 		EndGroup
 		#
 		# [dokumenter]
@@ -93,6 +98,23 @@ editfiles:
 			Append '	browsable = yes'
 			Append '	guest ok = no'
 			Append '	writeable = yes'
+			Append '	create mask = 0660'
+			Append '	directory mask = 0770'
+			Append '	valid users = @$(admingrp)'
+			Append '	force group = +$(admingrp)'
+			Append '	delete veto files = Yes'
+			Append '	veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/'
+		EndGroup
+		#
+		# [dokumenter]
+		#
+		BeginGroupIfNoLineMatching "^\[admin\]"
+			Append '[admin]'
+			Append '	path = $(adminshare)'
+			Append '	comment = Dokumentation og adminværktøjer'
+			Append '	browsable = yes'
+			Append '	guest ok = yes'
+			Append '	writeable = no'
 			Append '	valid users = @$(admingrp)'
 			Append '	force group = +$(admingrp)'
 		EndGroup
@@ -132,10 +154,10 @@ directories:
 		mode=775
 		owner=$(adminuser)
 		group=$(admingrp)
-	$(printdir)
-		mode=775
-		owmer=root
-		group=root
+	$(adminshare)
+		mode=755
+		owner=$(adminuser)
+		group=$(admingrp)
 
 processes:
 	"smbd"	restart "/etc/init.d/samba restart"
diff --git a/samba/smb-shares-xenuxlocal.conf b/samba/smb-shares-xenuxlocal.conf
index 64d4de3..7c4351d 100644
--- a/samba/smb-shares-xenuxlocal.conf
+++ b/samba/smb-shares-xenuxlocal.conf
@@ -63,11 +63,12 @@ editfiles:
 		#
 		BeginGroupIfNoLineMatching "^\[homes\]"
 			Append '[homes]'
-			Append '	path = /home/%u/$(privpcshare)'
+			Append '	path = %H/$(privpcshare)'
 			Append '	browsable = no'
-			Append '	root preexec = /bin/mkdir /home/%u/$(privpcshare) \'
-			Append '		    /bin/chown %U /home/%u/$(privpcshare) \'
-			Append '		    /bin/chmod 644 /home/%u/$(privpcshare)'
+			Append '	writeable = yes'
+			Append '	root preexec = /bin/mkdir %H/$(privpcshare) \'
+			Append '		    /bin/chown %S %H/$(privpcshare) \'
+			Append '		    /bin/chmod 700 %H/$(privpcshare)'
 		EndGroup
 		#
 		# [programmer]
@@ -79,8 +80,12 @@ editfiles:
 			Append '	browsable = yes'
 			Append '	guest ok = no'
 			Append '	writeable = yes'
+			Append '	create mask = 0660'
+			Append '	directory mask = 0770'
 			Append '	valid users = @$(admingrp)'
 			Append '	force group = +$(admingrp)'
+			Append '	delete veto files = Yes'
+			Append '	veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/'
 		EndGroup
 		#
 		# [dokumenter]
@@ -92,8 +97,12 @@ editfiles:
 			Append '	browsable = yes'
 			Append '	guest ok = no'
 			Append '	writeable = yes'
+			Append '	create mask = 0660'
+			Append '	directory mask = 0770'
 			Append '	valid users = @$(admingrp)'
 			Append '	force group = +$(admingrp)'
+			Append '	delete veto files = Yes'
+			Append '	veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/'
 		EndGroup
 		#
 		# [mp3]
@@ -157,7 +166,7 @@ directories:
 		owner=root
 		group=root
 	$(profshare)
-		mode=775
+		mode=777
 		owner=$(adminuser)
 		group=$(admingrp)