Fix m4 sambashares autogeneration. Add m4 script for tansania.vega.dk.

5 files changed, 35 insertions, 5 deletions

diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file
index bf7ae59..be88959 100644
--- a/cfengine/cf.services.file
+++ b/cfengine/cf.services.file
@@ -208,7 +208,7 @@ editfiles:
 		    EmptyEntireFilePlease
 		    SetLine "# DO NOT EDIT - auto-created by cfengine $(date)"
 		    PrependIfNoLineMatching "^# .* cfengine .*"
-#		    RunScript "/usr/bin/m4 -DFQDN=$(fqhost) /etc/local-COMMON/samba/smb-shares.conf.m4 >> /etc/samba/smb-shares.conf"
+		    RunScript "/etc/local-COMMON/cfengine/script.update_sambashares.sh"
 		EndGroup
 		DefineClasses "samba_reload"
 	    }
diff --git a/cfengine/cf.services.file.tmp.m4 b/cfengine/cf.services.file.tmp.m4
index 24c4ae9..732f746 100644
--- a/cfengine/cf.services.file.tmp.m4
+++ b/cfengine/cf.services.file.tmp.m4
@@ -2,11 +2,11 @@ ifelse(`
 /etc/cfengine/cf.services.file.tmp.m4
 Copyright 2002 Jonas Smedegaard <dr@jones.dk>
 
-$Id: cf.services.file.tmp.m4,v 1.1 2002-04-16 22:59:06 jonas Exp $
+$Id: cf.services.file.tmp.m4,v 1.2 2002-08-04 23:31:46 jonas Exp $
 
 cfengine m4 skeleton file for cleaning up Samba and Netatalk shares
 
-Usage: m4 -DFQDN=<FQDN> /etc/local-COMMON/cfengine/cf.services.file.m4 > /tmp/cf.services.file
+Usage: m4 -DFQDN=<FQDN> /etc/local-COMMON/cfengine/cf.services.file.tmp.m4 > /tmp/cf.services.file
 
 Depend on file /etc/local-COMMON/file-<FQDN>.m4 containing lines of
 the following syntax:
diff --git a/cfengine/script.update_sambashares.sh b/cfengine/script.update_sambashares.sh
new file mode 100755
index 0000000..965abfb
--- /dev/null
+++ b/cfengine/script.update_sambashares.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "\$1: $1"
+echo "\$2: $2"
+echo "\$3: $3"
+
+m4 -DFQDN=$(hostname -f) /etc/local-COMMON/samba/smb-shares.conf.m4 >> /etc/samba/smb-shares.conf
diff --git a/file-artax.107b.dk.m4 b/file-artax.107b.dk.m4
index 6d493eb..58ae697 100644
--- a/file-artax.107b.dk.m4
+++ b/file-artax.107b.dk.m4
@@ -1,8 +1,8 @@
 dnl
-dnl /etc/local/file-saks.louiz.dk.m4
+dnl /etc/local/file-artax.107b.dk.m4
 dnl Copyright 2002 Jonas Smedegaard <dr@jones.dk>
 dnl
-dnl $Id: file-artax.107b.dk.m4,v 1.1 2002-06-13 09:58:58 jonas Exp $
+dnl $Id: file-artax.107b.dk.m4,v 1.2 2002-08-04 23:31:46 jonas Exp $
 dnl
 dnl Samba shares for Homebase Samba and Netatalk servers
 dnl
diff --git a/file-tansania.vega.dk.m4 b/file-tansania.vega.dk.m4
new file mode 100644
index 0000000..d2fff9d
--- /dev/null
+++ b/file-tansania.vega.dk.m4
@@ -0,0 +1,23 @@
+dnl
+dnl /etc/local/file-tansania.jones.dk.m4
+dnl Copyright 2002 Jonas Smedegaard <dr@jones.dk>
+dnl
+dnl $Id: file-tansania.vega.dk.m4,v 1.1 2002-08-04 23:31:46 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)
+_files(win,netlogon,Netværkslogon,/etc/samba/netlogon,root,root,755,ro)
+_files(win,userprofiles,Brugerprofiler,/home/fsadmin/COMMON/samba/userprofiles,root,root,755,ro)
+_files(win,reference,VEGA: Samba Linux server,/home/fsadmin/COMMON/C/reference)
+dnl
+_homefiles(win,homes,Personlige dokumenter,%H/pc)
+_homefiles(win,home_web,Personlige web-dokumenter,%H/public_html)
+dnl
+_files(win,software,Fælles software,/home/fsadmin/software,fsadmin,fsadmin,775,rw,fsadmin)
+_files(win,dokumenter,Fælles dokumenter,/home/fsadmin/COMMON/documents,fsadmin,fsadmin,775,rw,fsadmin)
+_files(win,admin,Tekniske dokumenter og værktøjer,/home/fsadmin/COMMON/admin,fsadmin,fsadmin,755,ro)
+dnl
+_printer(win,laser,HP LaserJet 4000 N,/tmp,lp)