From 9b22b6766056b88ead68b61bfaf08751887c78b7 Mon Sep 17 00:00:00 2001
From: Juri Jensen <juri@xenux.dk>
Date: Thu, 14 Mar 2002 11:47:28 +0000
Subject: 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.

---
 cfengine/cf.services.file | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'cfengine/cf.services.file')

diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file
index a5abd28..3c15e8d 100644
--- a/cfengine/cf.services.file
+++ b/cfengine/cf.services.file
@@ -30,9 +30,13 @@ import:
 	/etc/local-COMMON/samba/smb-printers.conf
 		
 editfiles:
-    samba.lprng|samba.cups::
+    samba.lprng::
 	    { /etc/samba/smb.conf
-		AppendIfNoSuchLine "include = /etc/samba/smb-printers.conf"
+		AppendIfNoSuchLine "include = /etc/samba/smb-printers-lprng.conf"
+	    }
+    samba.cups::
+	    { /etc/samba/smb.conf
+		AppendIfNoSuchLine "include = /etc/samba/smb-printers-cups.conf"
 	    }
 	    
     samba::
@@ -44,7 +48,6 @@ editfiles:
 		# up in the following files:
 		# - smb.conf
 		# - smb-shares-$(site).conf
-		# - smb-printers.conf
 		#
 #		DeleteLinesAfterThisMatching "^\[homes\]$(n)*.*"
 #		ResetSearch "1"
@@ -210,22 +213,6 @@ editfiles:
 	    }
 
     lprng::
-	    { /etc/samba/smb.conf
-		#
-		# printing = lprng
-		#
-		ResetSearch "1"
-		LocateLineMatching "^[;[:blank:]]*printing[[:blank:]]*=.*"
-		BeginGroupIfNoLineMatching '^[[:blank:]]*printing[[:blank:]]*=[[:blank:]]*lprng[[:blank:]]*'
-			ReplaceLineWith '   printing = lprng'
-		EndGroup
-		CatchAbort
-		BeginGroupIfNoMatch '^[[:blank:]]*printing[[:blank:]]*=[[:blank:]]*lprng[[:blank:]]*'
-			InsertLine '   printing = lprng'
-		EndGroup
-		DefineClasses "samba_reload"
-	    }
-
 	    #
 	    # Printer configuration stuff
 	    #
-- 
cgit v1.2.3