diff options
Diffstat (limited to 'cfengine')
-rw-r--r-- | cfengine/cf.generic | 2 | ||||
-rw-r--r-- | cfengine/cf.services.file | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cfengine/cf.generic b/cfengine/cf.generic index 1de3e31..4800500 100644 --- a/cfengine/cf.generic +++ b/cfengine/cf.generic @@ -52,7 +52,7 @@ control: actionsequence = ( checktimezone - resolva + resolve editfiles directories copy diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file index 883a129..c1e336f 100644 --- a/cfengine/cf.services.file +++ b/cfengine/cf.services.file @@ -56,9 +56,11 @@ editfiles: # # Append the include lines for the files decribed above # - AppendIfNoSuchLine "include = smb-shares-COMMON.conf" - AppendIfNoSuchLine "include = smb-shares-$(site).conf" - AppendIfNoSuchLine "include = smb-printers.conf" + AppendIfNoSuchLine "include = /etc/samba/smb-shares-COMMON.conf" + AppendIfNoSuchLine "include = /etc/samba/smb-printers.conf" + BeginGroupIfFileExists "/etc/local-COMMON/samba/smb-shares-$(site).conf" + AppendIfNoSuchLine "include = /etc/samba/smb-shares-$(site).conf" + EndGroup ResetSearch "1" # |