[Debconf-video-commits] r118 - in fai-config: class doc doc/src files files/etc files/etc/apt/apt.conf.d/7debconf7 files/etc/ntp.conf files/etc/sudoers files/usr files/usr/local files/usr/local/sbin files/usr/local/sbin/softupdate hooks package_config scripts scripts/DEBCONF8 scripts/DEFAULT scripts/FAIBASE scripts/LAST
holger at alioth.debian.org
holger at alioth.debian.org
Sun Aug 3 18:34:48 UTC 2008
Author: holger
Date: 2008-08-03 18:34:47 +0000 (Sun, 03 Aug 2008)
New Revision: 118
Added:
fai-config/class/27-debconf7-classes
fai-config/class/28-debconf8-classes
fai-config/class/DEBCONF8.var
fai-config/files/etc/apt/apt.conf.d/7debconf7/DEBCONF
fai-config/files/etc/ntp.conf/
fai-config/files/etc/ntp.conf/DEBCONF8
fai-config/files/etc/sudoers/DEBCONF8
fai-config/files/usr/
fai-config/files/usr/local/
fai-config/files/usr/local/sbin/
fai-config/files/usr/local/sbin/softupdate/
fai-config/files/usr/local/sbin/softupdate/DEFAULT
fai-config/hooks/savelog.LAST.source
fai-config/scripts/DEBCONF8/
fai-config/scripts/DEBCONF8/40-munin-node
fai-config/scripts/DEFAULT/
fai-config/scripts/DEFAULT/99-softupdate-sh
Removed:
fai-config/class/20-debconf7-classes
fai-config/files/DEBCONF
fai-config/hooks/savelog.LAST
fai-config/scripts/LAST/50-misc
Modified:
fai-config/doc/TODO
fai-config/doc/src/preseed.cfg
fai-config/package_config/VIDEO
fai-config/scripts/FAIBASE/10-misc
Log:
several changes to migrate the config space to DebConf8
Deleted: fai-config/class/20-debconf7-classes
===================================================================
--- fai-config/class/20-debconf7-classes 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/class/20-debconf7-classes 2008-08-03 18:34:47 UTC (rev 118)
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-#
-# this is more or less a dummy commit to see if commit mails work
-#
-
-# some classes for all hosts
-echo "FAIBASE DEBCONF VIDEO"
-
-# assign classes for hosts at debconf7
-case `hostname -f` in
- *.dc7.debconf.org)
- echo "DEBCONF7" ;;
-esac
-
-case $HOSTNAME in
- mickey|daffy|donald)
- echo "ENCODING";;
- selma|mrwhite)
- echo "BRIDGE";;
-esac
-case $HOSTNAME in
- selma|shadow|hashbaz|patty|mrwhite|itchy|scratchy)
- echo "CAPTURE";;
-esac
-case $HOSTNAME in
- selma|mrwhite|itchy|scratchy)
- echo "DVSWITCH";;
-esac
-
-
-# temp. fileserver
-case $HOSTNAME in
- abe)
- echo "ENCODING";;
-esac
-
Copied: fai-config/class/27-debconf7-classes (from rev 114, fai-config/class/20-debconf7-classes)
===================================================================
--- fai-config/class/27-debconf7-classes (rev 0)
+++ fai-config/class/27-debconf7-classes 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+exit 0
+
+# some classes for all hosts
+echo "FAIBASE DEBCONF VIDEO"
+
+# assign classes for hosts at debconf7
+case `hostname -f` in
+ *.dc7.debconf.org)
+ echo "DEBCONF7" ;;
+esac
+
+case $HOSTNAME in
+ mickey|daffy|donald)
+ echo "ENCODING";;
+ selma|mrwhite)
+ echo "BRIDGE";;
+esac
+case $HOSTNAME in
+ selma|shadow|hashbaz|patty|mrwhite|itchy|scratchy)
+ echo "CAPTURE";;
+esac
+case $HOSTNAME in
+ selma|mrwhite|itchy|scratchy)
+ echo "DVSWITCH";;
+esac
+
+
+# temp. fileserver
+case $HOSTNAME in
+ abe)
+ echo "ENCODING";;
+esac
+
Added: fai-config/class/28-debconf8-classes
===================================================================
--- fai-config/class/28-debconf8-classes (rev 0)
+++ fai-config/class/28-debconf8-classes 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# some classes for all hosts
+echo "FAIBASE DEBCONF VIDEO"
+
+# assign classes for hosts at debconf7
+case `hostname -f` in
+ *.dc8.debconf.org)
+ echo "DEBCONF8" ;;
+esac
+
+case $HOSTNAME in
+ daffy)
+ echo "ENCODING";;
+ selma|patty|itchy|scratchy)
+ echo "CAPTURE";;
+ mrwhite)
+ echo "REVIEW";;
+esac
+
+case $HOSTNAME in
+ selma|scratchy)
+ echo "DVSWITCH";;
+esac
+
+
+
Property changes on: fai-config/class/28-debconf8-classes
___________________________________________________________________
Name: svn:executable
+ *
Added: fai-config/class/DEBCONF8.var
===================================================================
--- fai-config/class/DEBCONF8.var (rev 0)
+++ fai-config/class/DEBCONF8.var 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,3 @@
+UTC=no
+time_zone=Argentina/Buenos_Aires
+FAI_ACTION=softupdate
Modified: fai-config/doc/TODO
===================================================================
--- fai-config/doc/TODO 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/doc/TODO 2008-08-03 18:34:47 UTC (rev 118)
@@ -1,12 +1,20 @@
+todo for softupdates
+--------------------
+
+- move README from wiki to here and link this version in the wiki
+- use fai to copy conf/dc8/blubb to /etc/debconf-video/default and replace passwords after copying
+
+todo for usbsticks
+------------------
+(not needed for .ar anymore)
+
- test if hostname is really asked as it should
-- maybe do that fully automatic in .ar? (by relying on dhcp)
-- put the ud ldap configiguration from dc7 in fai classes
- change to use debconfs apt repo not holgers
- huh? test if apt key really is fetched via http
-- in .ar: ask for root-pw?!
-- in .ar: choose a proper mirror
-- cleanup+adopt fai config space from dc7 to dc8
--- design host setup first
-- move README from wiki to here and link this version in the wiki
-- upload fixed ffmpeg2theora package to cmburns (our apt repo), #429937
-- use fai to copy conf/dc8/blubb to /etc/debconf-video/default and replace passwords after copying
+- in .ar: ask for root-pw?! set one and mail it
+
+todo for dc9
+------------
+- put the ud ldap configiguration from dc7 in fai classes (now done manually by mhy)
+
Modified: fai-config/doc/src/preseed.cfg
===================================================================
--- fai-config/doc/src/preseed.cfg 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/doc/src/preseed.cfg 2008-08-03 18:34:47 UTC (rev 118)
@@ -42,7 +42,7 @@
# values set here. However, setting the values still prevents the questions
# from being shown, even if values come from dhcp.
#d-i netcfg/get_hostname string wuff
-#d-i netcfg/get_domain string athome
+d-i netcfg/get_domain string debconf.org
# Disable that annoying WEP key dialog.
d-i netcfg/wireless_wep string
@@ -53,7 +53,7 @@
# If you select ftp, the mirror/country string does not need to be set.
#d-i mirror/protocol string ftp
d-i mirror/country string enter information manually
-d-i mirror/http/hostname string ftp.de.debian.org
+d-i mirror/http/hostname string mirror
d-i mirror/http/directory string /debian
# Suite to install.
@@ -70,10 +70,10 @@
# Alternatively, you can specify a disk to partition. The device name
# can be given in either devfs or traditional non-devfs format.
# For example, to use the first disk:
-#d-i partman-auto/disk string /dev/discs/disc0/disc
+d-i partman-auto/disk string /dev/discs/disc0/disc
# In addition, you'll need to specify the method to use.
# The presently available methods are: "regular", "lvm" and "crypto"
-#d-i partman-auto/method string crypto
+d-i partman-auto/method string regular
# If one of the disks that are going to be automatically partitioned
# contains an old LVM configuration, the user will normally receive a
@@ -84,9 +84,9 @@
# You can choose from any of the predefined partitioning recipes.
# Note: this must be preseeded with a localized (translated) value.
+d-i partman-auto/choose_recipe \
+ select All files in one partition (recommended for new users)
#d-i partman-auto/choose_recipe \
-# select All files in one partition (recommended for new users)
-#d-i partman-auto/choose_recipe \
# select Separate /home partition
#d-i partman-auto/choose_recipe \
# select Separate /home, /usr, /var, and /tmp partitions
@@ -129,7 +129,7 @@
# You may set this to any valid setting for $TZ; see the contents of
# /usr/share/zoneinfo/ for valid values.
-d-i time/zone string Europe/Berlin
+d-i time/zone string Argentina/Buenos_Aires
### Apt setup
# You can choose to install non-free and contrib software.
@@ -211,7 +211,7 @@
### Package selection
#tasksel tasksel/first multiselect standard, laptop
-tasksel tasksel/first multiselect standard, desktop, laptop
+tasksel tasksel/first multiselect standard
#tasksel tasksel/first multiselect standard, web-server
#tasksel tasksel/first multiselect standard, kde-desktop
Deleted: fai-config/files/DEBCONF
===================================================================
--- fai-config/files/DEBCONF 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/files/DEBCONF 2008-08-03 18:34:47 UTC (rev 118)
@@ -1 +0,0 @@
-APT::Get::AllowUnauthenticated "true";
Copied: fai-config/files/etc/apt/apt.conf.d/7debconf7/DEBCONF (from rev 114, fai-config/files/DEBCONF)
===================================================================
--- fai-config/files/etc/apt/apt.conf.d/7debconf7/DEBCONF (rev 0)
+++ fai-config/files/etc/apt/apt.conf.d/7debconf7/DEBCONF 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1 @@
+APT::Get::AllowUnauthenticated "true";
Added: fai-config/files/etc/ntp.conf/DEBCONF8
===================================================================
--- fai-config/files/etc/ntp.conf/DEBCONF8 (rev 0)
+++ fai-config/files/etc/ntp.conf/DEBCONF8 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,42 @@
+# /etc/ntp.conf, configuration for ntpd
+
+driftfile /var/lib/ntp/ntp.drift
+statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+#server ntp.your-provider.example
+
+# pool.ntp.org maps to more than 300 low-stratum NTP servers.
+# Your server will pick a different set every time it starts up.
+# *** Please consider joining the pool! ***
+# *** <http://www.pool.ntp.org/join.html> ***
+server homer.dc8.debconf.org iburst
+
+# By default, exchange time with everybody, but don't allow configuration.
+# See /usr/share/doc/ntp-doc/html/accopt.html for details.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access,
+# but only if cryptographically authenticated
+#restrict 192.168.123.0 mask 255.255.255.0 notrust
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+#broadcast 192.168.123.255
+
+# If you want to listen to time broadcasts on your local subnet,
+# de-comment the next lines. Please do this only if you trust everybody
+# on the network!
+#disable auth
+#broadcastclient
Added: fai-config/files/etc/sudoers/DEBCONF8
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF8 (rev 0)
+++ fai-config/files/etc/sudoers/DEBCONF8 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,26 @@
+# /etc/sudoers
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# See the man page for details on how to write a sudoers file.
+#
+
+Defaults env_reset
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# User privilege specification
+root ALL=(ALL) ALL
+joerg ALL=(ALL) NOPASSWD: ALL
+%admin ALL=(ALL) NOPASSWD: ALL
+%adm ALL=(ALL) NOPASSWD: ALL
+nagios ALL=(ALL) NOPASSWD: /usr/bin/apt-get update
+nagios ALL=(ALL) NOPASSWD: /usr/bin/apt-get --simulate upgrade
+nagios ALL=(ALL) NOPASSWD: /usr/sbin/chroot /chroot-ia32 /usr/bin/apt-get update
+nagios ALL=(ALL) NOPASSWD: /usr/sbin/chroot /chroot-ia32 /usr/bin/apt-get --simulate upgrade
+
+
Added: fai-config/files/usr/local/sbin/softupdate/DEFAULT
===================================================================
--- fai-config/files/usr/local/sbin/softupdate/DEFAULT (rev 0)
+++ fai-config/files/usr/local/sbin/softupdate/DEFAULT 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,26 @@
+#/bin/sh
+
+#
+# (c) 2008 Holger Levsen holger at layer-acht.org
+# GPL2 licenced
+#
+#
+
+if [ $(id -u) != 0 ] ; then
+ echo you must run this as root
+ exit 1
+fi
+
+export LANG=C
+fai -N softupdate
+echo
+
+HOSTNAME=`hostname`
+
+[ -f /var/log/fai/$HOSTNAME/last/error.log ] && cat /var/log/fai/$HOSTNAME/last/error.log
+
+REVISION=`cd /var/lib/fai/config/ && svn up`
+SUBJECT="`hostname -s` upgraded to $REVISION"
+cat /var/log/fai/$HOSTNAME/last/error.log 2>/dev/null| mail -s "$SUBJECT" root
+
+[ -f /var/log/fai/$HOSTNAME/last/error.log ] && exit 1
Property changes on: fai-config/files/usr/local/sbin/softupdate/DEFAULT
___________________________________________________________________
Name: svn:executable
+ *
Deleted: fai-config/hooks/savelog.LAST
===================================================================
--- fai-config/hooks/savelog.LAST 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/hooks/savelog.LAST 2008-08-03 18:34:47 UTC (rev 118)
@@ -1,113 +0,0 @@
-#! /bin/bash
-
-# parse all log files for error messages
-# print errors and warnings found to error.log
-# WARNING: This will only work with english error messages!
-
-errfile=$LOGDIR/error.log
-
-# Define grep patterns. Do not start or end with an empty line!
-globalerrorpatterns="error
-fail
-warn
-bad
-no space
-syntax
-Couldn't stat
-Cannot access
-is bigger than the limit
-did not exist
-non existent
-not found
-couldn't
-can't
-E: Sorry, broken packages
-operator expected
-ambiguous redirect
-No previous regular expression
-No such
-Device or resource busy
-unknown option
-[a-z]\+\.log:E:
-No candidate version found
-cannot create"
-
-globalignorepatterns="[a-z]\+\.log:#
-libroxen-errormessage
-liberror-perl
-libgpg-error0
-^fstab.\+errors=remount
-[RT]X packets:
-WARNING: unexpected IO-APIC
-warned about = ( )
-daemon.warn
-kern.warn
-rw,errors=
-Expect some cache
-no error
-failmsg
-RPC call returned error 101
-deverror.out
-(floppy), sector 0
-mount version older than kernel
-Can't locate module
-Warning only 896MB will be used.
-hostname: Host name lookup failure
-I can't tell the difference.
-warning, not much extra random data, consider using the -rand option
-confC._FILE
-Warning: 3 database(s) sources
-were not found, (but were created)
-removing exim
-The home dir you specified already exists.
-No Rule for /usr/lib/ispell/default.hash.
-/usr/sbin/update-fonts-.\+: warning: absolute path
-hostname: Unknown server error
-EXT2-fs warning: checktime reached
-RPC: sendmsg returned error 101
-can't print them to stdout. Define these classes
-warning: downgrading
-suppress emacs errors
-echo Error:
-Can't open dependencies file
-documents in /usr/doc are no longer supported
-if you have both a SCSI and an IDE CD-ROM
-Monitoring disabled
-kernel-patch-badram
-Error: only one processor found.
-Error Recovery Strategy:
-sector 0 does not have an
-syslogin_perform_logout: logout() returned an error
-grub is not in an XFS filesystem.
-is harmless
-not updating .\+ font directory data.
-register_serial(): autoconfig failed
-Fontconfig error: Cannot load default config file
-cdrom: open failed."
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Here you can define your own patterns. Put one pattern in a line,
-# do not create empty lines.
-myerrorpatterns="XXXXX"
-myignorepatterns="ACPI Warning.*
-task_error=0"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# The main routine
-errorpatterns="$globalerrorpatterns
-$myerrorpatterns"
-ignorepatterns="$globalignorepatterns
-$myignorepatterns
-...trying to set up timer.*"
-
-cd $LOGDIR || exit 3
-if [ -s $errfile ]; then
- echo "Errorfile already exists. Aborting."
- exit
-fi
-
-grep -i "$errorpatterns" *.log | grep -vi "$ignorepatterns" > $errfile
-
-if [ -s $errfile ]; then
- echo "ERRORS found in log files. See $errfile."
-else
- echo "Congratulations! No errors found in log files."
-fi
Copied: fai-config/hooks/savelog.LAST.source (from rev 117, fai-config/hooks/savelog.LAST)
===================================================================
--- fai-config/hooks/savelog.LAST.source (rev 0)
+++ fai-config/hooks/savelog.LAST.source 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,174 @@
+#! /bin/bash
+
+# parse all log files for error messages
+# print errors and warnings found to error.log
+# WARNING: This will only work with english error messages!
+
+errfile=$LOGDIR/error.log
+
+# Define grep patterns. Do not start or end with an empty line!
+globalerrorpatterns="error
+fail
+warn
+bad
+no space
+syntax
+Couldn't stat
+Cannot access
+is bigger than the limit
+did not exist
+non existent
+not found
+couldn't
+can't
+E: Sorry, broken packages
+E: Broken packages
+operator expected
+ambiguous redirect
+No previous regular expression
+No such
+Device or resource busy
+unknown option
+[a-z]\+\.log:E:
+No candidate version found
+segfault
+Couldn't find any package whose name or description matched
+cannot create"
+
+globalignorepatterns="[a-z]\+\.log:#
+:+ error=0
+:+ trap error=
+task_error_func=
+STOP_ON_ERROR=
+courier-webadmin
+gstreamer0.10-plugins-bad
+ibwebadmin
+kernel-patch-badram
+kolab-webadmin
+kolabadmin
+gstreamer0.10-plugins-really-bad
+gsambad
+libad
+libtest-nowarnings-perl
+libtest-warn-perl
+libclass-errorhandler-perl
+zope-ploneerrorreporting
+libroxen-errormessage
+liberror-perl
+libgpg-error-dev
+libgpg-error0
+^fstab.\+errors=remount
+[RT]X packets:
+WARNING: unexpected IO-APIC
+warned about = ( )
+daemon.warn
+kern.warn
+rw,errors=
+Expect some cache
+no error
+failmsg
+RPC call returned error 101
+deverror.out
+(floppy), sector 0
+mount version older than kernel
+Can't locate module
+Warning only 896MB will be used.
+hostname: Host name lookup failure
+I can't tell the difference.
+warning, not much extra random data, consider using the -rand option
+confC._FILE
+Warning: 3 database(s) sources
+were not found, (but were created)
+removing exim
+The home dir you specified already exists.
+No Rule for /usr/lib/ispell/default.hash.
+/usr/sbin/update-fonts-.\+: warning: absolute path
+hostname: Unknown server error
+EXT2-fs warning: checktime reached
+RPC: sendmsg returned error 101
+can't print them to stdout. Define these classes
+warning: downgrading
+suppress emacs errors
+echo Error:
+Can't open dependencies file
+documents in /usr/doc are no longer supported
+if you have both a SCSI and an IDE CD-ROM
+Warning: /proc/ide/hd?/settings interface is obsolete, and will be removed soon
+Monitoring disabled
+kernel-patch-badram
+Error: only one processor found.
+Error Recovery Strategy:
+sector 0 does not have an
+syslogin_perform_logout: logout() returned an error
+grub is not in an XFS filesystem.
+is harmless
+not updating .\+ font directory data.
+register_serial(): autoconfig failed
+Fontconfig error: Cannot load default config file
+asking for cache data failed
+However, I can not read the target:
+fai-kernels/modules.dep: No such file
+Warning: The partition table looks like it was made
+task_error=0
+^info: Trying to set
+warning: /usr/lib/X11/fonts
+can't read /etc/udev/rules.d/z25_persistent-net.rules
+/cow': No such file or directory
+Dummy start-stop-daemon called
+cdrom: open failed."
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Here you can define your own patterns. Put one pattern in a line,
+# do not create empty lines.
+myerrorpatterns="XXXXX"
+myignorepatterns="3w-9xxx:.*
+awk: cannot open /tmp/fai.*debconf.data.*
+awk: cmd. line:1:.*
+grep: /proc/partitions: No such file or directory
+variables.log:task_error=0
+fail2ban is already the newest version.
+fail2ban ist schon die neueste Version."
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# The main routine
+errorpatterns="$globalerrorpatterns
+$hosterrorpatterns
+$myerrorpatterns"
+ignorepatterns="$globalignorepatterns
+$hostignorepatterns
+$myignorepatterns"
+
+cd $LOGDIR || exit 3
+if [ -s $errfile ]; then
+ echo "Errorfile already exists. Aborting."
+ exit
+fi
+
+grep -i "$errorpatterns" *.log | grep -vi "$ignorepatterns" > $errfile
+if [ "$verbose" ]; then
+ egrep -v '^software.log:' $errfile > $LOGDIR/tempfile
+ mv $LOGDIR/tempfile $errfile
+fi
+
+if [ -s $errfile ]; then
+ echo "ERRORS found in log files. See $errfile"
+else
+ echo "Congratulations! No errors found in log files."
+ export flag_reboot=1
+fi
+
+#!/bin/bash
+# code snipplet by Henning Glawe
+#
+# FAI_CONFIG_AREA is set by subroutines/get_fai_cvs to the directory where the
+# configuration is to be stored
+#
+# the old contents are rotated to $FAI_CONFIG_AREA.old
+
+
+if [ -n "$FAI_CONFIG_AREA" ] ; then
+ echo "Saving installtime configuration to $FAI_CONFIG_AREA"
+
+ cp -a "$FAI" "${FAI_CONFIG_AREA}.new"
+ [ -d "${FAI_CONFIG_AREA}.old" ] && rm -rf "${FAI_CONFIG_AREA}.old"
+ mv "$FAI_CONFIG_AREA" "${FAI_CONFIG_AREA}.old"
+ mv "${FAI_CONFIG_AREA}.new" "$FAI_CONFIG_AREA"
+fi
Modified: fai-config/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/package_config/VIDEO 2008-08-03 18:34:47 UTC (rev 118)
@@ -13,6 +13,12 @@
ffmpeg2theora oggfwd icecast2
xscreensaver iceweasel
+PACKAGES install REVIEW
+x-window-system elinks
+icewm xserver-xorg xterm kdm
+xscreensaver iceweasel
+totem mplayer xine vlc
+
PACKAGES install CAPTURE
dvgrab dvsource
@@ -27,7 +33,7 @@
debconf-video-common
debconf-video-store
nfs-kernel-server
-mini-dinstall debian-keyring apache2
+debian-keyring apache2
PACKAGES install lisa
icecast2
Added: fai-config/scripts/DEBCONF8/40-munin-node
===================================================================
--- fai-config/scripts/DEBCONF8/40-munin-node (rev 0)
+++ fai-config/scripts/DEBCONF8/40-munin-node 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,16 @@
+#! /usr/sbin/cfagent -f
+
+control:
+ any::
+ actionsequence = ( files directories editfiles )
+ EditFileSize = ( 30000 )
+
+files:
+ any::
+
+editfiles:
+ any::
+ { /etc/munin/munin-node.conf
+ AppendIfNoSuchLine 'allow ^192\.168\.0\.1$'
+ }
+
Property changes on: fai-config/scripts/DEBCONF8/40-munin-node
___________________________________________________________________
Name: svn:executable
+ *
Added: fai-config/scripts/DEFAULT/99-softupdate-sh
===================================================================
--- fai-config/scripts/DEFAULT/99-softupdate-sh (rev 0)
+++ fai-config/scripts/DEFAULT/99-softupdate-sh 2008-08-03 18:34:47 UTC (rev 118)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+#
+# (c) 2006 Holger Levsen holger at layer-acht.org
+# GPL2 licenced
+#
+
+fcopy -i -m root,root,755 /usr/local/sbin/softupdate
+
Property changes on: fai-config/scripts/DEFAULT/99-softupdate-sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: fai-config/scripts/FAIBASE/10-misc
===================================================================
--- fai-config/scripts/FAIBASE/10-misc 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/scripts/FAIBASE/10-misc 2008-08-03 18:34:47 UTC (rev 118)
@@ -7,6 +7,6 @@
echo $time_zone > /etc/timezone
ln -fs /usr/share/zoneinfo/${time_zone} /etc/localtime
-fcopy -iM /etc/motd /etc/network/interfaces /etc/ntp.conf
+fcopy -iM /etc/motd /etc/ntp.conf
exit $error
Deleted: fai-config/scripts/LAST/50-misc
===================================================================
--- fai-config/scripts/LAST/50-misc 2008-08-03 17:58:49 UTC (rev 117)
+++ fai-config/scripts/LAST/50-misc 2008-08-03 18:34:47 UTC (rev 118)
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-# copyright Thomas Lange 2001-2005, lange at debian.org
-
-error=0 ; trap "error=$((error|1))" ERR
-
-# remove backup files from cfeninge
-dirs="root etc var"
-for path in $dirs; do
- find /$path -maxdepth 20 -name \*.cfedited -o -name \*.cfsaved | xargs -r rm
-done
-
-
-
-# Make sure everything is configured properly
-echo "Running \"apt-get -f install\" for the last time."
-apt-get -f install
-
-# the system is now configured
-rm -f /sbin/unconfigured.sh
-
-exit $error
-
More information about the Debconf-video-commits
mailing list