cfengine: Removed some unused sites.

3 files changed, 18 insertions, 29 deletions

diff --git a/cfengine/cf.groups.xenux b/cfengine/cf.groups.xenux
index 85989aa..2771377 100644
--- a/cfengine/cf.groups.xenux
+++ b/cfengine/cf.groups.xenux
@@ -2,11 +2,9 @@
 # NB! Avoid adding new groups! We pollute the namespace already...
 #
 groups:
-	xenux			= ( elrond oin smaug bilbo orcrist insight beorn )
-	xenuxlocal		= ( gandalf thorin pc60 pc61 pc62 pc63 pc64 pc65 pc66 pc67 pc68 pc69 pc70 pc71 pc72 pc73 pc74 pc75 pc76 pc77 pc78 pc79 pc80 )
+	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 )
-	grinsted		= ( debian-grinsted )
-	mogensen		= ( mogl-filer mogl-firewall )
 	raatstof		= ( raatstof )
 	sagahus			= ( saga )
 	venture			= ( mimer heimdal thor )
@@ -15,20 +13,20 @@ groups:
 	WWWServer_xenux		= ( beorn saga )
 	FTPServer_xenux		= ( beorn smaug mimer )
 	NameServer_xenux	= ( elrond gandalf raatstof saga heimdal )
-	FileServer_xenux	= ( orcrist gandalf mogl-filer aries raatstof saga thor )
-	VPNServer_xenux		= ( orcrist mogl-firewall aries debian-grinsted heimdal )
-	Firewall_xenux		= ( orcrist mogl-firewall aries debian-grinsted raatstof saga heimdal )
-	CVSServer_xenux		= ( bilbo )
+	FileServer_xenux	= ( orcrist gandalf aries raatstof saga thor )
+	VPNServer_xenux		= ( orcrist aries heimdal )
+	Firewall_xenux		= ( orcrist aries raatstof saga heimdal )
+	CVSServer_xenux		= ( bilbo bill )
 	GMServer_xenux		= ( bilbo )
 	DHCPServer_xenux	= ( orcrist raatstof saga thorin heimdal )
 	FAIServer_xenux		= ( thorin )
 	CDWriter_xenux		= ( bilbo )
 	IMAPServer_xenux	= ( oin )
 	MailHub_xenux		= ( oin )
-#	MailClient_xenux	= ( )
+	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		= ( )
-	cc_xenux		= ( raatstof mogl-firewall mogl-filer saga )
+	wol_xenux		= ( aries )
+	cc_xenux		= ( raatstof 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 c30c088..bd966c2 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|grinsted|mogensen|raatstof|sagahus|venture::
+    xenux|xenuxlocal|raps|raatstof|sagahus|venture::
 	$(cfroot)/cf.site.xenux
diff --git a/cfengine/cf.site.xenux b/cfengine/cf.site.xenux
index c53b77f..61f6366 100644
--- a/cfengine/cf.site.xenux
+++ b/cfengine/cf.site.xenux
@@ -25,14 +25,6 @@ control:
 	site		= ( raps )
 	domain		= ( r-aps.dk )
 	sysadm		= ( root@r-aps.dk )
-    grinsted::		# Grinsted Public
-	site		= ( grinsted )
-	domain		= ( public.dk )
-	sysadm		= ( root@post.public.dk )
-    mogensen::		# Mogensen & Lassen
-	site		= ( mogensen )
-	domain		= ( mogensen.com )
-	sysadm		= ( root@mogensen.com )
     raatstof::		# Radio Råtstof
 	site		= ( radio-raatstof )
 	domain		= ( raatstof.local )
@@ -44,7 +36,7 @@ control:
     venture::		# Huset Venture
 	site		= ( venture )
 	domain		= ( venture.local )
-	sysadm		= ( juri@xenux.dk )
+	sysadm		= ( admin@husetventure.dk )
 
 #	netmask		= ( 255.255.255.0 )
 
@@ -59,7 +51,7 @@ defaultroute:
 	62.242.55.89
     mogl::
 	192.168.11.1
-    raatstof::
+    raatstof|saga::
 	10.0.0.1
 
 ######################################################################
@@ -69,16 +61,15 @@ resolve:
     xenux::
 	"search xenux.dk"
     xenuxlocal::
-	"search xenux.local xenux.dk"
-	192.168.200.20
-    raps::
+	"search xenux.local"
 	"search xenux.dk"
-    grinsted::
-	"search grinsted.dk"
-    mogl::
-	"search mogensen.com"
+    raps::
+	"search r-aps.local"
     raatstof::
 	"search raatstof.local"
+    saga::
+	"search saga.local"
+	"search sagahus.dk"
     NameServer::
 	127.0.0.1		# localhost