[Demudi-commits] r113 - / demudi-cfengine demudi-cfengine/trunk demudi-cfengine/trunk/chunks demudi-cfengine/trunk/debian demudi-cfengine/trunk/scripts

Free Ekanayaka free-guest@haydn.debian.org
Mon, 08 Nov 2004 08:05:51 -0700


Author: free-guest
Date: 2004-11-08 08:05:30 -0700 (Mon, 08 Nov 2004)
New Revision: 113

Added:
   demudi-cfengine/
   demudi-cfengine/tags/
   demudi-cfengine/trunk/
   demudi-cfengine/trunk/cfagent.conf
   demudi-cfengine/trunk/chunks/
   demudi-cfengine/trunk/chunks/apt-etc_apt_preferences
   demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list
   demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
   demudi-cfengine/trunk/debian/
   demudi-cfengine/trunk/debian/changelog
   demudi-cfengine/trunk/debian/compat
   demudi-cfengine/trunk/debian/control
   demudi-cfengine/trunk/debian/copyright
   demudi-cfengine/trunk/debian/install
   demudi-cfengine/trunk/debian/rules
   demudi-cfengine/trunk/demudi-cfengine
   demudi-cfengine/trunk/scripts/
   demudi-cfengine/trunk/scripts/apt
   demudi-cfengine/trunk/scripts/bash
   demudi-cfengine/trunk/scripts/nano
   demudi-cfengine/trunk/scripts/procps
   demudi-cfengine/trunk/scripts/solfege
   demudi-cfengine/trunk/scripts/vim
Log:
[svn-inject] Installing original source of demudi-cfengine

Added: demudi-cfengine/trunk/cfagent.conf
===================================================================
--- demudi-cfengine/trunk/cfagent.conf	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/cfagent.conf	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,55 @@
+#
+# This is the main cfengine config file for the DeMuDi project.  All
+# other cfengine config files are included from this file.
+#
+###############################################################################
+
+control:
+
+	#
+	# 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
+	nano
+	procps
+	solfege
+	vim
+
+#	prebaseconfig::
+#			apt
+#			bash
+#			grub
+#
+#	postbaseconfig::
+#			menu
+#			vim
+
+
+###############################################################################

Added: demudi-cfengine/trunk/chunks/apt-etc_apt_preferences
===================================================================
--- demudi-cfengine/trunk/chunks/apt-etc_apt_preferences	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/chunks/apt-etc_apt_preferences	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,4 @@
+
+Package: *
+Pin: release o=AGNULA
+Pin-Priority: 1001

Added: demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list
===================================================================
--- demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/chunks/apt-etc_apt_sources.list	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,3 @@
+
+# A/DeMuDi APT repository
+deb http://apt.agnula.org/demudi testing main local

Added: demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
===================================================================
--- demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,22 @@
+    if [ $(whoami) = root ]; then
+    	MARK=\#
+    else
+    	MARK=\$
+    fi
+    
+    export PS1="\[\]\h \[\] \[\]\W \[\]$MARK\[\] "
+    export PS2="\[[[1m\]>\[[[0m\] "
+    export PS4="\[[[1m\]+\[[[0m\] "
+    
+    export LS_COLORS='no=00:fi=00:di=01;36:ln=01;36:pi=40;33:so=01;35:bd=40;33;01:\
+    cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:ex=01;32:*.cmd=01;32:*.exe=01;32:\
+    *.com=01;32:*.btm=01;32:*.bat=01;32:*.tar=04;31:*.tgz=04;33:*.arj=04;33:\
+    *.taz=04;33:*.lzh=04;33:*.zip=04;33:*.z=04;33:*.Z=04;33:*.gz=04;33:*.deb=04;33:\
+    *.rpm=04;33:*.jpg=01;35:*.gif=01;35:*.bmp=01;35:*.xbm=01;35:*.xpm=01;35:*.ps=01;32:\
+    *.pdf=01;32:*.wav=01;39:*.mp3=01;37:*.c=01;33:*.h=01;39:'
+    
+    eval `dircolors -b`
+    alias ls='ls --color=auto'
+    alias ll='ls -l'
+    alias la='ls -A'
+    alias l='ls -CF'

