summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cfengine/cf.groups.xenux21
-rw-r--r--cfengine/cf.site2
-rw-r--r--cfengine/cf.site.xenux12
-rw-r--r--dhcpd.conf.divitech20
-rw-r--r--dhcpd.conf.ntiexpo20
-rw-r--r--dhcpd.conf.radio-raatstof20
-rw-r--r--file-balrog.ntiexpo.local.m4 (renamed from file-baal.divitech.local.m4)5
-rw-r--r--file-gandalf.xenux.local78
-rw-r--r--printcap.radio-raatstof15
-rw-r--r--samba/netlogon/logon-ntiexpo.bat7
10 files changed, 45 insertions, 155 deletions
diff --git a/cfengine/cf.groups.xenux b/cfengine/cf.groups.xenux
index 6a1e5c5..56d17e4 100644
--- a/cfengine/cf.groups.xenux
+++ b/cfengine/cf.groups.xenux
@@ -5,29 +5,28 @@ groups:
xenux = ( elrond oin smaug bilbo orcrist beorn bill )
xenuxlocal = ( gandalf thorin legolas pc60 pc61 pc62 pc63 pc64 pc65 pc66 pc67 pc68 pc69 pc70 pc71 pc72 pc73 pc74 pc75 pc76 pc77 pc78 pc79 pc80 )
raps = ( aries )
- raatstof = ( raatstof )
sagahus = ( saga )
venture = ( mimer heimdal thor )
- divitech = ( baal )
+ ntiexpo = ( balrog )
Standalone_xenux = ( bilbo pc60 pc61 pc62 pc63 pc64 pc65 pc66 pc67 pc68 pc69 pc70 pc71 pc72 pc73 pc74 pc75 pc76 pc77 pc78 pc79 pc80 )
WWWServer_xenux = ( beorn saga )
- FTPServer_xenux = ( beorn smaug mimer baal )
- NameServer_xenux = ( elrond gandalf raatstof saga heimdal baal )
- FileServer_xenux = ( orcrist gandalf aries raatstof saga thor baal )
- VPNServer_xenux = ( orcrist aries heimdal baal )
- Firewall_xenux = ( orcrist aries raatstof saga heimdal baal )
- CVSServer_xenux = ( bilbo bill baal )
+ FTPServer_xenux = ( beorn smaug mimer )
+ NameServer_xenux = ( elrond gandalf saga heimdal balrog )
+ FileServer_xenux = ( orcrist gandalf aries saga thor balrog )
+ VPNServer_xenux = ( orcrist aries heimdal )
+ Firewall_xenux = ( orcrist aries saga heimdal )
+ CVSServer_xenux = ( bilbo bill )
GMServer_xenux = ( bilbo )
- DHCPServer_xenux = ( orcrist raatstof saga thorin heimdal baal )
+ DHCPServer_xenux = ( orcrist saga thorin heimdal balrog )
FAIServer_xenux = ( thorin )
- CDWriter_xenux = ( bilbo baal )
+ CDWriter_xenux = ( bilbo )
IMAPServer_xenux = ( oin )
MailHub_xenux = ( oin )
MailClient_xenux = ( pc60 pc61 pc62 pc63 pc64 pc65 pc66 pc67 pc68 pc69 pc70 pc71 pc72 pc73 pc74 pc75 pc76 pc77 pc78 pc79 pc80 )
wol_xenux = ( aries )
- cc_xenux = ( raatstof saga )
+ cc_xenux = ( saga )
# tdk_xenux = ( )
wp_xenux = ( oin www bilbo orcrist smaug beorn heimdal mimer )
# dnai_xenux = ( )
diff --git a/cfengine/cf.site b/cfengine/cf.site
index 88ca053..d86833d 100644
--- a/cfengine/cf.site
+++ b/cfengine/cf.site
@@ -1,5 +1,5 @@
import:
jones|homebase|pierre|rornaestved|satsbutikken|ida|shared|adamatic|cafe3|haakansson|peronard::
$(cfroot)/cf.site.jones
- xenux|xenuxlocal|raps|raatstof|sagahus|venture|divitech::
+ xenux|xenuxlocal|raps|sagahus|venture|ntiexpo::
$(cfroot)/cf.site.xenux
diff --git a/cfengine/cf.site.xenux b/cfengine/cf.site.xenux
index 447d930..3279506 100644
--- a/cfengine/cf.site.xenux
+++ b/cfengine/cf.site.xenux
@@ -25,10 +25,6 @@ control:
site = ( raps )
domain = ( r-aps.dk )
sysadm = ( root@r-aps.dk )
- raatstof:: # Radio Råtstof
- site = ( radio-raatstof )
- domain = ( raatstof.local )
- sysadm = ( postmaster@raatstof.dk )
sagahus:: # Sagahus
site = ( sagahus )
domain = ( sagahus.local )
@@ -37,10 +33,10 @@ control:
site = ( venture )
domain = ( venture.local )
sysadm = ( admin@husetventure.dk )
- divitech:: # divitech
- site = ( divitech )
- domain = ( divitech.local )
- sysadm = ( admin@divitech.dk )
+ ntiexpo:: # NTI
+ site = ( ntiexpo )
+ domain = ( nti-expo.local )
+ sysadm = ( klaus@xenux.dk )
# netmask = ( 255.255.255.0 )
diff --git a/dhcpd.conf.divitech b/dhcpd.conf.divitech
deleted file mode 100644
index cfc769e..0000000
--- a/dhcpd.conf.divitech
+++ /dev/null
@@ -1,20 +0,0 @@
-# dhcpd.conf
-#
-# DHCP configuration file for divitech.local
-#
-
-default-lease-time 1200;
-max-lease-time 7200;
-
-option subnet-mask 255.255.255.0;
-option routers 192.168.7.1;
-option domain-name-servers 192.168.7.1, 212.242.41.248, 212.242.41.249;
-option domain-name "divitech.local";
-option netbios-name-servers 192.168.7.1;
-
-# According to our policy, the dynamic address space starts
-# at .60 and ends at .229 giving 170 client addresses.
-# (See "System Description --> Network Model")
-subnet 192.168.7.0 netmask 255.255.255.0 {
- range 192.168.7.60 192.168.7.229;
-}
diff --git a/dhcpd.conf.ntiexpo b/dhcpd.conf.ntiexpo
new file mode 100644
index 0000000..c633b91
--- /dev/null
+++ b/dhcpd.conf.ntiexpo
@@ -0,0 +1,20 @@
+# dhcpd.conf
+#
+# DHCP configuration file for nti-expo.local
+#
+
+default-lease-time 1200;
+max-lease-time 7200;
+
+option subnet-mask 255.255.255.0;
+option routers 10.20.30.1;
+option domain-name-servers 10.20.30.1;
+option domain-name "nti-expo.local";
+option netbios-name-servers 10.20.30.1;
+
+# According to our policy, the dynamic address space starts
+# at .60 and ends at .229 giving 170 client addresses.
+# (See "System Description --> Network Model")
+subnet 10.20.30.0 netmask 255.255.255.0 {
+ range 10.20.30.60 10.20.30.229;
+}
diff --git a/dhcpd.conf.radio-raatstof b/dhcpd.conf.radio-raatstof
deleted file mode 100644
index 15109fd..0000000
--- a/dhcpd.conf.radio-raatstof
+++ /dev/null
@@ -1,20 +0,0 @@
-# dhcpd.conf
-#
-# DHCP configuration file for raatstof.local
-#
-
-default-lease-time 1200;
-max-lease-time 7200;
-
-option subnet-mask 255.255.255.0;
-option routers 192.168.3.1;
-option domain-name-servers 192.168.3.1, 212.54.64.170, 212.54.64.171;
-option domain-name "raatstof.local";
-option netbios-name-servers 192.168.3.1;
-
-# According to our policy, the dynamic address space starts
-# at .60 and ends at .229 giving 170 client addresses.
-# (See "System Description --> Network Model")
-subnet 192.168.3.0 netmask 255.255.255.0 {
- range 192.168.3.60 192.168.3.229;
-}
diff --git a/file-baal.divitech.local.m4 b/file-balrog.ntiexpo.local.m4
index 28ae350..2e8ffba 100644
--- a/file-baal.divitech.local.m4
+++ b/file-balrog.ntiexpo.local.m4
@@ -1,8 +1,8 @@
dnl
-dnl /etc/local/file-baal.divitech.local.m4
+dnl /etc/local/file-balrog.nti-expo.local.m4
dnl Copyright 2002 Jonas Smedegaard <dr@jones.dk>
dnl
-dnl $Id: file-baal.divitech.local.m4,v 1.1 2002-04-13 06:41:27 jonas Exp $
+dnl $Id: file-balrog.ntiexpo.local.m4,v 1.1 2002-04-24 14:48:36 klaus Exp $
dnl
dnl Samba shares for Homebase Samba and Netatalk servers
dnl
@@ -15,3 +15,4 @@ _homefiles(win,homes,,/home/%u/.pcshare)
_files(win,software,Fælles softshare,/home/fsadmin/COMMON/software,fsadmin,fsadmin,775,rw,fsadmin)
_files(win,dokumenter,Fælles drev for delte filer,/home/fsadmin/COMMON/documents,fsadmin,fsadmin,775,rw,fsadmin)
_files(win,admin,Dokumentation og adminværktøjer,/home/fsadmin/COMMON/admin,fsadmin,fsadmin,755,ro)
+_files(win,pdfshare,PDF Printdir,/home/fsadmin/COMMON/pdfshare,fsadmin,fsadmin,755,rw,fsadmin)
diff --git a/file-gandalf.xenux.local b/file-gandalf.xenux.local
deleted file mode 100644
index fd624ba..0000000
--- a/file-gandalf.xenux.local
+++ /dev/null
@@ -1,78 +0,0 @@
-[netlogon]
- comment = Network logon
- path = $(netlogshare)
- browsable = no
- writeable = no
- share modes = no
-[userprofiles]
- path = $(profshare)
- force user = %u
- writable = yes
- browsable = yes
- root preexec = '/bin/mkdir $(profshare)/%U \
- /bin/chown %U $(profshare)/%U \
- /bin/chmod 700 $(profshare)/%U'
-[homes]
- path = %H/$(privpcshare)
- browsable = no
- writeable = yes
- root preexec = '/bin/mkdir %H/$(privpcshare) \
- /bin/chown %S %H/$(privpcshare) \
- /bin/chmod 700 %H/$(privpcshare)'
-[software]
- path = $(softshare)
- comment = Fælles software for Xenux ApS
- browsable = yes
- guest ok = no
- writeable = yes
- create mask = 0660
- directory mask = 0770
- valid users = @$(admingrp)
- force group = +$(admingrp)
- delete veto files = Yes
- veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/
-[dokumenter]
- path = $(datashare)
- comment = Fælles dokumenter for Xenux ApS
- browsable = yes
- guest ok = no
- writeable = yes
- create mask = 0660
- directory mask = 0770
- valid users = @$(admingrp)
- force group = +$(admingrp)
- delete veto files = Yes
- veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/
-[fssoftware]
- path = /home/finn/documents
- comment = Fælles software for Finn Strandgaard A/S
- browsable = yes
- guest ok = no
- writeable = yes
- create mask = 0660
- directory mask = 0770
- valid users = @finn
- force group = +$finn
- delete veto files = Yes
- veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/
-[fsdokumenter]
- path = /home/finn/software
- comment = Fælles dokumenter for Finn Strandgaard A/S
- browsable = yes
- guest ok = no
- writeable = yes
- create mask = 0660
- directory mask = 0770
- valid users = @finn
- force group = +finn
- delete veto files = Yes
- veto files = /.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/
-[media]
- comment = Mp3 filer, film, spil etc.
- path = /home/jrisch/media
- public = no
- valid users = @mp3
- force group = +mp3
- writable = yes
- create mask = 0660
- directory mask = 0770
diff --git a/printcap.radio-raatstof b/printcap.radio-raatstof
deleted file mode 100644
index 692dad7..0000000
--- a/printcap.radio-raatstof
+++ /dev/null
@@ -1,15 +0,0 @@
-lp|epson|Epson Stylus Color 720:\
- :lp=:\
- :sd=/var/spool/lpd/epson:\
- :rm=192.168.200.40:\
- :rp=POSTSCRIPT_P1:\
- :af=/var/log/lp-acct:\
- :lf=/var/log/lp-errs:
-
-lp1|xerox|Xerox:\
- :lp=:\
- :sd=/var/spool/lpd/xerox:\
- :rm=192.168.3.40:\
- :rp=TEXT_P1:\
- :af=/var/log/lp-acct:\
- :lf=/var/log/lp-errs:
diff --git a/samba/netlogon/logon-ntiexpo.bat b/samba/netlogon/logon-ntiexpo.bat
new file mode 100644
index 0000000..a8e666e
--- /dev/null
+++ b/samba/netlogon/logon-ntiexpo.bat
@@ -0,0 +1,7 @@
+rem [Global] commands
+NET TIME \\balrog /SET /YES
+NET USE V: \\balrog\pdfshare /YES
+NET USE W: \\balrog\dokumenter /YES
+NET USE X: \\balrog\homes /YES
+NET USE Y: \\balrog\programmer /YES
+ \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 00:11:58 +0000