From d0f9490b22d53617e39114347cf189f1a919e588 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 7 Apr 2002 23:48:42 +0000 Subject: Work on m4 file sharing config generation - jawa.homebase.dk transition to new layout half done. --- file-gandalf.xenux.local.m4 | 11 +++++++- file-jawa.homebase.dk.m4 | 68 +++++++++++++++++++++------------------------ file-thor.venture.local.m4 | 10 +++++++ samba/smb-shares.m4 | 4 +-- 4 files changed, 54 insertions(+), 39 deletions(-) diff --git a/file-gandalf.xenux.local.m4 b/file-gandalf.xenux.local.m4 index 4aa5ba6..a8744c3 100644 --- a/file-gandalf.xenux.local.m4 +++ b/file-gandalf.xenux.local.m4 @@ -1,4 +1,13 @@ -include(smb-shares.m4)dnl +dnl +dnl /etc/local/file-gandalf.xenux.local.m4 +dnl Copyright 2002 Jonas Smedegaard +dnl +dnl $Id: file-gandalf.xenux.local.m4,v 1.2 2002-04-07 23:48:42 jonas Exp $ +dnl +dnl Samba shares for Homebase Samba and Netatalk servers +dnl +dnl Used by /etc/cfengine/cf.local.services.file.conf.m4 and /etc/samba/smb-shares.m4 +dnl _share_logon(netlogon,Network logon,$(netlogshare)) _share_profiles(userprofiles,Brugerprofiler,$(profshare)) _share_home(homes,Personlige dokumenter,%H/$(privpcshare)) diff --git a/file-jawa.homebase.dk.m4 b/file-jawa.homebase.dk.m4 index ffbbb88..d09ad75 100644 --- a/file-jawa.homebase.dk.m4 +++ b/file-jawa.homebase.dk.m4 @@ -1,51 +1,47 @@ dnl -dnl /etc/samba/smb_jawa.homebase.dk.conf.m4 +dnl /etc/local/file-jawa.homebase.dk.m4 dnl Copyright 2002 Jonas Smedegaard dnl -dnl $Id: file-jawa.homebase.dk.m4,v 1.1 2002-04-07 23:23:11 jonas Exp $ +dnl $Id: file-jawa.homebase.dk.m4,v 1.2 2002-04-07 23:48:42 jonas Exp $ dnl -dnl Samba shares for Homebase Samba server +dnl Samba shares for Homebase Samba and Netatalk servers dnl -dnl Usage: m4 thisfile > `/etc/samba/smb_jawa.homebase.dk.conf` +dnl Used by /etc/cfengine/cf.local.services.file.conf.m4 and /etc/samba/smb-shares.m4 dnl -dnl or from Midnight Commander with this file selected and /etc/samba in the other frame: -dnl m4 %s > `basename %s .m4` +_files(win,netlogon,Netværkslogon,/var/local/samba/COMMON/C/netlogon) +_files(win,userprofiles,Brugerprofiler,/var/local/samba/userprofiles) +_files(win,reference,DEBIAN: Samba Linux server,/var/local/samba/COMMON/C/reference) dnl -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) +_homefiles(win,homes,Personlige dokumenter,%H/pc) +_homefiles(mac,home_mac,Personlige Macintosh-dokumenter,%H/mac,ro) +_homefiles(win,home_web,Personlige web-dokumenter,%H/public_html) 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) +_files(win,hb,Homebase Arkiver (Mac),/volumes/homebase/hb/hb,hb) +_files(win,hbsoft,Homebase Software (Mac),/volumes/homebase/hb/admin,hb) +_files(win,admin,Homebase Teknik (Mac),/volumes/homebase/admin/admin,admin) 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) +_files(win,fl,Frontløberne Fællesarkiver (Mac),/volumes/misc/fl/fl,fl) +_files(win,fllock,Frontløberne Låste arkiver (Mac),/volumes/misc/fl/flstab,fl) +_files(win,flstab,Frontløberne Stabsarkiver (Mac),/volumes/misc/flstab/flstab,flstab) dnl -_share_mac(fl,Frontløberne Fællesarkiver (Mac),/volumes/misc/fl/fl,fl) -_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) +_files(win,std,`Software, dr.jones',/var/local/netatalk/COMMON/C/software/users/jonas/,users) +_files(win,std_en,`Software, engelsk, dr.jones',/var/local/netatalk/COMMON/en/software/users/jonas/,users) +_files(win,std_da,`Software, dansk, dr.jones',/var/local/netatalk/COMMON/da/software/users/jonas/,users) dnl -_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) +_files(win,adm,`Admin, dr.jones',/var/local/netatalk/COMMON/C/admin/users/jonas/,admin) +_files(win,adm_en,`Admin, engelsk, dr.jones',/var/local/netatalk/COMMON/en/admin/users/jonas/,admin) +_files(win,adm_da,`Admin, dansk, dr.jones',/var/local/netatalk/COMMON/da/admin/users/jonas/,admin) dnl -_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) +_files(win,km,KaosManagement Arkiver (Mac),/volumes/km/km/km,km) +_files(win,kmstab,KaosMAnagement Administration (Mac),/volumes/km/kmstab/kmstab,kmstab) dnl -_share_mac(km,KaosManagement Arkiver (Mac),/volumes/km/km/km,km) -_share_mac(kmstab,KaosMAnagement Administration (Mac),/volumes/km/kmstab/kmstab,kmstab) +_files(win,kp,KaosPiloterne Fællesarkiver (Mac),/volumes/kp/kp/kp,kp) +_files(win,kplock,KaosPiloterne Låste arkiver (Mac),/volumes/kp/kp/kpstab,kp) +_files(win,kpstab,KaosPiloterne Stabsarkiver (Mac),/volumes/kp/kpstab/kpstab,kpstab) dnl -_share_mac(kp,KaosPiloterne Fællesarkiver (Mac),/volumes/kp/kp/kp,kp) -_share_mac(kplock,KaosPiloterne Låste arkiver (Mac),/volumes/kp/kp/kpstab,kp) -_share_mac(kpstab,KaosPiloterne Stabsarkiver (Mac),/volumes/kp/kpstab/kpstab,kpstab) +_files(win,fl,Café Kølbert (Mac),/volumes/misc/kolbert/kolbert,kolbert) 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) +_printer(win,HP,Networkprinter queue for HP 2100 (postscript level 3),/tmp,hp) +_printer(win,KPHP,Networkprinter queue for HP 2100 (postscript level 3),/tmp,kphp) +_printer(win,KPLW,Networkprinter queue for Apple LaserWriter 8500 (postscript level 3),/tmp,kplw) +_printer(win,LW,Networkprinter queue for Apple LaserWriter 16/600,/tmp,lw) diff --git a/file-thor.venture.local.m4 b/file-thor.venture.local.m4 index 2624c77..31ca573 100644 --- a/file-thor.venture.local.m4 +++ b/file-thor.venture.local.m4 @@ -1,3 +1,13 @@ +dnl +dnl /etc/local/file-thor.venture.local.m4 +dnl Copyright 2002 Jonas Smedegaard +dnl +dnl $Id: file-thor.venture.local.m4,v 1.2 2002-04-07 23:48:42 jonas Exp $ +dnl +dnl Samba shares for Homebase Samba and Netatalk servers +dnl +dnl Used by /etc/cfengine/cf.local.services.file.conf.m4 and /etc/samba/smb-shares.m4 +dnl _dir(any,/home/fsadmin/COMMON,fsadmin,fsadmin,755) _homefiles(win,homes,Personlige dokumenter,%H/.pcshare) _files(win,soft,softshare,/home/fsadmin/COMMON/software,fsadmin,fsadmin,775) diff --git a/samba/smb-shares.m4 b/samba/smb-shares.m4 index 96f5b7c..6aca51e 100644 --- a/samba/smb-shares.m4 +++ b/samba/smb-shares.m4 @@ -2,7 +2,7 @@ ifelse(` /etc/samba/smb-shares.m4 Copyright 2002 Jonas Smedegaard -$Id: smb-shares.m4,v 1.6 2002-04-07 23:23:11 jonas Exp $ +$Id: smb-shares.m4,v 1.7 2002-04-07 23:48:42 jonas Exp $ m4 share definitions for generating Samba server smb.conf include file @@ -11,7 +11,7 @@ Usage: m4 -DFQDN= /etc/samba/smb-shares.conf.m4 > /etc/samba/smb-shares.co Depend on file /etc/local-COMMON/file-.m4 containing lines of the following syntax: _dir(,,,)dnl - _home(,,,[,ro])dnl + _homefiles(,,,[,ro])dnl _files(,,,,,,[,ro[,]|,rw,[,]])dnl where : Client operating systems (mac|win|any) -- cgit v1.2.3