[Demudi-commits] r130 - in demudi-cfengine/trunk: . debian

[Free Ekanayaka]

Author: free-guest
Date: 2004-11-09 05:12:10 -0700 (Tue, 09 Nov 2004)
New Revision: 130

Added:
   demudi-cfengine/trunk/cfagent.conf.in
   demudi-cfengine/trunk/demudi-cfengine
Removed:
   demudi-cfengine/trunk/cfagent.conf
   demudi-cfengine/trunk/demudi-cfengine
Modified:
   demudi-cfengine/trunk/debian/changelog
   demudi-cfengine/trunk/debian/rules
Log:
demudi-cfengine (0.4) UNRELEASED; urgency=low

  * Automatic generation the import section in cfagent.conf.in

 -- Free Ekanayaka <free@agnula.org>  Tue,  9 Nov 2004 11:37:49 +0100

Deleted: demudi-cfengine/trunk/cfagent.conf
===================================================================
--- demudi-cfengine/trunk/cfagent.conf	2004-11-09 11:36:58 UTC (rev 129)
+++ demudi-cfengine/trunk/cfagent.conf	2004-11-09 12:12:10 UTC (rev 130)
@@ -1,61 +0,0 @@
-#
-# This is the main cfengine config file for the DeMuDi project.  All
-# other cfengine config files are included from this file.
-#
-###############################################################################
-
-control:
-
-	#
-	# Cfengine settings
-	#
-	EditfileSize  = ( 30000 ) 
-
-	#
-	# Useful variables
-	#
-	begin		= ( "### BEGIN DEMUDI" )
-	end		= ( "### END DEMUDI" )
-	comment		= ( "# these lines were automatically edited by demudi-base, don't touch!" )
-	chunks		= ( "/usr/share/demudi-cfengine/chunks" )
-
-	#
-	#  Decides what to be done and in which sequence
-	#
-	
-	actionsequence = (
-				directories
-				files
-				links
-				shellcommands
-              			editfiles
-       			 )
-
-
-###############################################################################
-
-groups:
-	networked	= ( '/bin/sh -c "/sbin/route -n | /bin/grep -q -e ^0.0.0.0"' )
-
-###############################################################################
-
-import:
-#	apt
-#	bash
-	gdm
-#	nano
-#	procps
-#	solfege
-#	vim
-
-#	prebaseconfig::
-#			apt
-#			bash
-#			grub
-#
-#	postbaseconfig::
-#			menu
-#			vim
-
-
-###############################################################################

Copied: demudi-cfengine/trunk/cfagent.conf.in (from rev 129, demudi-cfengine/trunk/cfagent.conf)
===================================================================
--- demudi-cfengine/trunk/cfagent.conf	2004-11-09 11:36:58 UTC (rev 129)
+++ demudi-cfengine/trunk/cfagent.conf.in	2004-11-09 12:12:10 UTC (rev 130)
@@ -0,0 +1,45 @@
+#
+# This is the main cfengine config file for the DeMuDi project.  All
+# other cfengine config files are included from this file.
+#
+###############################################################################
+
+control:
+
+	#
+	# Cfengine settings
+	#
+	EditfileSize  = ( 30000 ) 
+
+	#
+	# Useful variables
+	#
+	begin		= ( "### BEGIN DEMUDI" )
+	end		= ( "### END DEMUDI" )
+	comment		= ( "# these lines were automatically edited by demudi-base, don't touch!" )
+	chunks		= ( "/usr/share/demudi-cfengine/chunks" )
+
+	#
+	#  Decides what to be done and in which sequence
+	#
+	
+	actionsequence = (
+				directories
+				files
+				links
+				shellcommands
+              			editfiles
+       			 )
+
+
+###############################################################################
+
+groups:
+	networked	= ( '/bin/sh -c "/sbin/route -n | /bin/grep -q -e ^0.0.0.0"' )
+
+###############################################################################
+
+import:
+#IMPORT#
+
+###############################################################################

Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2004-11-09 11:36:58 UTC (rev 129)
+++ demudi-cfengine/trunk/debian/changelog	2004-11-09 12:12:10 UTC (rev 130)
@@ -1,3 +1,9 @@
+demudi-cfengine (0.4) UNRELEASED; urgency=low
+
+  * Automatic generation the import section in cfagent.conf.in
+
+ -- Free Ekanayaka <free@agnula.org>  Tue,  9 Nov 2004 11:37:49 +0100
+
 demudi-cfengine (0.3) unstable; urgency=low
 
   * Added gdm script to allow reboot without password and set graphical greeter

Modified: demudi-cfengine/trunk/debian/rules
===================================================================
--- demudi-cfengine/trunk/debian/rules	2004-11-09 11:36:58 UTC (rev 129)
+++ demudi-cfengine/trunk/debian/rules	2004-11-09 12:12:10 UTC (rev 130)
@@ -1,11 +1,21 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+
+scripts=$(shell find scripts/ -maxdepth 1 -type f | xargs -n1 basename|sort)
+#; done; echo -e "\tall::"; 
+
 build:
+	for i in $(scripts); do echo -e "\t$$i::\n\t\t$$i"; done > cfagent.conf.import
+	echo -e "\tall::" >> cfagent.conf.import
+	for i in $(scripts); do echo -e "\t\t$$i"; done >> cfagent.conf.import
+	sed -e '/^#IMPORT#/r cfagent.conf.import' cfagent.conf.in | sed -e  '/^#IMPORT#/d' > cfagent.conf
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean 
+	-rm cfagent.conf
+	-rm cfagent.conf.import
 
 install:
 	dh_testdir

Deleted: demudi-cfengine/trunk/demudi-cfengine
===================================================================
--- demudi-cfengine/trunk/demudi-cfengine	2004-11-09 11:36:58 UTC (rev 129)
+++ demudi-cfengine/trunk/demudi-cfengine	2004-11-09 12:12:10 UTC (rev 130)
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-# This script configures an A/DeMuDi installation
-
-set -e
-
-binary=/usr/sbin/cfagent
-basedir=/usr/share/demudi-cfengine
-inputs=$basedir/scripts
-config=$basedir/cfagent.conf
-
-export CFINPUTS="$inputs"
-cd $inputs && $binary -v -f $config
-
-exit 0

Added: demudi-cfengine/trunk/demudi-cfengine
===================================================================
--- demudi-cfengine/trunk/demudi-cfengine	2004-11-09 11:36:58 UTC (rev 129)
+++ demudi-cfengine/trunk/demudi-cfengine	2004-11-09 12:12:10 UTC (rev 130)
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+# This script configures an A/DeMuDi installation
+
+set -e
+
+if [ "$1" ]; then
+	script=$1
+else
+	script="all"
+fi
+
+binary=/usr/sbin/cfagent
+basedir=/usr/share/demudi-cfengine
+inputs=$basedir/scripts
+config=$basedir/cfagent.conf
+
+export CFINPUTS="$inputs"
+cd $inputs && $binary -v -f $config -D $script
+
+exit 0


Property changes on: demudi-cfengine/trunk/demudi-cfengine
___________________________________________________________________
Name: svn:executable
   + *