diff options
Diffstat (limited to 'cfengine')
| -rw-r--r-- | cfengine/cf.services.file | 25 |
1 files changed, 6 insertions, 19 deletions
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 # |