[Demudi-commits] r446 - in demudi-cfengine/trunk: . chunks debian scripts

[Free Ekanayaka]

Author: free-guest
Date: 2005-03-10 15:26:19 +0100 (Thu, 10 Mar 2005)
New Revision: 446

Removed:
   demudi-cfengine/trunk/chunks/apt-etc_apt_preferences
   demudi-cfengine/trunk/scripts/apt
Modified:
   demudi-cfengine/trunk/cfagent.conf.in
   demudi-cfengine/trunk/debian/changelog
Log:
demudi-cfengine:   
 * Removed the apt script, now handled with base-config

Modified: demudi-cfengine/trunk/cfagent.conf.in
===================================================================
--- demudi-cfengine/trunk/cfagent.conf.in	2005-03-10 11:25:31 UTC (rev 445)
+++ demudi-cfengine/trunk/cfagent.conf.in	2005-03-10 14:26:19 UTC (rev 446)
@@ -18,8 +18,6 @@
 	end      = ( "### END DEMUDI" )
 	comment  = ( "# these lines were automatically edited by demudi-cfengine, don't touch!" )
 	chunks   = ( "/usr/share/demudi-cfengine/chunks" )
-	debian   = ( "deb http://ftp.debian.org/debian testing main" )
-	agnula   = ( "deb http://apt.agnula.org/demudi stable main local" )
 
 	#
 	#  Decides what to be done and in which sequence
@@ -37,11 +35,6 @@
 
 ###############################################################################
 
-groups:
-	networked	= ( '/bin/sh -c "/sbin/route -n | /bin/grep -q -e ^0.0.0.0"' )
-
-###############################################################################
-
 import:
 #IMPORT#
 

Deleted: demudi-cfengine/trunk/chunks/apt-etc_apt_preferences
===================================================================
--- demudi-cfengine/trunk/chunks/apt-etc_apt_preferences	2005-03-10 11:25:31 UTC (rev 445)
+++ demudi-cfengine/trunk/chunks/apt-etc_apt_preferences	2005-03-10 14:26:19 UTC (rev 446)
@@ -1,4 +0,0 @@
-
-Package: *
-Pin: release o=AGNULA
-Pin-Priority: 1001

Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2005-03-10 11:25:31 UTC (rev 445)
+++ demudi-cfengine/trunk/debian/changelog	2005-03-10 14:26:19 UTC (rev 446)
@@ -1,3 +1,9 @@
+demudi-cfengine (0.18) unstable; urgency=low
+
+  * Removed the apt script, now handled with base-config
+
+ -- Free Ekanayaka <free@agnula.org>  Wed,  9 Mar 2005 13:56:10 +0100
+
 demudi-cfengine (0.17) unstable; urgency=low
 
   * Added script to configure fluxbox key bindings

Deleted: demudi-cfengine/trunk/scripts/apt
===================================================================
--- demudi-cfengine/trunk/scripts/apt	2005-03-10 11:25:31 UTC (rev 445)
+++ demudi-cfengine/trunk/scripts/apt	2005-03-10 14:26:19 UTC (rev 446)
@@ -1,47 +0,0 @@
-files:
-	/etc/apt/sources.list
-				mode=644
-				owner=root
-				group=root
-				action=touch
-
-	/etc/apt/preferences
-				mode=644
-				owner=root
-				group=root
-				action=touch
-
-editfiles:
-
-	{ /etc/apt/preferences
-		BeginGroupIfNoLineContaining "AGNULA"
-			InsertFile "$(chunks)/apt-etc_apt_preferences"
-		EndGroup
-	}
-
-	{ /etc/apt/sources.list
-		BeginGroupIfNoLineContaining "$(begin)"
-			Append "$(begin)"
-			Append "$(end)"
-			GotoLastLine
-			IncrementPointer "-1"
-		EndGroup
-
-		LocateLineMatching "$(begin)"
-		InsertLine "$(comment)"
-		InsertLine ""
-		InsertLine "# A/DeMuDi packages"
-		InsertLine "#$(agnula)"
-		InsertLine ""
-		InsertLine "# Whole Debian archive"
-		InsertLine "#$(debian)"
-		InsertLine  ""
-		IncrementPointer "1"
-		DeleteToLineMatching "$(end)"
-	}
-
-	networked::
-		{ /etc/apt/sources.list
-			SetCommentStart "#"
-			UnCommentLinesContaining "$(agnula)"
-		}