summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cfengine/cf.services.file25
-rw-r--r--samba/netlogon/common.bat7
2 files changed, 28 insertions, 4 deletions
diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file
index eb347f6..2968dc4 100644
--- a/cfengine/cf.services.file
+++ b/cfengine/cf.services.file
@@ -232,10 +232,10 @@ editfiles:
#
# [programmer]
#
- BeginGroupIfNoLineMatching "^\[programmer\]"
- Append '[programmer]'
+ BeginGroupIfNoLineMatching "^\[software\]"
+ Append '[software]'
Append ' path = $(pgrshare)'
- Append ' comment = Programmer'
+ Append ' comment = Fælles software'
Append ' browsable = yes'
Append ' guest ok = yes'
Append ' writeable = yes'
@@ -266,7 +266,7 @@ editfiles:
BeginGroupIfFileIsNewer "/etc/local-COMMON/samba/smb-shares-$(site).conf"
EmptyEntireFilePlease
InsertFile "/etc/local-COMMON/samba/smb-shares-$(site).conf"
- Append "# Edited by cfengine $(date)"
+ Append "; Edited by cfengine $(date)"
EndGroup
DefineClasses "samba_reload"
}
@@ -296,6 +296,23 @@ editfiles:
EndGroup
}
+ #
+ # Batch file for mounting shares automatically
+ #
+ { /etc/samba/netlogon/common.bat
+ #
+ # 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/netlogon/common.bat"
+ AutoCreate
+ EmptyEntireFilePlease
+ InsertFile "/etc/local-COMMON/samba/netlogon/common.bat"
+ Append "rem Edited by cfengine $(date)"
+ EndGroup
+ DefineClasses "samba_reload"
+ }
+
lprng::
{ /etc/samba/smb.conf
#
diff --git a/samba/netlogon/common.bat b/samba/netlogon/common.bat
new file mode 100644
index 0000000..3133455
--- /dev/null
+++ b/samba/netlogon/common.bat
@@ -0,0 +1,7 @@
+rem [Global] commands
+@ECHO "Welcome to Xenux' network!!!"
+NET TIME \\Debian /SET /YES
+NET USE F: \\Debian\dokumenter /YES
+NET USE U: \\Debian\homes /YES
+NET USE P: \\Debian\programmer /YES
+ \ No newline at end of file