Added: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/debian/changelog	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,17 @@
+demudi-cfengine (0.1) unstable; urgency=low
+
+  * Added script to set nano as default editor
+  * Removed ide-scsi script, have to find a better solution with ide-cd
+  * Bew naming policy: scripts are named against the package they deal
+    with, which chunks are named package-somedirname_otherdirname_filename;
+   renamed files accordingly
+  * Removed alsa script, force-stop has been re-introduced
+    in alsa-base 1.0.5 and alsaconf has been fixed
+  * Removed discover script, we are now using xdebconfigurator
+    instead of knoppix scripts, and it know about correct paths
+  * Removed timidity script, the debian stock one now ships with
+    pre-canned freepats support
+  * Removed the hdparm script, as it was making arbitrary assumption
+    on the disk to optimise, we should rather write proper documentation
+
+ -- Free Ekanayaka <free@agnula.org>  Mon,  8 Nov 2004 14:01:19 +0100

Added: demudi-cfengine/trunk/debian/compat
===================================================================
--- demudi-cfengine/trunk/debian/compat	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/debian/compat	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1 @@
+4

Added: demudi-cfengine/trunk/debian/control
===================================================================
--- demudi-cfengine/trunk/debian/control	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/debian/control	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,15 @@
+Source: demudi-cfengine
+Section: misc
+Priority: optional
+Maintainer: Free Ekanayaka <free@agnula.org>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.1
+
+Package: demudi-cfengine
+Architecture: all
+Depends: debconf (>= 0.5), cfengine2
+Recommends: apt, bash, procps, vim
+Conflicts: demudi-base
+Description: DeMuDi cfengine scripts
+ This package contains cfengine scripts  that are used to
+ customise a plain Debian installation.

Added: demudi-cfengine/trunk/debian/copyright
===================================================================
--- demudi-cfengine/trunk/debian/copyright	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/debian/copyright	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,8 @@
+demudi-cfengine
+
+Copyright 2004 Free Ekanayaka <free@agnula.org>
+Copyright 2004 Media Innovation Unit - Firenze Tecnologia
+
+This set of tools is licensed under the General Public License
+version 2 or any later version. You can find it in 
+/usr/share/common-licenses/GPL on a Debian GNU system.

Added: demudi-cfengine/trunk/debian/install
===================================================================
--- demudi-cfengine/trunk/debian/install	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/debian/install	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,4 @@
+scripts/	usr/share/demudi-cfengine/
+chunks/		usr/share/demudi-cfengine/
+cfagent.conf	usr/share/demudi-cfengine/
+demudi-cfengine	usr/sbin/

Added: demudi-cfengine/trunk/debian/rules
===================================================================
--- demudi-cfengine/trunk/debian/rules	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/debian/rules	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+build:
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean 
+
+install:
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+# Build architecture-independent files here.
+binary: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_installdeb
+	dh_fixperms
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+.PHONY: binary install clean


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

Added: demudi-cfengine/trunk/demudi-cfengine
===================================================================
--- demudi-cfengine/trunk/demudi-cfengine	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/demudi-cfengine	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,15 @@
+#! /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


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

