diff options
| -rw-r--r-- | cfengine/cf.services.file | 51 | ||||
| -rw-r--r-- | cfengine/cf.site.xenux | 2 | ||||
| -rw-r--r-- | dhcpd.conf.xenuxlocal | 28 |
3 files changed, 61 insertions, 20 deletions
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 ) @@ -296,6 +296,32 @@ editfiles: 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 # # This file contains all the printers defined in the Linux printing @@ -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 ) diff --git a/dhcpd.conf.xenuxlocal b/dhcpd.conf.xenuxlocal new file mode 100644 index 0000000..300d94c --- /dev/null +++ b/dhcpd.conf.xenuxlocal @@ -0,0 +1,28 @@ +# dhcpd.conf +# +# DHCP configuration file for xenux.local +# + +default-lease-time 1200; +max-lease-time 7200; + +option subnet-mask 255.255.255.0; +option routers 192.168.200.1; +option domain-name-servers 192.168.200.20, 212.54.64.170, 212.54.64.171; +option domain-name "xenux.local"; +option netbios-name-servers 192.168.200.1; + +# According to our policy, the dynamic address space starts +# at .60 and ends at .229 giving 170 client addresses. +# (See "System Description --> Network Model") +subnet 192.168.200.0 netmask 255.255.255.0 { + range 192.168.200.60 192.168.200.229; +} + +# According to our policy, the printers address space starts +# at .40 and ends at .59 giving 20 printer addresses. +# (See "System Description --> Network Model") +host brother1270n { + hardware ethernet 00:80:77:31:a2:6a; + fixed-address 192.168.200.40; +} |