From 2d0ba0ddd8f03479d10eb3903c537d99121c0bef Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 20 Mar 2002 19:51:53 +0000 Subject: samba: Cleanup and improvements to m4 file. --- samba/smb-shares.m4 | 68 ++++++++++++++++++++++++----------- samba/smb_gandalf.xenux.local.conf.m4 | 8 ++--- samba/smb_jawa.homebase.dk.conf.m4 | 24 +++++++++---- 3 files changed, 69 insertions(+), 31 deletions(-) (limited to 'samba') diff --git a/samba/smb-shares.m4 b/samba/smb-shares.m4 index ac40e03..814b55c 100644 --- a/samba/smb-shares.m4 +++ b/samba/smb-shares.m4 @@ -1,33 +1,56 @@ define(_veto_mac,/.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/)dnl -define(_share_logon,[netlogon] - comment = $1 - path = $2 - browsable = no - writeable = no - share modes = no +dnl +dnl Common share options +dnl -------------------- +dnl +dnl $1 Share name +dnl $2 Description +dnl $3 Path +dnl +define(_share_logon,[$1] + comment = $2 + path = $3 )dnl -define(_share_profiles,[userprofiles] - path = $1 +define(_share_profiles,[$1] + comment = $2 + path = $3 force user = %u writable = yes browsable = yes - root preexec = '/bin/mkdir $1/%U \ - /bin/chown %U $1/%U \ - /bin/chmod 700 $1/%U' + root preexec = '/bin/mkdir $3/%U \ + /bin/chown %U $3/%U \ + /bin/chmod 700 $3/%U' )dnl -define(_share_home,[homes] - path = %H/$1 - browsable = no +define(_share_reference,[$1] + comment = $2 + path = $3 + guest ok = yes +)dnl +dnl +define(_share_home,[$1] + comment = $2 + path = $3 writeable = yes - root preexec = '/bin/mkdir %H/$1 \ - /bin/chown %S %H/$1 \ - /bin/chmod 700 %H/$1' + root preexec = '/bin/mkdir $3 \ + /bin/chown %S $3 \ + /bin/chmod 700 $3' )dnl +define(_share_home,[home_mac] + comment = $1 + path = $2 +)dnl +define(_share_home_web,[$1] + comment = $2 + path = $3 + writeable = yes + create mask = 0644 + directory mask = 0755 +)dnl +dnl define(_share_pc,[$1] comment = $2 path = $3 browsable = yes - guest ok = no writeable = yes create mask = 0660 directory mask = 0770 @@ -38,8 +61,6 @@ define(_share_mac,[$1] comment = $2 path = $3 browsable = yes - guest ok = no - writeable = no valid users = @$4 veto files = _veto_mac )dnl @@ -47,7 +68,6 @@ define(_share_common,[$1] comment = $2 path = $3 browsable = yes - guest ok = no writeable = yes create mask = 0660 directory mask = 0770 @@ -56,3 +76,9 @@ define(_share_common,[$1] delete veto files = Yes veto files = _veto_mac )dnl +define(_share_printer,[$1] + comment = $2 + path = $3 + printable = yes + printer name = $4 +)dnl diff --git a/samba/smb_gandalf.xenux.local.conf.m4 b/samba/smb_gandalf.xenux.local.conf.m4 index f97320a..4aa5ba6 100644 --- a/samba/smb_gandalf.xenux.local.conf.m4 +++ b/samba/smb_gandalf.xenux.local.conf.m4 @@ -1,7 +1,7 @@ -include(smb-shares.m4) -_share_logon(Network logon,$(netlogshare)) -_share_profiles($(profshare)) -_share_home($(privpcshare)) +include(smb-shares.m4)dnl +_share_logon(netlogon,Network logon,$(netlogshare)) +_share_profiles(userprofiles,Brugerprofiler,$(profshare)) +_share_home(homes,Personlige dokumenter,%H/$(privpcshare)) _share_common(software,Fælles software for Xenux ApS,$(softshare),$(admingrp)) _share_common(dokumenter,Fælles dokumenter for Xenux ApS,$(datashare),$(admingrp)) _share_common(fssoftware,Fælles software for Finn Strandgaard A/S,/home/finn/documents,finn) diff --git a/samba/smb_jawa.homebase.dk.conf.m4 b/samba/smb_jawa.homebase.dk.conf.m4 index f3de4f1..8123931 100644 --- a/samba/smb_jawa.homebase.dk.conf.m4 +++ b/samba/smb_jawa.homebase.dk.conf.m4 @@ -1,4 +1,12 @@ include(smb-shares.m4)dnl +_share_logon(netlogon,Netværkslogon,/var/local/samba/COMMON/C/netlogon) +_share_profiles(userprofiles,Brugerprofiler,/var/local/samba/userprofiles) +_share_reference(reference,DEBIAN: Samba Linux server,/var/local/samba/COMMON/C/reference) +dnl +_share_home(homes,Personlige dokumenter,%H/pc) +_share_home_mac(home_mac,Personlige Macintosh-dokumenter,%H/mac) +_share_home_web(home_web,Personlige web-dokumenter,%H/public_html) +dnl _share_mac(hb,Homebase Arkiver (Mac),/volumes/homebase/hb/hb,hb) _share_mac(hbsoft,Homebase Software (Mac),/volumes/homebase/hb/admin,hb) _share_mac(admin,Homebase Teknik (Mac),/volumes/homebase/admin/admin,admin) @@ -7,13 +15,13 @@ _share_mac(fl,Frontl _share_mac(fllock,Frontløberne Låste arkiver (Mac),/volumes/misc/fl/flstab,fl) _share_mac(flstab,Frontløberne Stabsarkiver (Mac),/volumes/misc/flstab/flstab,flstab) dnl -_share_mac(js,`Software, dr.jones',/var/local/netatalk/COMMON/C/software/users/jonas/,users) -_share_mac(js,`Software, engelsk, dr.jones',/var/local/netatalk/COMMON/en/software/users/jonas/,users) -_share_mac(js,`Software, dansk, dr.jones',/var/local/netatalk/COMMON/da/software/users/jonas/,users) +_share_mac(std,`Software, dr.jones',/var/local/netatalk/COMMON/C/software/users/jonas/,users) +_share_mac(std_en,`Software, engelsk, dr.jones',/var/local/netatalk/COMMON/en/software/users/jonas/,users) +_share_mac(std_da,`Software, dansk, dr.jones',/var/local/netatalk/COMMON/da/software/users/jonas/,users) dnl -_share_mac(js,`Admin, dr.jones',/var/local/netatalk/COMMON/C/admin/users/jonas/,admin) -_share_mac(js,`Admin, engelsk, dr.jones',/var/local/netatalk/COMMON/en/admin/users/jonas/,admin) -_share_mac(js,`Admin, dansk, dr.jones',/var/local/netatalk/COMMON/da/admin/users/jonas/,admin) +_share_mac(adm,`Admin, dr.jones',/var/local/netatalk/COMMON/C/admin/users/jonas/,admin) +_share_mac(adm_en,`Admin, engelsk, dr.jones',/var/local/netatalk/COMMON/en/admin/users/jonas/,admin) +_share_mac(adm_da,`Admin, dansk, dr.jones',/var/local/netatalk/COMMON/da/admin/users/jonas/,admin) dnl _share_mac(km,KaosManagement Arkiver (Mac),/volumes/km/km/km,km) _share_mac(kmstab,KaosMAnagement Administration (Mac),/volumes/km/kmstab/kmstab,kmstab) @@ -24,3 +32,7 @@ _share_mac(kpstab,KaosPiloterne Stabsarkiver (Mac),/volumes/kp/kpstab/kpstab,kps dnl _share_mac(fl,Café Kølbert (Mac),/volumes/misc/kolbert/kolbert,kolbert) dnl +_share_printer(HP,Networkprinter queue for HP 2100 (postscript level 3),/tmp,hp) +_share_printer(KPHP,Networkprinter queue for HP 2100 (postscript level 3),/tmp,kphp) +_share_printer(KPLW,Networkprinter queue for Apple LaserWriter 8500 (postscript level 3),/tmp,kplw) +_share_printer(LW,Networkprinter queue for Apple LaserWriter 16/600,/tmp,lw) -- cgit v1.2.3