[Debconf-video-commits] r519 - in fai-config: class files/etc/motd files/etc/ntp.conf files/etc/sudoers scripts scripts/DEBCONF10
Eric Dantan Rzewnicki
edrz-guest at alioth.debian.org
Wed Jun 30 23:35:58 UTC 2010
Author: edrz-guest
Date: 2010-06-30 23:35:58 +0000 (Wed, 30 Jun 2010)
New Revision: 519
Added:
fai-config/class/20-debconf10-classes
fai-config/class/DEBCONF10.var
fai-config/files/etc/motd/DEBCONF10
fai-config/files/etc/ntp.conf/DEBCONF10
fai-config/files/etc/sudoers/DEBCONF10
fai-config/scripts/DEBCONF10/
Removed:
fai-config/class/20-debconf9-classes
fai-config/class/DEBCONF9.var
fai-config/files/etc/motd/DEBCONF9
fai-config/files/etc/ntp.conf/DEBCONF9
fai-config/files/etc/sudoers/DEBCONF9
fai-config/scripts/DEBCONF9/
Modified:
fai-config/scripts/DEBCONF10/10-fix-fqdn
Log:
Copy dc9 to dc10 and modify for what is known at this point.
Copied: fai-config/class/20-debconf10-classes (from rev 512, fai-config/class/20-debconf9-classes)
===================================================================
--- fai-config/class/20-debconf10-classes (rev 0)
+++ fai-config/class/20-debconf10-classes 2010-06-30 23:35:58 UTC (rev 519)
@@ -0,0 +1,50 @@
+#! /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|barney|lisa|ned|rod|todd|dolph|jimbo|kearney|nelson)
+ echo "FAIBASE DEBCONF DEBCONF9 VIDEO" ;;
+esac
+
+case $HOSTNAME in
+ dolph) echo "IPW2X00"
+esac
+
+case $HOSTNAME in
+ patty|itchy)
+ echo "CAPTURE";;
+ selma|scratchy)
+ echo "XORG CAPTURE DVSWITCH";;
+ ned|rod|todd)
+ echo "ENCODING";;
+ dolph|jimbo|keamey|nelson)
+ echo "XORG REVIEW";;
+ lisa)
+ echo "ICECAST";;
+ barney)
+ echo "STORAGE";;
+esac
+
+#case $HOSTNAME in
+# selma)
+# echo "BRIDGE";;
+#esac
+
+case $HOSTNAME in
+ selma|patty|itchy|scratchy|ned|rod|todd|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
+
+
Deleted: fai-config/class/20-debconf9-classes
===================================================================
--- fai-config/class/20-debconf9-classes 2010-06-30 23:01:27 UTC (rev 518)
+++ fai-config/class/20-debconf9-classes 2010-06-30 23:35:58 UTC (rev 519)
@@ -1,50 +0,0 @@
-#! /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|barney|lisa|ned|rod|todd|dolph|jimbo|kearney|nelson)
- echo "FAIBASE DEBCONF DEBCONF9 VIDEO" ;;
-esac
-
-case $HOSTNAME in
- dolph) echo "IPW2X00"
-esac
-
-case $HOSTNAME in
- patty|itchy)
- echo "CAPTURE";;
- selma|scratchy)
- echo "XORG CAPTURE DVSWITCH";;
- ned|rod|todd)
- echo "ENCODING";;
- dolph|jimbo|keamey|nelson)
- echo "XORG REVIEW";;
- lisa)
- echo "ICECAST";;
- barney)
- echo "STORAGE";;
-esac
-
-#case $HOSTNAME in
-# selma)
-# echo "BRIDGE";;
-#esac
-
-case $HOSTNAME in
- selma|patty|itchy|scratchy|ned|rod|todd|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
-
-
Copied: fai-config/class/DEBCONF10.var (from rev 512, fai-config/class/DEBCONF9.var)
===================================================================
--- fai-config/class/DEBCONF10.var (rev 0)
+++ fai-config/class/DEBCONF10.var 2010-06-30 23:35:58 UTC (rev 519)
@@ -0,0 +1,13 @@
+UTC=no
+time_zone=Europe/Madrid
+FAI_ACTION=softupdate
+EVENT=dc9
+
+hosterrorpatterns="XXXXX"
+hostignorepatterns="$hostignorepatters
+dmesg.log:.*Error: Driver .pcspkr. is already registered, aborting...
+dmesg.log:.* warning.*ntpd.*uses 32-bit capabilities.*
+dmesg.log:.* AER service couldn't init device .* - no _OSC support
+dmesg.log:.* pnp 00:09: can't add resource for IO 0x4d0-0x4d1
+dmesg.log:.* ACPI Warning (tbutils-0217): Incorrect checksum in table [OEMB] - 09, should be FE [20080321]"
+
Deleted: fai-config/class/DEBCONF9.var
===================================================================
--- fai-config/class/DEBCONF9.var 2010-06-30 23:01:27 UTC (rev 518)
+++ fai-config/class/DEBCONF9.var 2010-06-30 23:35:58 UTC (rev 519)
@@ -1,13 +0,0 @@
-UTC=no
-time_zone=Europe/Madrid
-FAI_ACTION=softupdate
-EVENT=dc9
-
-hosterrorpatterns="XXXXX"
-hostignorepatterns="$hostignorepatters
-dmesg.log:.*Error: Driver .pcspkr. is already registered, aborting...
-dmesg.log:.* warning.*ntpd.*uses 32-bit capabilities.*
-dmesg.log:.* AER service couldn't init device .* - no _OSC support
-dmesg.log:.* pnp 00:09: can't add resource for IO 0x4d0-0x4d1
-dmesg.log:.* ACPI Warning (tbutils-0217): Incorrect checksum in table [OEMB] - 09, should be FE [20080321]"
-
Copied: fai-config/files/etc/motd/DEBCONF10 (from rev 512, fai-config/files/etc/motd/DEBCONF9)
===================================================================
--- fai-config/files/etc/motd/DEBCONF10 (rev 0)
+++ fai-config/files/etc/motd/DEBCONF10 2010-06-30 23:35:58 UTC (rev 519)
@@ -0,0 +1,9 @@
+Plan your installation, and FAI installs your plan.
+
+
+ .''`. DebConf10 video team machine
+ : :Ⓐ :
+ `. `'` New York City, USA
+ `-
+
+--
Deleted: fai-config/files/etc/motd/DEBCONF9
===================================================================
--- fai-config/files/etc/motd/DEBCONF9 2010-06-30 23:01:27 UTC (rev 518)
+++ fai-config/files/etc/motd/DEBCONF9 2010-06-30 23:35:58 UTC (rev 519)
@@ -1,9 +0,0 @@
-Plan your installation, and FAI installs your plan.
-
-
- .''`. DebConf9 video team machine
- : :Ⓐ :
- `. `'` Cáceres, Extremadura, Spain
- `-
-
---
Copied: fai-config/files/etc/ntp.conf/DEBCONF10 (from rev 512, fai-config/files/etc/ntp.conf/DEBCONF9)
===================================================================
--- fai-config/files/etc/ntp.conf/DEBCONF10 (rev 0)
+++ fai-config/files/etc/ntp.conf/DEBCONF10 2010-06-30 23:35:58 UTC (rev 519)
@@ -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.dc10.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
Deleted: fai-config/files/etc/ntp.conf/DEBCONF9
===================================================================
--- fai-config/files/etc/ntp.conf/DEBCONF9 2010-06-30 23:01:27 UTC (rev 518)
+++ fai-config/files/etc/ntp.conf/DEBCONF9 2010-06-30 23:35:58 UTC (rev 519)
@@ -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.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
Copied: fai-config/files/etc/sudoers/DEBCONF10 (from rev 512, fai-config/files/etc/sudoers/DEBCONF9)
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF10 (rev 0)
+++ fai-config/files/etc/sudoers/DEBCONF10 2010-06-30 23:35:58 UTC (rev 519)
@@ -0,0 +1,25 @@
+# /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
+%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
Deleted: fai-config/files/etc/sudoers/DEBCONF9
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF9 2010-06-30 23:01:27 UTC (rev 518)
+++ fai-config/files/etc/sudoers/DEBCONF9 2010-06-30 23:35:58 UTC (rev 519)
@@ -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
-zobel 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
Modified: fai-config/scripts/DEBCONF10/10-fix-fqdn
===================================================================
--- fai-config/scripts/DEBCONF9/10-fix-fqdn 2009-09-13 19:28:21 UTC (rev 512)
+++ fai-config/scripts/DEBCONF10/10-fix-fqdn 2010-06-30 23:35:58 UTC (rev 519)
@@ -1,13 +1,13 @@
#!/bin/sh
# fix /etc/mailname
-echo "$HOSTNAME.dc9.debconf.org" > /etc/mailname
+echo "$HOSTNAME.dc10.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.dc9.debconf.org $HOSTNAME" >> /etc/hosts.tmp
+echo "$IPADDRESS $HOSTNAME.dc10.debconf.org $HOSTNAME" >> /etc/hosts.tmp
mv /etc/hosts.tmp /etc/hosts
More information about the Debconf-video-commits
mailing list