[Debconf-video-commits] r441 - in fai-config: class files/etc/apt/sources.list files/etc/motd files/etc/ntp.conf files/etc/sudoers package_config scripts scripts/DEBCONF9
Holger Levsen
holger at alioth.debian.org
Sun Jun 21 09:52:18 UTC 2009
Author: holger
Date: 2009-06-21 09:52:17 +0000 (Sun, 21 Jun 2009)
New Revision: 441
Added:
fai-config/class/20-debconf9-classes
fai-config/class/DEBCONF9.var
fai-config/files/etc/apt/sources.list/POWERPC
fai-config/files/etc/motd/DEBCONF9
fai-config/files/etc/ntp.conf/DEBCONF9
fai-config/files/etc/sudoers/DEBCONF9
fai-config/scripts/DEBCONF9/
Removed:
fai-config/class/28-debconf8-classes
fai-config/class/DEBCONF7.var
fai-config/class/DEBCONF8.var
fai-config/class/patty.var
fai-config/class/scratchy.var
fai-config/files/etc/motd/DEBCONF8
fai-config/files/etc/ntp.conf/DEBCONF8
fai-config/files/etc/sudoers/DEBCONF6
fai-config/files/etc/sudoers/DEBCONF8
fai-config/scripts/DEBCONF8/
Modified:
fai-config/class/selma.var
fai-config/package_config/VIDEO
fai-config/scripts/DEBCONF9/10-fix-fqdn
Log:
- remove dc8 and previous debconfs
- cp dc8 to dc9 and adopt where already known
- stuff like ip addresses is still missing
- add POWERPC for Yoe's powerbook
- switch to xfce4
- untested :-)
Copied: fai-config/class/20-debconf9-classes (from rev 437, fai-config/class/28-debconf8-classes)
===================================================================
--- fai-config/class/20-debconf9-classes (rev 0)
+++ fai-config/class/20-debconf9-classes 2009-06-21 09:52:17 UTC (rev 441)
@@ -0,0 +1,53 @@
+#! /bin/sh
+
+# assign classes for hosts at debconf9
+# `hostname -f` doesnt return proper results (before running fai :)
+
+#
+# the class DEBCONF9 is reserved for machines at the venue...
+#
+
+case $HOSTNAME in
+ selma|patty|itchy|scratchy|daffy|barney|mrwhite|lisa|marge)
+ echo "FAIBASE DEBCONF DEBCONF9 VIDEO" ;;
+esac
+
+case $HOSTNAME in
+ selma|scratchy|mrwhite)
+ echo "XORG";;
+esac
+
+case $HOSTNAME in
+ daffy)
+ echo "ENCODING";;
+ marge|patty|itchy|scratchy)
+ echo "CAPTURE";;
+ mrwhite)
+ echo "REVIEW";;
+ lisa)
+ echo "ICECAST";;
+ barney)
+ echo "STORAGE";;
+esac
+
+case $HOSTNAME in
+ selma|scratchy)
+ echo "DVSWITCH";;
+esac
+#case $HOSTNAME in
+# selma)
+# echo "BRIDGE";;
+#esac
+
+case $HOSTNAME in
+ selma|patty|itchy|scratchy|marge|daffy|barney)
+ echo "DVSWITCHPUBKEY";;
+esac
+
+# post-processing after debconf9 at home, do not define DEBCONF8 here
+#case $HOSTNAME in
+# io)
+# echo "FAIBASE DEBCONF VIDEO ENCODING STORAGE" ;;
+#esac
+
+
Property changes on: fai-config/class/20-debconf9-classes
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+
Deleted: fai-config/class/28-debconf8-classes
===================================================================
--- fai-config/class/28-debconf8-classes 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/class/28-debconf8-classes 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-# assign classes for hosts at debconf8
-# `hostname -f` doesnt return proper results (before running fai :)
-
-#
-# the class DEBCONF8 is reserved for machines at the venue...
-#
-
-exit 0
-# debconf8 is over
-
-case $HOSTNAME in
- selma|patty|itchy|scratchy|daffy|barney|mrwhite|lisa|marge)
- echo "FAIBASE DEBCONF DEBCONF8 VIDEO" ;;
-esac
-
-case $HOSTNAME in
- selma|scratchy|mrwhite)
- echo "XORG";;
-esac
-
-case $HOSTNAME in
- daffy)
- echo "ENCODING";;
- marge|patty|itchy|scratchy)
- echo "CAPTURE";;
- mrwhite)
- echo "REVIEW";;
- lisa)
- echo "ICECAST";;
- barney)
- echo "STORAGE";;
-esac
-
-case $HOSTNAME in
- selma|scratchy)
- echo "DVSWITCH";;
-esac
-#case $HOSTNAME in
-# selma)
-# echo "BRIDGE";;
-#esac
-
-case $HOSTNAME in
- selma|patty|itchy|scratchy|marge|daffy|barney)
- echo "DVSWITCHPUBKEY";;
-esac
-
-# post-processing after debconf8 at home, do not define DEBCONF8 here
-case $HOSTNAME in
- io)
- echo "FAIBASE DEBCONF VIDEO ENCODING STORAGE" ;;
-esac
-
-
Deleted: fai-config/class/DEBCONF7.var
===================================================================
--- fai-config/class/DEBCONF7.var 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/class/DEBCONF7.var 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,3 +0,0 @@
-UTC=no
-time_zone=Europe/London
-FAI_ACTION=softupdate
Deleted: fai-config/class/DEBCONF8.var
===================================================================
--- fai-config/class/DEBCONF8.var 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/class/DEBCONF8.var 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,3 +0,0 @@
-UTC=no
-time_zone=America/Argentina/Buenos_Aires
-FAI_ACTION=softupdate
Copied: fai-config/class/DEBCONF9.var (from rev 437, fai-config/class/DEBCONF8.var)
===================================================================
--- fai-config/class/DEBCONF9.var (rev 0)
+++ fai-config/class/DEBCONF9.var 2009-06-21 09:52:17 UTC (rev 441)
@@ -0,0 +1,3 @@
+UTC=no
+time_zone=Europe/Madrid
+FAI_ACTION=softupdate
Property changes on: fai-config/class/DEBCONF9.var
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: fai-config/class/patty.var
===================================================================
--- fai-config/class/patty.var 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/class/patty.var 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,4 +0,0 @@
-
-hosterrorpatterns="XXXXX"
-hostignorepatterns="$hostignorepatterns
-VIA 82xx Modem"
Deleted: fai-config/class/scratchy.var
===================================================================
--- fai-config/class/scratchy.var 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/class/scratchy.var 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,5 +0,0 @@
-
-hosterrorpatterns="XXXXX"
-hostignorepatterns="$hostignorepatterns
-intel_rng: Firmware space is locked read-only"
-
Modified: fai-config/class/selma.var
===================================================================
--- fai-config/class/selma.var 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/class/selma.var 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,5 +1,4 @@
hosterrorpatterns="XXXXX"
hostignorepatterns="$hostignorepatterns
-Error attaching device data
-ACPI Warning (tbutils-0217): Incorrect checksum in table"
+A dummy host specific error to ignore"
Copied: fai-config/files/etc/apt/sources.list/POWERPC (from rev 437, fai-config/files/etc/apt/sources.list/AMD64)
===================================================================
--- fai-config/files/etc/apt/sources.list/POWERPC (rev 0)
+++ fai-config/files/etc/apt/sources.list/POWERPC 2009-06-21 09:52:17 UTC (rev 441)
@@ -0,0 +1,6 @@
+deb http://#MIRROR#/debian/ lenny main contrib non-free
+deb http://security.debian.org/ lenny/updates main contrib non-free
+
+deb http://db.debconf.org/dc-admin/archive/ lenny/powerpc/
+deb http://db.debconf.org/dc-admin/archive/ lenny/all/
+
Property changes on: fai-config/files/etc/apt/sources.list/POWERPC
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: fai-config/files/etc/motd/DEBCONF8
===================================================================
--- fai-config/files/etc/motd/DEBCONF8 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/files/etc/motd/DEBCONF8 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,9 +0,0 @@
-Plan your installation, and FAI installs your plan.
-
-
- .''`. DebConf8 video team machine
- : :Ⓐ :
- `. `'` Mar de la Plata - Argentina
- `-
-
---
Copied: fai-config/files/etc/motd/DEBCONF9 (from rev 437, fai-config/files/etc/motd/DEBCONF8)
===================================================================
--- fai-config/files/etc/motd/DEBCONF9 (rev 0)
+++ fai-config/files/etc/motd/DEBCONF9 2009-06-21 09:52:17 UTC (rev 441)
@@ -0,0 +1,9 @@
+Plan your installation, and FAI installs your plan.
+
+
+ .''`. DebConf9 video team machine
+ : :Ⓐ :
+ `. `'` Cáceres, Extremadura, Spain
+ `-
+
+--
Property changes on: fai-config/files/etc/motd/DEBCONF9
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: fai-config/files/etc/ntp.conf/DEBCONF8
===================================================================
--- fai-config/files/etc/ntp.conf/DEBCONF8 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/files/etc/ntp.conf/DEBCONF8 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,42 +0,0 @@
-# /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
Copied: fai-config/files/etc/ntp.conf/DEBCONF9 (from rev 437, fai-config/files/etc/ntp.conf/DEBCONF8)
===================================================================
--- fai-config/files/etc/ntp.conf/DEBCONF9 (rev 0)
+++ fai-config/files/etc/ntp.conf/DEBCONF9 2009-06-21 09:52:17 UTC (rev 441)
@@ -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.dc9.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
Property changes on: fai-config/files/etc/ntp.conf/DEBCONF9
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: fai-config/files/etc/sudoers/DEBCONF6
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF6 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/files/etc/sudoers/DEBCONF6 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,18 +0,0 @@
-# /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.
-#
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root ALL=(ALL) ALL
-%adm ALL=(ALL) NOPASSWD: ALL
-%admin ALL=(ALL) NOPASSWD: ALL
-#
Deleted: fai-config/files/etc/sudoers/DEBCONF8
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF8 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/files/etc/sudoers/DEBCONF8 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,27 +0,0 @@
-# /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
-eric 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
-
-%dc-video ALL= NOPASSWD: /usr/sbin/reboot, /usr/sbin/shutdown, /usr/sbin/halt, /usr/sbin/poweroff
Copied: fai-config/files/etc/sudoers/DEBCONF9 (from rev 437, fai-config/files/etc/sudoers/DEBCONF8)
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF9 (rev 0)
+++ fai-config/files/etc/sudoers/DEBCONF9 2009-06-21 09:52:17 UTC (rev 441)
@@ -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
+
+%dc-video ALL= NOPASSWD: /usr/sbin/reboot, /usr/sbin/shutdown, /usr/sbin/halt, /usr/sbin/poweroff
Property changes on: fai-config/files/etc/sudoers/DEBCONF9
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: fai-config/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO 2009-06-21 09:33:25 UTC (rev 440)
+++ fai-config/package_config/VIDEO 2009-06-21 09:52:17 UTC (rev 441)
@@ -9,7 +9,7 @@
PACKAGES install XORG
x-window-system elinks
-icewm xserver-xorg xterm kdm
+xfce4 xserver-xorg xterm kdm
xserver-xorg-video-intel
iceweasel mozilla-noscript mozilla-firefox-adblock
irssi xchat
Property changes on: fai-config/scripts/DEBCONF9
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: fai-config/scripts/DEBCONF9/10-fix-fqdn
===================================================================
--- fai-config/scripts/DEBCONF8/10-fix-fqdn 2009-06-20 16:40:32 UTC (rev 437)
+++ fai-config/scripts/DEBCONF9/10-fix-fqdn 2009-06-21 09:52:17 UTC (rev 441)
@@ -1,13 +1,13 @@
#!/bin/sh
# fix /etc/mailname
-echo "$HOSTNAME.dc8.debconf.org" > /etc/mailname
+echo "$HOSTNAME.dc9.debconf.org" > /etc/mailname
# fix /etc/hosts
IPADDRESS=`host $HOSTNAME | awk '{print $4}'|head -1`
cat /etc/hosts |grep -v "127.0"|grep -v $HOSTNAME > /etc/hosts.tmp
echo "127.0.0.1 localhost" >> /etc/hosts.tmp
-echo "$IPADDRESS $HOSTNAME.dc8.debconf.org $HOSTNAME" >> /etc/hosts.tmp
+echo "$IPADDRESS $HOSTNAME.dc9.debconf.org $HOSTNAME" >> /etc/hosts.tmp
mv /etc/hosts.tmp /etc/hosts
More information about the Debconf-video-commits
mailing list