Added: demudi-cfengine/trunk/scripts/apt
===================================================================
--- demudi-cfengine/trunk/scripts/apt	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/scripts/apt	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,45 @@
+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 "$(begin)"
+			Append "$(begin)"
+			Append "$(end)"
+			GotoLastLine
+			IncrementPointer "-1"
+		EndGroup
+
+		LocateLineMatching "$(begin)"
+		InsertFile "$(chunks)/apt-etc_apt_preferences"
+		IncrementPointer "1"
+		DeleteToLineMatching "$(end)"
+	}
+
+	networked::
+
+		{ /etc/apt/sources.list
+			BeginGroupIfNoLineContaining "$(begin)"
+				Append "$(begin)"
+				Append "$(end)"
+				GotoLastLine
+				IncrementPointer "-1"
+			EndGroup
+
+			LocateLineMatching "$(begin)"
+			InsertLine "$(comment)"
+			InsertFile "$(chunks)/apt-etc_apt_sources.list"
+			IncrementPointer "1"
+			DeleteToLineMatching "$(end)"
+		}

Added: demudi-cfengine/trunk/scripts/bash
===================================================================
--- demudi-cfengine/trunk/scripts/bash	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/scripts/bash	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,55 @@
+editfiles:
+
+    { /etc/skel/.bash_profile
+
+	SetCommentStart "#"
+
+	BeginGroupIfNoLineContaining "# include .bashrc if it exists"
+		Append "# include .bashrc if it exists"
+		Append "#if [ -f ~/.bashrc ]; then"
+		Append "#    . ~/.bashrc"
+		Append "#fi"
+	EndGroup
+
+	LocateLineMatching ".*include .bashrc if it exists"
+	IncrementPointer "1"
+	UnCommentNLines "3"
+
+    }
+
+    { /etc/skel/.bashrc
+
+	SetCommentStart "#"
+
+	#	
+	# We set our own propmt
+	#
+	CommentLinesStarting "    PS1="
+
+	#
+	# Set smart bash completition
+	# 
+	LocateLineMatching ".*enable programmable completion features.*"
+	IncrementPointer "2"
+	UnCommentNLines "3"
+	IncrementPointer "-1"
+
+	#
+	# Insert our chunk
+	#
+	BeginGroupIfNoLineContaining "    $(begin)"
+		LocateLineMatching "^fi$"
+		IncrementPointer "-1"
+		InsertLine ""
+		InsertLine "    $(begin)"
+		InsertLine "    $(end)"
+		IncrementPointer "-4"
+	EndGroup
+
+	LocateLineMatching "    $(begin)"
+		InsertLine "    $(comment)"
+		InsertFile "$(chunks)/bash-etc_bash.bashrc"
+		IncrementPointer "1"
+	DeleteToLineMatching "    $(end)"
+
+    }

Added: demudi-cfengine/trunk/scripts/nano
===================================================================
--- demudi-cfengine/trunk/scripts/nano	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/scripts/nano	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,3 @@
+shellcommands:
+
+	"/usr/sbin/update-alternatives --set editor /bin/nano"

Added: demudi-cfengine/trunk/scripts/procps
===================================================================
--- demudi-cfengine/trunk/scripts/procps	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/scripts/procps	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,5 @@
+editfiles:
+
+    { /etc/sysctl.conf
+	AppendIfNoSuchLine "kernel.lowlatency = 1"
+    }

Added: demudi-cfengine/trunk/scripts/solfege
===================================================================
--- demudi-cfengine/trunk/scripts/solfege	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/scripts/solfege	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,6 @@
+editfiles:
+
+	{ /usr/share/solfege/default.config
+		ReplaceAll "^type=sequencer-device" With "type=external-midiplayer"
+		ReplaceAll "^commandline=drvmidi -i d %s" With "commandline=timidity -idqq %s"
+	}

Added: demudi-cfengine/trunk/scripts/vim
===================================================================
--- demudi-cfengine/trunk/scripts/vim	2004-11-08 13:04:40 UTC (rev 112)
+++ demudi-cfengine/trunk/scripts/vim	2004-11-08 15:05:30 UTC (rev 113)
@@ -0,0 +1,10 @@
+editfiles:
+
+    { /etc/vim/vimrc
+
+	# Turn on syntax highlighting
+
+	SetCommentStart "\""
+	UnCommentLinesMatching "^\" syntax on"
+
+    }