samba: Modified shares for the radio-raatstof and xenuxlocal sites.

Removed smb-shares-printers.conf and split it up in to files - one for
cups and one for lprng. The settings should work fully with cups and
lprng.

4 files changed, 61 insertions, 8 deletions

diff --git a/samba/smb-printers-cups.conf b/samba/smb-printers-cups.conf
new file mode 100644
index 0000000..111116c
--- /dev/null
+++ b/samba/smb-printers-cups.conf
@@ -0,0 +1,52 @@
+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 '	printing = cups'
+			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=770
+		owner=root
+		group=users
+
+processes:
+	"smbd"	restart "/etc/init.d/samba restart"
+
+shellcommands:
+    samba_reload::
+	"/etc/init.d/samba force-reload"
+
diff --git a/samba/smb-printers.conf b/samba/smb-printers-lprng.conf
index 766111f..12fc54c 100644
--- a/samba/smb-printers.conf
+++ b/samba/smb-printers-lprng.conf
@@ -19,6 +19,7 @@ editfiles:
 			Append '[printers]'
 			Append '	comment = %S printer'
 			Append '	path = /tmp'
+			Append '	printing = lprng'
 			Append '	print command = /usr/bin/lpr -h -P%S -r %s'
 			Append '	lprm command = /usr/bin/lprm -P%S %j'
 			Append '	public = yes'
diff --git a/samba/smb-shares-radio-raatstof.conf b/samba/smb-shares-radio-raatstof.conf
index e5cdb9d..9237a92 100644
--- a/samba/smb-shares-radio-raatstof.conf
+++ b/samba/smb-shares-radio-raatstof.conf
@@ -55,9 +55,9 @@ editfiles:
 			Append '	force user = %u'
 			Append '	browsable = yes'
 			Append '	writable = yes'
-			Append '	root preexec = /bin/mkdir $(profshare)/%U \'
+			Append '	root preexec = '/bin/mkdir $(profshare)/%U \'
 			Append '		    /bin/chown %U $(profshare)/%U \'
-			Append '		    /bin/chmod 700 $(profshare)/%U'
+			Append '		    /bin/chmod 700 $(profshare)/%U''
 		EndGroup
 		#
 		# [homes]
@@ -67,9 +67,9 @@ editfiles:
 			Append '	path = /home/%u/$(privpcshare)'
 			Append '	browsable = no'
 			Append '	writable = yes'
-			Append '	root preexec = /bin/mkdir /home/%u/$(privpcshare) \'
+			Append '	root preexec = '/bin/mkdir /home/%u/$(privpcshare) \'
 			Append '		    /bin/chown %U /home/%u/$(privpcshare) \'
-			Append '		    /bin/chmod 644 /home/%u/$(privpcshare)'
+			Append '		    /bin/chmod 644 /home/%u/$(privpcshare)''
 		EndGroup
 		#
 		# [programmer]
diff --git a/samba/smb-shares-xenuxlocal.conf b/samba/smb-shares-xenuxlocal.conf
index 42fcb3f..15a766d 100644
--- a/samba/smb-shares-xenuxlocal.conf
+++ b/samba/smb-shares-xenuxlocal.conf
@@ -54,9 +54,9 @@ editfiles:
 			Append '	force user = %u'
 			Append '	writable = yes'
 			Append '	browsable = yes'
-			Append '	root preexec = /bin/mkdir $(profshare)/%U \'
+			Append '	root preexec = '/bin/mkdir $(profshare)/%U \'
 			Append '		    /bin/chown %U $(profshare)/%U \'
-			Append '		    /bin/chmod 700 $(profshare)/%U'
+			Append '		    /bin/chmod 700 $(profshare)/%U''
 		EndGroup
 		#
 		# [homes]
@@ -66,9 +66,9 @@ editfiles:
 			Append '	path = %H/$(privpcshare)'
 			Append '	browsable = no'
 			Append '	writeable = yes'
-			Append '	root preexec = /bin/mkdir %H/$(privpcshare) \'
+			Append '	root preexec = '/bin/mkdir %H/$(privpcshare) \'
 			Append '		    /bin/chown %S %H/$(privpcshare) \'
-			Append '		    /bin/chmod 700 %H/$(privpcshare)'
+			Append '		    /bin/chmod 700 %H/$(privpcshare)''
 		EndGroup
 		#
 		# [programmer]