From 61a481bd77ff9e7d52ce7545990d142729824324 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 14 Feb 2002 12:46:17 +0000
Subject: cfengine: split jones and spiff groups into separat ones. samba: Add
 cafe3 config.

---
 cfengine/cf.groups.jones | 11 ++++++++---
 cfengine/cf.site         |  2 +-
 cfengine/cf.site.jones   | 34 +++++++++++++++++++++++++++-------
 3 files changed, 36 insertions(+), 11 deletions(-)

(limited to 'cfengine')

diff --git a/cfengine/cf.groups.jones b/cfengine/cf.groups.jones
index cf521da..490e404 100644
--- a/cfengine/cf.groups.jones
+++ b/cfengine/cf.groups.jones
@@ -2,17 +2,22 @@
 # NB! Avoid adding new groups! We pollute the namespace already...
 #
 groups:
-	jones			= ( auryn fuchur xayide argax slamuf pierre cafe3 ror wetware )
-	spiff			= ( rornaestved satsbutikken ida )
+	jones			= ( auryn fuchur xayide argax slamuf ror )
+	pierre			= ( pierre )
+	rornaestved		= ( rornaestved )
+	satsbutikken		= ( satsbutikken )
+	ida			= ( ida )
+	shared			= ( gmork )
 	homebase		= ( honda jawa nimbus )
-	macvaerk		= ( woody )
 	adamatic		= ( nat mail2 web rudi ns )
+	cafe3			= ( cafe3 )
 
 	Standalone_jones	= ( auryn fuchur )
 	WWWServer_jones		= ( auryn fuchur xayide argax slamuf pierre cafe3 ror wetware rornaestved satsbutikken ida honda jawa woody mail2 web )
 	FTPServer_jones		= ( auryn fuchur xayide argax slamuf pierre jawa woody web )
 	NameServer_jones	= ( auryn xayide slamuf pierre )
 #	FileServer_jones	= ( auryn fuchur xayide argax slamuf pierre cafe3 wetware rornaestved satsbutikken ida honda jawa woody )
+	FileServer_jones	= ( cafe3 )
 #	VPNServer_jones		= ( )
 	Firewall_jones		= ( slamuf pierre cafe3 wetware rornaestved ida woody )
 #	CVSServer_jones		= ( )
diff --git a/cfengine/cf.site b/cfengine/cf.site
index f5ef3e5..1bec66e 100644
--- a/cfengine/cf.site
+++ b/cfengine/cf.site
@@ -1,5 +1,5 @@
 import:
-    jones|macvaerk|homebase|adamatic::
+    jones|homebase|pierre|rornaestved|satsbutikken|ida|shared|adamatic|cafe3::
 	$(cfroot)/cf.site.jones
     xenux|xenuxlocal|raps|grinsted|mogensen|raatstof|sagahus::
 	$(cfroot)/cf.site.xenux
diff --git a/cfengine/cf.site.jones b/cfengine/cf.site.jones
index 24ffe93..6c705cc 100644
--- a/cfengine/cf.site.jones
+++ b/cfengine/cf.site.jones
@@ -16,19 +16,39 @@ control:
     jones::
 	site		= ( jones )
 	domain		= ( jones.dk )
-	sysadm		= ( dr@jones.dk ) 
+	sysadm		= ( dr@jones.dk )
     homebase::
 	site		= ( homebase )
 	domain		= ( homebase.dk )
-	sysadm		= ( teknik@homebase.dk ) 
+	sysadm		= ( teknik@homebase.dk )
+    pierre::
+	site		= ( pierre )
+	domain		= ( pierre-suites.com )
+	sysadm		= ( hostmaster@pierre-suites.com )
+    rornaestved::
+	site		= ( ror )
+	domain		= ( ror.local )
+	sysadm		= ( hostmaster@ror.local )
+    satsbutikken::
+	site		= ( satsbutikken )
+	domain		= ( satsbutikken.dk )
+	sysadm		= ( hostmaster@satsbutikken.dk )
+    ida::
+	site		= ( ida )
+	domain		= ( idraetsdaghojskolen.dk )
+	sysadm		= ( hostmaster@idraetsdaghojskolen.dk )
+    shared::
+	site		= ( shared )
+	domain		= ( shared.dk )
+	sysadm		= ( hostmaster@shared.dk )
     adamatic::
 	site		= ( adamatic )
 	domain		= ( a-host.dk )
-	sysadm		= ( hostmaster@a-host.dk ) 
-    macvaerk::
-	site		= ( macvaerk )
-	domain		= ( macvaerk.com )
-	sysadm		= ( hostmaster@macvaerk.com ) 
+	sysadm		= ( hostmaster@a-host.dk )
+    cafe3::
+	site		= ( cafe3 )
+	domain		= ( cafe3.ch )
+	sysadm		= ( hostmaster@cafe3.ch )
 
 	timezone	= ( MET CET )
 
-- 
cgit v1.2.3