diff options
| -rw-r--r-- | cfengine/cf.services.file | 63 |
1 files changed, 38 insertions, 25 deletions
diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file index fb0ca5c..d5e1a12 100644 --- a/cfengine/cf.services.file +++ b/cfengine/cf.services.file @@ -11,12 +11,20 @@ control: # section. # netlogshare = ( /etc/samba/netlogon ) - commonsharedir = ( /var/local/filesharing/COMMON ) - locsharedir = ( /var/local/filesharing/local ) - datashare = ( /var/local/filesharing/COMMON/documents ) - pgrshare = ( /var/local/filesharing/COMMON/software ) - profshare = ( /var/local/filesharing/COMMON/samba/userprofiles ) - printdir = ( /var/spool/samba ) + commonsharedir = ( /home/fsadmin/COMMON ) + datashare = ( /home/fsadmin/COMMON/documents ) + softshare = ( /home/fsadmin/COMMON/software ) + profshare = ( /home/fsadmin/COMMON/samba/userprofiles ) + printdir = ( /var/spool/sharedprinter ) + privpcshare = ( .pcshare ) + privmacshare = ( .macshare ) + privxchngshare = ( .xchangeshare ) + + # + # Administrative user and group + # + adminuser = ( fsadmin ) + admingrp = ( fsadmin ) # # Determine if this is a samba server, netatalk server or both, and define @@ -223,22 +231,24 @@ editfiles: # BeginGroupIfNoLineMatching "^\[homes\]" Append '[homes]' - Append ' path = /home/%u/shared' + Append ' path = /home/%u/$(privpcshare)' Append ' browsable = no' - Append ' root preexec = /bin/mkdir /home/%u/shared \' - Append ' /bin/chown %U /home/%u/shared \' - Append ' /bin/chmod 644 /home/%u/shared' + Append ' root preexec = /bin/mkdir /home/%u/$(privpcshare) \' + Append ' /bin/chown %U /home/%u/$(privpcshare) \' + Append ' /bin/chmod 644 /home/%u/$(privpcshare)' EndGroup # # [programmer] # BeginGroupIfNoLineMatching "^\[software\]" Append '[software]' - Append ' path = $(pgrshare)' + Append ' path = $(softshare)' Append ' comment = Fælles software' Append ' browsable = yes' - Append ' guest ok = yes' + Append ' guest ok = no' Append ' writeable = yes' + Append ' valid users = @$(admingrp)' + Append ' force group = +$(admingrp)' EndGroup # # [dokumenter] @@ -250,6 +260,8 @@ editfiles: Append ' browsable = yes' Append ' guest ok = no' Append ' writeable = yes' + Append ' valid users = @$(admingrp)' + Append ' force group = +$(admingrp)' EndGroup DefineClasses "samba_reload" } @@ -387,20 +399,16 @@ directories: any:: $(commonsharedir) mode=755 - owner=root - group=root - $(locsharedir) + owner=$(adminuser) + group=$(admingrp) + $(softshare) mode=775 - owner=root - group=root - $(pgrshare) - mode=775 - owner=root - group=users + owner=$(adminuser) + group=$(admingrp) $(datashare) mode=775 - owner=root - group=users + owner=$(adminuser) + group=$(admingrp) samba:: $(netlogshare) mode=755 @@ -408,11 +416,16 @@ directories: group=root $(profshare) mode=775 + owner=$(adminuser) + group=$(admingrp) + $(printdir) + mode=775 owner=root - group=users + group=root processes: - "smb" restart "/etc/init.d/samba restart" + "smbd" restart "/etc/init.d/samba restart" + "afpd" restart "/etc/init.d/netatalk restart" shellcommands: samba_reload:: |