From 4caddfd2421685e3dc0c4a07ee5fbc8102f22a8b Mon Sep 17 00:00:00 2001
From: Juri Jensen <juri@xenux.dk>
Date: Thu, 13 Sep 2001 14:46:48 +0000
Subject: * Added dhcp.conf.xenuxlocal * Fixed some typos
---
cfengine/cf.services.file | 51 +++++++++++++++++++++++++++++------------------
cfengine/cf.site.xenux | 2 +-
2 files changed, 33 insertions(+), 20 deletions(-)
(limited to 'cfengine')
diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file
index 13b2583..883a129 100644
--- a/cfengine/cf.services.file
+++ b/cfengine/cf.services.file
@@ -13,8 +13,8 @@ control:
netlogshare = ( /etc/samba/netlogon )
commonsharedir = ( /var/local/filesharing/COMMON )
locsharedir = ( /var/local/filesharing/local )
- datashare = ( /var/local/filesharing/COMMON/data )
- pgrshare = ( /var/local/filesharing/COMMON/programs )
+ datashare = ( /var/local/filesharing/COMMON/documents )
+ pgrshare = ( /var/local/filesharing/COMMON/software )
profshare = ( /var/local/filesharing/COMMON/samba/userprofiles )
printdir = ( /var/spool/samba )
@@ -295,6 +295,32 @@ editfiles:
Append '; EDITED BY CFENGINE $(date)'
EndGroup
}
+ samba::
+ #
+ # Local shares special for the site.
+ # In this file you can define special shares that you need
+ #
+ { /etc/samba/smb-shares-$(site).conf
+ #
+ # We don't make this file dynamically, but instead we copy the contents
+ # of a master file, but only if it's newer than the one installed.
+ #
+ BeginGroupIfFileIsNewer "/etc/local-COMMON/samba/smb-shares-$(site).conf"
+ EmptyEntireFilePlease
+ InsertFile "/etc/local-COMMON/samba/smb-shares-$(site).conf"
+ Append "# Edited by cfengine $(date)"
+ EndGroup
+ DefineClasses "samba_reload"
+ }
+ samba_reload::
+ { /etc/samba/smb-shares-$(site).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
+ }
samba::
{ /etc/samba/smb-printers.conf
#
@@ -329,23 +355,6 @@ editfiles:
Append '; EDITED BY CFENGINE $(date)'
EndGroup
}
- samba::
- #
- # Local shares special for the site.
- # In this file you can define special shares that you need
- #
- { /etc/samba/smb-shares-$(site).conf
- #
- # We don't make this file dynamically, but instead we copy the contents
- # of a master file, but only if it's newer than the one installed.
- #
- BeginGroupIfFileIsNewer "/etc/local-$(host).$(domain)/samba/smb-shares-$(site).conf"
- EmptyEntireFilePlease
- InsertFile "/etc/local-$(host).$(domain)/samba/smb-shares-$(site).conf"
- Append "# Edited by cfengine $(date)"
- EndGroup
- DefineClasses "lprng_reload"
- }
lprng::
#
# Printer configuration stuff
@@ -369,6 +378,10 @@ directories:
mode=755
owner=root
group=root
+ $(locsharedir)
+ mode=775
+ owner=root
+ group=root
$(pgrshare)
mode=775
owner=root
diff --git a/cfengine/cf.site.xenux b/cfengine/cf.site.xenux
index a8dee1b..ee122a4 100644
--- a/cfengine/cf.site.xenux
+++ b/cfengine/cf.site.xenux
@@ -19,7 +19,7 @@ control:
sysadm = ( root@xenux.dk )
xenuxlocal::
site = ( xenuxlocal )
- domain = ( xenux.dk )
+ domain = ( xenux.local )
sysadm = ( root@xenux.dk )
raps:: # R-ApS
site = ( raps )
--
cgit v1.2.3