summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2003-05-20 19:25:51 +0000
committerJonas Smedegaard <dr@jones.dk>2003-05-20 19:25:51 +0000
commit5be25e0ee995d42f61bc21196199a8be66f23445 (patch)
tree920e6d5bcc59fe7477d98b3230e92ac9d130da06
parentbd1f87c760d54ba7df3c6931718b6dc070a0934d (diff)
Add morla.conduct.dk.
-rw-r--r--cfengine/cf.groups.jones12
-rw-r--r--cfengine/cf.site2
-rw-r--r--cfengine/cf.site.jones8
3 files changed, 11 insertions, 11 deletions
diff --git a/cfengine/cf.groups.jones b/cfengine/cf.groups.jones
index 7284593..f79b099 100644
--- a/cfengine/cf.groups.jones
+++ b/cfengine/cf.groups.jones
@@ -9,7 +9,7 @@ groups:
idaskolen = ( ida )
shared = ( gmork )
homebase = ( jawa nimbus )
- adamatic = ( nat mail2 web rudi ns )
+ conduct = ( morla )
cafe3 = ( cafe3 )
haakansson = ( tulle )
peronard = ( paf )
@@ -18,9 +18,9 @@ groups:
vega = ( tansania gana )
Standalone_jones = ( auryn fuchur paf )
- WWWServer_jones = ( auryn fuchur xayide argax slamuf pierre cafe3 ror wetware rornaestved satsbutikken ida jawa woody mail2 web tulle gmork paf artax saks gonk coreander tansania cherry )
- FTPServer_jones = ( auryn fuchur xayide argax slamuf pierre jawa woody web gmork paf artax saks coreander tansania cherry ida )
- NameServer_jones = ( auryn xayide slamuf pierre tulle paf artax saks gonk coreander tansania ida rornaestved )
+ WWWServer_jones = ( auryn fuchur xayide argax slamuf pierre cafe3 ror wetware rornaestved satsbutikken ida jawa woody mail2 web tulle gmork paf artax saks gonk coreander tansania cherry morla )
+ FTPServer_jones = ( auryn fuchur xayide argax slamuf pierre jawa woody web gmork paf artax saks coreander tansania cherry ida morla )
+ NameServer_jones = ( auryn xayide slamuf pierre tulle paf artax saks gonk coreander tansania ida rornaestved morla )
# FileServer_jones = ( auryn fuchur xayide argax slamuf pierre cafe3 wetware rornaestved satsbutikken ida jawa woody gmork artax )
FileServer_jones = ( cafe3 gmork paf artax saks tansania ida cherry )
# VPNServer_jones = ( )
@@ -31,8 +31,8 @@ groups:
# CDWriter_jones = ( )
# DHCPServer_jones = ( xayide pierre rornaestved satsbutikken ida jawa cafe3 tulle paf )
# FAIServer_jones = ( )
- IMAPServer_jones = ( auryn fuchur xayide slamuf pierre ror rornaestved nimbus woody paf saks coreander tansania cherry )
- MailHub_jones = ( xayide jawa saks coreander tansania cherry )
+ IMAPServer_jones = ( auryn fuchur xayide slamuf pierre ror rornaestved nimbus woody paf saks coreander tansania cherry morla )
+ MailHub_jones = ( xayide jawa saks coreander tansania cherry morla )
MailClient_jones = ( auryn fuchur xayide slamuf pierre ror wetware jawa woody mail2 gmork tulle paf saks cherry )
# DebMirror_jones = ( )
# DebMirrorClient_jones = ( )
diff --git a/cfengine/cf.site b/cfengine/cf.site
index af2aa52..150d698 100644
--- a/cfengine/cf.site
+++ b/cfengine/cf.site
@@ -1,5 +1,5 @@
import:
- jones|homebase|pierre|rornaestved|satsbutikken|idaskolen|shared|adamatic|cafe3|haakansson|peronard|louiz|lab|steenwinkel|vega::
+ jones|homebase|pierre|rornaestved|satsbutikken|idaskolen|shared|conduct|cafe3|haakansson|peronard|louiz|lab|steenwinkel|vega::
$(cfroot)/cf.site.jones
xenux|xenuxlocal|raps|sagahus|venture|ntiexpo|helenesminde::
$(cfroot)/cf.site.xenux
diff --git a/cfengine/cf.site.jones b/cfengine/cf.site.jones
index 1c400a3..700f54a 100644
--- a/cfengine/cf.site.jones
+++ b/cfengine/cf.site.jones
@@ -43,10 +43,10 @@ control:
site = ( shared )
domain = ( shared.dk )
sysadm = ( hostmaster@shared.dk )
- adamatic::
- site = ( adamatic )
- domain = ( a-host.dk )
- sysadm = ( hostmaster@a-host.dk )
+ conduct::
+ site = ( conduct )
+ domain = ( conduct.dk )
+ sysadm = ( hostmaster@conduct.dk )
cafe3::
site = ( cafe3 )
domain = ( cafe3.ch )