cfengine: Added support for autoconfigure of apts sources list. This

implementation supports the use of a local mirror, http://debian/. Just
add clients in the DebMirrorClients class.
apt: Added sources.list files that uses a local Debian mirror. Added a
us.potato|woody and dk.potato|woody.

5 files changed, 39 insertions, 15 deletions

diff --git a/cfengine/cf.groups.jones b/cfengine/cf.groups.jones
index 6b84082..4886a9a 100644
--- a/cfengine/cf.groups.jones
+++ b/cfengine/cf.groups.jones
@@ -34,6 +34,8 @@ groups:
 	IMAPServer_jones	= ( auryn fuchur xayide slamuf pierre ror rornaestved nimbus woody paf saks tansania )
 	MailHub_jones		= ( xayide jawa saks tansania )
 	MailClient_jones	= ( auryn fuchur xayide slamuf pierre ror wetware jawa woody mail2 gmork tulle paf saks )
+#	DebMirror_jones		= ( )
+#	DebMirrorClient_jones	= ( )
 
 	wol_jones		= ( auryn fuchur slamuf wetware jawa paf gonk )
 #	cc_jones		= ( )
diff --git a/cfengine/cf.groups.merge b/cfengine/cf.groups.merge
index 449e8dc..5d78089 100644
--- a/cfengine/cf.groups.merge
+++ b/cfengine/cf.groups.merge
@@ -6,21 +6,23 @@ import:
 	$(cfroot)/cf.groups.xenux
 
 groups:
-	Standalone	= ( Standalone_jones	Standalone_xenux )
-	WWWServer	= ( WWWServer_jones	WWWServer_xenux )
-	FTPServer	= ( FTPServer_jones	FTPServer_xenux )
-	NameServer	= ( NameServer_jones	NameServer_xenux )
-	FileServer	= ( FileServer_jones	FileServer_xenux )
-	VPNServer	= ( VPNServer_jones	VPNServer_xenux )
-	Firewall	= ( Firewall_jones	Firewall_xenux )
-	CVSServer	= ( CVSServer_jones	CVSServer_xenux )
-	GMServer	= ( GMServer_jones	GMServer_xenux )
-	CDWriter	= ( CDWriter_jones	CDWriter_xenux )
-	DHCPServer	= ( DHCPServer_jones	DHCPServer_xenux )
-	FAIServer	= ( FAIServer_jones	FAIServer_xenux )
-	IMAPServer	= ( IMAPServer_jones	IMAPServer_xenux )
-	MailHub		= ( MailHub_jones	MailHub_xenux )
-	MailClient	= ( MailClient_jones	MailClient_xenux )
+	Standalone	= ( Standalone_jones		Standalone_xenux )
+	WWWServer	= ( WWWServer_jones		WWWServer_xenux )
+	FTPServer	= ( FTPServer_jones		FTPServer_xenux )
+	NameServer	= ( NameServer_jones		NameServer_xenux )
+	FileServer	= ( FileServer_jones		FileServer_xenux )
+	VPNServer	= ( VPNServer_jones		VPNServer_xenux )
+	Firewall	= ( Firewall_jones		Firewall_xenux )
+	CVSServer	= ( CVSServer_jones		CVSServer_xenux )
+	GMServer	= ( GMServer_jones		GMServer_xenux )
+	CDWriter	= ( CDWriter_jones		CDWriter_xenux )
+	DHCPServer	= ( DHCPServer_jones		DHCPServer_xenux )
+	FAIServer	= ( FAIServer_jones		FAIServer_xenux )
+	IMAPServer	= ( IMAPServer_jones		IMAPServer_xenux )
+	MailHub		= ( MailHub_jones		MailHub_xenux )
+	MailClient	= ( MailClient_jones		MailClient_xenux )
+	DebMirror	= ( DebMirror_jones		DebMirror_xenux )
+	DebMirrorClient	= ( DebMirrorClient_jones	DebMirrorClient_xenux )
 
 	# ISP's
 	wol		= ( wol_jones		wol_xenux )
diff --git a/cfengine/cf.groups.xenux b/cfengine/cf.groups.xenux
index 56d17e4..eec308b 100644
--- a/cfengine/cf.groups.xenux
+++ b/cfengine/cf.groups.xenux
@@ -24,6 +24,8 @@ groups:
 	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 )
+	DebMirror_xenux		= ( thorin )
+	DebMirrorClient_xenux	= ( thorin legolas gandalf )
 
 	wol_xenux		= ( aries )
 	cc_xenux		= ( saga )
diff --git a/cfengine/cf.services b/cfengine/cf.services
index 9a76a88..c264618 100644
--- a/cfengine/cf.services
+++ b/cfengine/cf.services
@@ -13,3 +13,4 @@ import:
 #	$(cfroot)/cf.services.fai
     any::
 	$(cfroot)/cf.services.harden
+	$(cfroot)/cf.services.all
diff --git a/cfengine/cf.services.all b/cfengine/cf.services.all
new file mode 100644
index 0000000..069dcaa
--- /dev/null
+++ b/cfengine/cf.services.all
@@ -0,0 +1,17 @@
+groups:
+    potato = ( '/bin/grep -q 2.2 /etc/debian_version' )
+    woody = ( '/bin/grep -q 3.0 /etc/debian_version' )
+
+links:
+    DebMirrorClient.potato::
+	/etc/apt/sources.list	->!	/etc/local-COMMON/apt/sources.list.DEBMIRROR.potato
+    DebMirrorClient.woody::
+	/etc/apt/sources.list	->!	/etc/local-COMMON/apt/sources.list.DEBMIRROR.woody
+    dnai|sunrise.potato::
+	/etc/apt/sources.list	->!	/etc/local-COMMON/apt/sources.list.us.potato
+    dnai|sunrise.woody::
+	/etc/apt/sources.list	->!	/etc/local-COMMON/apt/sources.list.us.woody
+    !DebMirrorClient|!dnai|!sunrise.potato::
+	/etc/apt/sources.list	->!	/etc/local-COMMON/apt/sources.list.dk.potato
+    !DebMirrorClient|!dnai|!sunrise.woody::
+	/etc/apt/sources.list	->!	/etc/local-COMMON/apt/sources.list.dk.potato