[Debconf-video-commits] r756 - in fai-config: class files/etc/default/debconf-video files/etc/hosts files/etc/motd files/etc/resolv.conf files/etc/ssh/sshd_config files/etc/sudoers files/etc/udev/rules.d/99-firewire.rules files/etc/udev/rules.d/99-ttyusb.rules files/etc/userdir-ldap/userdir-ldap.conf files/home/dvswitch/.Xsession scripts scripts/DEBCONF12
Holger Levsen
holger at alioth.debian.org
Thu Jun 28 05:45:44 UTC 2012
Author: holger
Date: 2012-06-28 05:45:39 +0000 (Thu, 28 Jun 2012)
New Revision: 756
Added:
fai-config/class/20-debconf12-classes
fai-config/class/DEBCONF12.var
fai-config/files/etc/hosts/DEBCONF12
fai-config/files/etc/motd/DEBCONF12
fai-config/files/etc/resolv.conf/DEBCONF12
fai-config/files/etc/ssh/sshd_config/DEBCONF12
fai-config/files/etc/sudoers/DEBCONF12
fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF12
fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF12
fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF12
fai-config/scripts/DEBCONF12/
Removed:
fai-config/class/20-debconf11-classes
fai-config/class/DEBCONF11.var
fai-config/files/etc/default/debconf-video/r3dvswitch
fai-config/files/etc/default/debconf-video/r4dvswitch
fai-config/files/etc/default/debconf-video/r5dvswitch
fai-config/files/etc/hosts/DEBCONF11
fai-config/files/etc/motd/DEBCONF11
fai-config/files/etc/resolv.conf/DEBCONF11
fai-config/files/etc/ssh/sshd_config/DEBCONF11
fai-config/files/etc/sudoers/DEBCONF11
fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF11
fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF11
fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF11
fai-config/files/home/dvswitch/.Xsession/r3dvswitch
fai-config/files/home/dvswitch/.Xsession/r4dvswitch
fai-config/files/home/dvswitch/.Xsession/r5dvswitch
fai-config/files/home/dvswitch/.Xsession/scratchy
fai-config/files/home/dvswitch/.Xsession/selma
fai-config/scripts/DEBCONF11/
Modified:
fai-config/files/etc/default/debconf-video/r1dvswitch
fai-config/files/etc/default/debconf-video/r2dvswitch
fai-config/files/etc/motd/VIDEO
fai-config/files/home/dvswitch/.Xsession/r1dvswitch
fai-config/files/home/dvswitch/.Xsession/r2dvswitch
fai-config/scripts/DEBCONF12/10-fix-fqdn
Log:
prepare debconf12 configuration with sane hostname
Deleted: fai-config/class/20-debconf11-classes
===================================================================
--- fai-config/class/20-debconf11-classes 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/class/20-debconf11-classes 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,64 +0,0 @@
-#! /bin/bash
-
-# assign classes for hosts at debconf11
-# `hostname -f` doesnt return proper results (before running fai :)
-
-#
-# the class DEBCONF11 is reserved for machines at the venue...
-#
-
-case $HOSTNAME in
- selma|patty|jackie|itchy|scratchy|blinky|barney|lisa|todd)
- echo "FAIBASE DEBCONF DEBCONF11 VIDEO" ;;
-esac
-
-case $HOSTNAME in
- selma|patty|jackie|itchy|scratchy|blinky)
- echo "ELITEBOOK" ;;
-esac
-
-case $HOSTNAME in
- homer|dc11fw|freeswitch)
- echo "FAIBASE DEBCONF DEBCONF11" ;;
-esac
-
-#case $HOSTNAME in
-# dolph) echo "IPW2X00"
-#esac
-
-case $HOSTNAME in
- patty|itchy|jackie|blinky)
- echo "CAPTURE";;
- selma|scratchy)
- echo "XORG CAPTURE DVSWITCH";;
- todd)
- echo "ENCODING";;
- lisa)
- echo "ICECAST";;
- barney)
- echo "STORAGE";;
-esac
-
-case $HOSTNAME in
- barney)
- echo "PENTA";;
-esac
-
-
-#case $HOSTNAME in
-# selma)
-# echo "BRIDGE";;
-#esac
-
-case $HOSTNAME in
- selma|patty|jackie|itchy|scratchy|blinky|todd|barney|lisa)
- 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/20-debconf12-classes (from rev 751, fai-config/class/20-debconf11-classes)
===================================================================
--- fai-config/class/20-debconf12-classes (rev 0)
+++ fai-config/class/20-debconf12-classes 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,33 @@
+#! /bin/bash
+
+# assign classes for hosts at debconf12
+# `hostname -f` doesnt return proper results (before running fai :)
+
+#
+#
+
+case $HOSTNAME in
+ r?grab*|r?dvswitch*|encoder*|storage*|localstream*)
+ echo "FAIBASE DEBCONF VIDEO FOSDEM" ;;
+esac
+
+
+case $HOSTNAME in
+ encoder*)
+ echo "ENCODING ICECAST";;
+ r?grab*)
+ echo "CAPTURE";;
+ r?dvswitch*)
+ echo "XORG DVSWITCH STORAGE";;
+ storage*)
+ echo "STORAGE";;
+ localstream*)
+ echo "ICECAST";;
+esac
+
+case $HOSTNAME in
+ r?grab*|r?dvswitch*)
+ echo "DVSWITCHPUBKEY";;
+esac
+
+
Deleted: fai-config/class/DEBCONF11.var
===================================================================
--- fai-config/class/DEBCONF11.var 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/class/DEBCONF11.var 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,27 +0,0 @@
-UTC=no
-time_zone=Europe/Sarajevo
-FAI_ACTION=softupdate
-EVENT=dc11
-
-hosterrorpatterns="XXXXX"
-hostignorepatterns="$hostignorepatterns
-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]
-dmesg.log:.* PM: Resume from disk failed.
-dmesg.log:.* ata..00: ACPI.*
-dmesg.log:.* PM: Error -22 checking image file
-dmesg.log:.* PM: Resume from disk failed.
-dmesg.log:.* svc: failed to register lockdv1 RPC service (errno 97).
-software.log:WARNING: The following packages cannot be authenticated!
-software.log:Authentication warning overridden.
-dmesg.log:.* HEST: Table not found.
-dmesg.log:.* ERST: Table is not found!
-dmesg.log:.* PM: Image not found (code -22)
-dmesg.log:.* ACPI Warning.*
-dmesg.log:.* aer 0000.*
-dmesg.log:.* failed to get i915 symbols, graphics turbo disabled"
-
-
Added: fai-config/class/DEBCONF12.var
===================================================================
--- fai-config/class/DEBCONF12.var (rev 0)
+++ fai-config/class/DEBCONF12.var 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,27 @@
+UTC=no
+time_zone=America/Managua
+FAI_ACTION=softupdate
+EVENT=dc12
+
+hosterrorpatterns="XXXXX"
+hostignorepatterns="$hostignorepatterns
+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]
+dmesg.log:.* PM: Resume from disk failed.
+dmesg.log:.* ata..00: ACPI.*
+dmesg.log:.* PM: Error -22 checking image file
+dmesg.log:.* PM: Resume from disk failed.
+dmesg.log:.* svc: failed to register lockdv1 RPC service (errno 97).
+software.log:WARNING: The following packages cannot be authenticated!
+software.log:Authentication warning overridden.
+dmesg.log:.* HEST: Table not found.
+dmesg.log:.* ERST: Table is not found!
+dmesg.log:.* PM: Image not found (code -22)
+dmesg.log:.* ACPI Warning.*
+dmesg.log:.* aer 0000.*
+dmesg.log:.* failed to get i915 symbols, graphics turbo disabled"
+
+
Modified: fai-config/files/etc/default/debconf-video/r1dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r1dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/default/debconf-video/r1dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,15 +1,15 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='FOSDEM 2012'
-VENUE_NAME="Universite libre de Bruxelles"
-ROOM_NAME="Janson"
+CONFERENCE_NAME='DebConf12'
+VENUE_NAME="Universidad Centro Americana"
+ROOM_NAME="Aula Magna"
# Sources and sinks
-SOURCES="firewire:r1dvswitch firewire:r1grab"
-SINKS="file:r1dvswitch"
+SOURCES="firewire:r1dvswitch firewire:r1grab1 firewire:r1grab2"
+SINKS="file:r1dvswitch icecast:encoder1"
# Icecast streaming server parameters
-#ICECAST_ADDR=lisa.dc11.debconf.org
-#ICECAST_PORT=8000
-#ICECAST_PASS=Ieniech6
-#ICECAST_PATH=/Roundroom.ogv
+ICECAST_ADDR=encoder1.dc12.debconf.org
+ICECAST_PORT=8000
+ICECAST_PASS=Ieniech6
+ICECAST_PATH=/talkroom1.ogv
# Stream encoding parameters
VIDEO_STREAM_WIDTH=320
VIDEO_STREAM_HEIGHT=240
@@ -19,4 +19,4 @@
AUDIO_STREAM_KBPS=64
# File store base directory
FILE_BASE="/video"
-#FILE_SERVER="barney"
+#FILE_SERVER="storage1"
Modified: fai-config/files/etc/default/debconf-video/r2dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r2dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/default/debconf-video/r2dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,15 +1,15 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='FOSDEM 2012'
-VENUE_NAME="Universite libre de Bruxelles"
-ROOM_NAME="Ferrer"
+CONFERENCE_NAME='DebConf12'
+VENUE_NAME="Universidad Centro Americana"
+ROOM_NAME="Roberto Teran"
# Sources and sinks
-SOURCES="firewire:r2dvswitch firewire:r2grab"
-SINKS="file:r2dvswitch"
+SOURCES="firewire:r2dvswitch firewire:r2grab1 firewire:r2grab2"
+SINKS="file:r2dvswitch icecast:encoder1"
# Icecast streaming server parameters
-#ICECAST_ADDR=lisa.dc11.debconf.org
-#ICECAST_PORT=8000
-#ICECAST_PASS=Ieniech6
-#ICECAST_PATH=/Roundroom.ogv
+ICECAST_ADDR=encoder1.dc12.debconf.org
+ICECAST_PORT=8000
+ICECAST_PASS=Ieniech6
+ICECAST_PATH=/talkroom2.ogv
# Stream encoding parameters
VIDEO_STREAM_WIDTH=320
VIDEO_STREAM_HEIGHT=240
@@ -19,4 +19,4 @@
AUDIO_STREAM_KBPS=64
# File store base directory
FILE_BASE="/video"
-#FILE_SERVER="barney"
+#FILE_SERVER="storage1"
Deleted: fai-config/files/etc/default/debconf-video/r3dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r3dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/default/debconf-video/r3dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,22 +0,0 @@
-# Name of the location from which we are recording
-CONFERENCE_NAME='FOSDEM 2012'
-VENUE_NAME="Universite libre de Bruxelles"
-ROOM_NAME="K"
-# Sources and sinks
-SOURCES="firewire:r3dvswitch firewire:r3grab"
-SINKS="file:r3dvswitch"
-# Icecast streaming server parameters
-#ICECAST_ADDR=lisa.dc11.debconf.org
-#ICECAST_PORT=8000
-#ICECAST_PASS=Ieniech6
-#ICECAST_PATH=/Roundroom.ogv
-# Stream encoding parameters
-VIDEO_STREAM_WIDTH=320
-VIDEO_STREAM_HEIGHT=240
-VIDEO_STREAM_KBPS=230
-VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
-AUDIO_STREAM_HZ=48000
-AUDIO_STREAM_KBPS=64
-# File store base directory
-FILE_BASE="/video"
-#FILE_SERVER="barney"
Deleted: fai-config/files/etc/default/debconf-video/r4dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r4dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/default/debconf-video/r4dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,22 +0,0 @@
-# Name of the location from which we are recording
-CONFERENCE_NAME='FOSDEM 2012'
-VENUE_NAME="Universite libre de Bruxelles"
-ROOM_NAME="H1301"
-# Sources and sinks
-SOURCES="firewire:r4dvswitch firewire:r4grab"
-SINKS="file:r4dvswitch"
-# Icecast streaming server parameters
-#ICECAST_ADDR=lisa.dc11.debconf.org
-#ICECAST_PORT=8000
-#ICECAST_PASS=Ieniech6
-#ICECAST_PATH=/Roundroom.ogv
-# Stream encoding parameters
-VIDEO_STREAM_WIDTH=320
-VIDEO_STREAM_HEIGHT=240
-VIDEO_STREAM_KBPS=230
-VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
-AUDIO_STREAM_HZ=48000
-AUDIO_STREAM_KBPS=64
-# File store base directory
-FILE_BASE="/video"
-#FILE_SERVER="barney"
Deleted: fai-config/files/etc/default/debconf-video/r5dvswitch
===================================================================
--- fai-config/files/etc/default/debconf-video/r5dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/default/debconf-video/r5dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,22 +0,0 @@
-# Name of the location from which we are recording
-CONFERENCE_NAME='FOSDEM 2012'
-VENUE_NAME="Universite libre de Bruxelles"
-ROOM_NAME="H1302"
-# Sources and sinks
-SOURCES="firewire:r5dvswitch firewire:r5grab"
-SINKS="file:r5dvswitch"
-# Icecast streaming server parameters
-#ICECAST_ADDR=lisa.dc11.debconf.org
-#ICECAST_PORT=8000
-#ICECAST_PASS=Ieniech6
-#ICECAST_PATH=/Roundroom.ogv
-# Stream encoding parameters
-VIDEO_STREAM_WIDTH=320
-VIDEO_STREAM_HEIGHT=240
-VIDEO_STREAM_KBPS=230
-VIDEO_STREAM_OPTS="--cropleft 8 --cropright 8 -x 320 -y 240 -F 25:2 -V 230"
-AUDIO_STREAM_HZ=48000
-AUDIO_STREAM_KBPS=64
-# File store base directory
-FILE_BASE="/video"
-#FILE_SERVER="barney"
Deleted: fai-config/files/etc/hosts/DEBCONF11
===================================================================
--- fai-config/files/etc/hosts/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/hosts/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,28 +0,0 @@
-127.0.0.1 localhost
-
-82.195.75.74 apu.debconf.org apu
-72.14.176.206 krusty.debconf.org krusty
-
-89.16.166.49 db.debconf.org db
-
-# The following lines are desirable for IPv6 capable hosts
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-
-10.11.64.121 selma.dc11.debconf.org selma
-10.11.64.125 patty.dc11.debconf.org patty
-10.11.64.124 jackie.dc11.debconf.org jackie
-10.11.64.126 blinky.dc11.debconf.org blinky
-10.11.64.123 itchy.dc11.debconf.org itchy
-10.11.64.122 scratchy.dc11.debconf.org scratchy
-78.28.143.197 lisa.dc11.debconf.org lisa
-78.28.143.195 todd.dc11.debconf.org todd
-78.28.143.194 homer.dc11.debconf.org homer
-78.28.143.196 barney.dc11.debconf.org barney
-78.28.140.4 dc11fw.dc11.debconf.org dc11fw
-
Copied: fai-config/files/etc/hosts/DEBCONF12 (from rev 751, fai-config/files/etc/hosts/DEBCONF11)
===================================================================
--- fai-config/files/etc/hosts/DEBCONF12 (rev 0)
+++ fai-config/files/etc/hosts/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,28 @@
+127.0.0.1 localhost
+
+82.195.75.74 apu.debconf.org apu
+72.14.176.206 krusty.debconf.org krusty
+
+89.16.166.49 db.debconf.org db
+
+# The following lines are desirable for IPv6 capable hosts
+::1 ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+
+172.31.1.0 r1gw r1gw.dc12.debconf.org
+172.31.1.1 r1dvswitch r1dvswitch.dc12.debconf.org
+172.31.1.2 r1grab1 r1grab1.dc12.debconf.org
+172.31.1.3 r1grab2 r1grab2.dc12.debconf.org
+172.31.2.0 r2gw r2gw.dc12.debconf.org
+172.31.2.1 r2dvswitch r2dvswitch.dc12.debconf.org
+172.31.2.2 r2grab1 r2grab1.dc12.debconf.org
+172.31.2.3 r2grab2 r2grab2.dc12.debconf.org
+172.31.10.1 encoder1 encoder1.dc12.debconf.org
+172.31.11.1 storage1 storage1.dc12.debconf.org
+172.31.12.1 localstream1 localstream1.dc12.debconf.org
+
+
Deleted: fai-config/files/etc/motd/DEBCONF11
===================================================================
--- fai-config/files/etc/motd/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/motd/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,9 +0,0 @@
-Plan your installation, and FAI installs your plan.
-
-
- .''`. DebConf11 infrastructure machine
- : :` :
- `. `'` Banja Luka, Bosnia and Herzegovina
- `-
-
---
Copied: fai-config/files/etc/motd/DEBCONF12 (from rev 751, fai-config/files/etc/motd/DEBCONF11)
===================================================================
--- fai-config/files/etc/motd/DEBCONF12 (rev 0)
+++ fai-config/files/etc/motd/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,9 @@
+Plan your installation, and FAI installs your plan.
+
+
+ .''`. DebConf12 infrastructure machine
+ : :` :
+ `. `'` Managua, Nicaragua
+ `-
+
+--
Modified: fai-config/files/etc/motd/VIDEO
===================================================================
--- fai-config/files/etc/motd/VIDEO 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/motd/VIDEO 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,9 +1,9 @@
Plan your installation, and FAI installs your plan.
- .''`. DebConf11 video team machine
+ .''`. DebConf12 video team machine
: :` :
- `. `'` Banja Luka, Bosnia and Herzegovina
+ `. `'` Managua, Nicaragua
`-
--
Deleted: fai-config/files/etc/resolv.conf/DEBCONF11
===================================================================
--- fai-config/files/etc/resolv.conf/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/resolv.conf/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,4 +0,0 @@
-search dc11.debconf.org debconf.org
-domain dc11.debconf.org
-nameserver 78.28.140.4
-
Copied: fai-config/files/etc/resolv.conf/DEBCONF12 (from rev 751, fai-config/files/etc/resolv.conf/DEBCONF11)
===================================================================
--- fai-config/files/etc/resolv.conf/DEBCONF12 (rev 0)
+++ fai-config/files/etc/resolv.conf/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,4 @@
+search dc12.debconf.org debconf.org
+domain dc12.debconf.org
+nameserver 172.30.15.1
+
Deleted: fai-config/files/etc/ssh/sshd_config/DEBCONF11
===================================================================
--- fai-config/files/etc/ssh/sshd_config/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/ssh/sshd_config/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,84 +0,0 @@
-
-# Package generated configuration file
-# See the sshd(8) manpage for details
-
-# What ports, IPs and protocols we listen for
-Port 22
-Port 2222
-# Use these options to restrict which interfaces/protocols sshd will bind to
-#ListenAddress ::
-#ListenAddress 0.0.0.0
-Protocol 2
-# HostKeys for protocol version 2
-HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
-#Privilege Separation is turned on for security
-UsePrivilegeSeparation yes
-
-# Lifetime and size of ephemeral version 1 server key
-KeyRegenerationInterval 3600
-ServerKeyBits 768
-
-#GlobalKeysFile /var/lib/misc/ssh-rsa-shadow
-#MkHomeDir yes
-
-# Logging
-SyslogFacility AUTH
-LogLevel INFO
-
-# Authentication:
-LoginGraceTime 120
-PermitRootLogin yes
-StrictModes yes
-
-RSAAuthentication yes
-PubkeyAuthentication yes
-#AuthorizedKeysFile %h/.ssh/authorized_keys
-
-# Don't read the user's ~/.rhosts and ~/.shosts files
-IgnoreRhosts yes
-# For this to work you will also need host keys in /etc/ssh_known_hosts
-RhostsRSAAuthentication no
-# similar for protocol version 2
-HostbasedAuthentication no
-# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
-#IgnoreUserKnownHosts yes
-
-# To enable empty passwords, change to yes (NOT RECOMMENDED)
-PermitEmptyPasswords no
-
-# Change to yes to enable challenge-response passwords (beware issues with
-# some PAM modules and threads)
-ChallengeResponseAuthentication no
-
-# Change to no to disable tunnelled clear text passwords
-PasswordAuthentication no
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosGetAFSToken no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-X11Forwarding yes
-X11DisplayOffset 10
-PrintMotd no
-PrintLastLog yes
-TCPKeepAlive yes
-#UseLogin no
-
-#MaxStartups 10:30:60
-#Banner /etc/issue.net
-
-# Allow client to pass locale environment variables
-AcceptEnv LANG LC_*
-
-Subsystem sftp /usr/lib/openssh/sftp-server
-
-UsePAM yes
-AuthorizedKeysFile /var/lib/misc/userkeys/%u
-AuthorizedKeysFile2 /var/keys/%u
Copied: fai-config/files/etc/ssh/sshd_config/DEBCONF12 (from rev 751, fai-config/files/etc/ssh/sshd_config/DEBCONF11)
===================================================================
--- fai-config/files/etc/ssh/sshd_config/DEBCONF12 (rev 0)
+++ fai-config/files/etc/ssh/sshd_config/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,84 @@
+
+# Package generated configuration file
+# See the sshd(8) manpage for details
+
+# What ports, IPs and protocols we listen for
+Port 22
+Port 2222
+# Use these options to restrict which interfaces/protocols sshd will bind to
+#ListenAddress ::
+#ListenAddress 0.0.0.0
+Protocol 2
+# HostKeys for protocol version 2
+HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_dsa_key
+#Privilege Separation is turned on for security
+UsePrivilegeSeparation yes
+
+# Lifetime and size of ephemeral version 1 server key
+KeyRegenerationInterval 3600
+ServerKeyBits 768
+
+#GlobalKeysFile /var/lib/misc/ssh-rsa-shadow
+#MkHomeDir yes
+
+# Logging
+SyslogFacility AUTH
+LogLevel INFO
+
+# Authentication:
+LoginGraceTime 120
+PermitRootLogin yes
+StrictModes yes
+
+RSAAuthentication yes
+PubkeyAuthentication yes
+#AuthorizedKeysFile %h/.ssh/authorized_keys
+
+# Don't read the user's ~/.rhosts and ~/.shosts files
+IgnoreRhosts yes
+# For this to work you will also need host keys in /etc/ssh_known_hosts
+RhostsRSAAuthentication no
+# similar for protocol version 2
+HostbasedAuthentication no
+# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
+#IgnoreUserKnownHosts yes
+
+# To enable empty passwords, change to yes (NOT RECOMMENDED)
+PermitEmptyPasswords no
+
+# Change to yes to enable challenge-response passwords (beware issues with
+# some PAM modules and threads)
+ChallengeResponseAuthentication no
+
+# Change to no to disable tunnelled clear text passwords
+PasswordAuthentication no
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosGetAFSToken no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+X11Forwarding yes
+X11DisplayOffset 10
+PrintMotd no
+PrintLastLog yes
+TCPKeepAlive yes
+#UseLogin no
+
+#MaxStartups 10:30:60
+#Banner /etc/issue.net
+
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+UsePAM yes
+AuthorizedKeysFile /var/lib/misc/userkeys/%u
+AuthorizedKeysFile2 /var/keys/%u
Deleted: fai-config/files/etc/sudoers/DEBCONF11
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/sudoers/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,25 +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
-%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/DEBCONF12 (from rev 751, fai-config/files/etc/sudoers/DEBCONF11)
===================================================================
--- fai-config/files/etc/sudoers/DEBCONF12 (rev 0)
+++ fai-config/files/etc/sudoers/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -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/udev/rules.d/99-firewire.rules/DEBCONF11
===================================================================
--- fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,4 +0,0 @@
-## /etc/udev/rules.d/99-firewire.rules
-
-# Firewire devices
-KERNEL=="fw*",GROUP="1008",MODE="0660"
Copied: fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF12 (from rev 751, fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF11)
===================================================================
--- fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF12 (rev 0)
+++ fai-config/files/etc/udev/rules.d/99-firewire.rules/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,4 @@
+## /etc/udev/rules.d/99-firewire.rules
+
+# Firewire devices
+KERNEL=="fw*",GROUP="1008",MODE="0660"
Deleted: fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF11
===================================================================
--- fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,4 +0,0 @@
-## /etc/udev/rules.d/99-ttyusb.rules
-
-# USB serial devices
-KERNEL=="ttyUSB*",GROUP="1008",MODE="0660"
Copied: fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF12 (from rev 751, fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF11)
===================================================================
--- fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF12 (rev 0)
+++ fai-config/files/etc/udev/rules.d/99-ttyusb.rules/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,4 @@
+## /etc/udev/rules.d/99-ttyusb.rules
+
+# USB serial devices
+KERNEL=="ttyUSB*",GROUP="1008",MODE="0660"
Deleted: fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF11
===================================================================
--- fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF11 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF11 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,76 +0,0 @@
-# Config file for ldap scripts
-
-# ud-replicate client configuration:
-# host from which to rsync the information (the one running ud-generate)
-synchost = "db";
-# hosts on which to use a local path to get the data (used as a shell glob later)
-localsyncon = "*cmburns*";
-
-# Basic LDAP configuration
-ldaphost = "db.debconf.org";
-basedn = "ou=users,dc=debconf,dc=org";
-hostbasedn = "ou=hosts,dc=debconf,dc=org";
-adminuser = "admin";
-
-# Printable email addresses are shown as: 'cn mn sn <uid at emailappend>'
-emailappend = "debconf.org";
-
-# For the mail interface
-maildomain = "db.debconf.org";
-replyto = "admin@" + maildomain;
-pingfrom = "ping@" + maildomain;
-chpassfrom = "chpasswd@" + maildomain;
-changefrom = "change@" + maildomain;
-templatesdir = "/etc/userdir-ldap/templates/";
-replaycachefile = "/var/cache/userdir-ldap/mail/replay";
-#replaycachefile = "/tmp/replay";
-fingerprintfile = "/etc/userdir-ldap/badfingerprints"
-
-# Echelon
-ech_errorlog = "/org/db.debconf.org/mail/Log/ech-errors.log"
-ech_mainlog = "/org/db.debconf.org/mail/Log/ech.log"
-
-# User properties
-defaultgid = 100;
-
-# For the output generator
-generateconf = "/etc/userdir-ldap/generate.conf"
-generatedir = "/var/cache/userdir-ldap/hosts/";
-singlesshfile = False
-multiplesshfiles = True
-passdir = "/etc/userdir-ldap/";
-
-# GPG Things
-gpg = "/usr/bin/gpg";
-# The whole set of all keyrings
-keyrings = "/etc/userdir-ldap/keyring/keyring.gpg";
-# Keyrings synced to other machines, if they need them
-sync_keyrings = "/etc/userdir-ldap/keyring/keyring.gpg";
-# Keyrings used to search in when new developers get added
-add_keyrings = "/etc/userdir-ldap/keyring/keyring.gpg";
-
-# For the WEB interface
-webloginhtml = "login.html";
-websearchhtml = "searchform.html";
-websearchresulthtml = "searchresults.html";
-webupdatehtml = "update.html";
-hosthtml = "hostinfo.html";
-
-webloginurl = "login.cgi";
-websearchurl = "search.cgi";
-webupdateurl = "update.cgi";
-
-weblogfile = "/var/log/userldap-web.log";
-
-# When should authentication tokens expire?
-authexpires = 600;
-
-# How many bytes to use for the blowfish key (max = 56 (448 bits))
-blowfishkeylen = 10;
-
-# Change this!
-authtokenpath = "/var/cache/userdir-ldap/web-cookies";
-countrylist = "/var/www/userdir-ldap/domains.tab";
-
-# Finger daemon settings
-# use_inetd = 1;
Copied: fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF12 (from rev 751, fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF11)
===================================================================
--- fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF12 (rev 0)
+++ fai-config/files/etc/userdir-ldap/userdir-ldap.conf/DEBCONF12 2012-06-28 05:45:39 UTC (rev 756)
@@ -0,0 +1,76 @@
+# Config file for ldap scripts
+
+# ud-replicate client configuration:
+# host from which to rsync the information (the one running ud-generate)
+synchost = "db";
+# hosts on which to use a local path to get the data (used as a shell glob later)
+localsyncon = "*cmburns*";
+
+# Basic LDAP configuration
+ldaphost = "db.debconf.org";
+basedn = "ou=users,dc=debconf,dc=org";
+hostbasedn = "ou=hosts,dc=debconf,dc=org";
+adminuser = "admin";
+
+# Printable email addresses are shown as: 'cn mn sn <uid at emailappend>'
+emailappend = "debconf.org";
+
+# For the mail interface
+maildomain = "db.debconf.org";
+replyto = "admin@" + maildomain;
+pingfrom = "ping@" + maildomain;
+chpassfrom = "chpasswd@" + maildomain;
+changefrom = "change@" + maildomain;
+templatesdir = "/etc/userdir-ldap/templates/";
+replaycachefile = "/var/cache/userdir-ldap/mail/replay";
+#replaycachefile = "/tmp/replay";
+fingerprintfile = "/etc/userdir-ldap/badfingerprints"
+
+# Echelon
+ech_errorlog = "/org/db.debconf.org/mail/Log/ech-errors.log"
+ech_mainlog = "/org/db.debconf.org/mail/Log/ech.log"
+
+# User properties
+defaultgid = 100;
+
+# For the output generator
+generateconf = "/etc/userdir-ldap/generate.conf"
+generatedir = "/var/cache/userdir-ldap/hosts/";
+singlesshfile = False
+multiplesshfiles = True
+passdir = "/etc/userdir-ldap/";
+
+# GPG Things
+gpg = "/usr/bin/gpg";
+# The whole set of all keyrings
+keyrings = "/etc/userdir-ldap/keyring/keyring.gpg";
+# Keyrings synced to other machines, if they need them
+sync_keyrings = "/etc/userdir-ldap/keyring/keyring.gpg";
+# Keyrings used to search in when new developers get added
+add_keyrings = "/etc/userdir-ldap/keyring/keyring.gpg";
+
+# For the WEB interface
+webloginhtml = "login.html";
+websearchhtml = "searchform.html";
+websearchresulthtml = "searchresults.html";
+webupdatehtml = "update.html";
+hosthtml = "hostinfo.html";
+
+webloginurl = "login.cgi";
+websearchurl = "search.cgi";
+webupdateurl = "update.cgi";
+
+weblogfile = "/var/log/userldap-web.log";
+
+# When should authentication tokens expire?
+authexpires = 600;
+
+# How many bytes to use for the blowfish key (max = 56 (448 bits))
+blowfishkeylen = 10;
+
+# Change this!
+authtokenpath = "/var/cache/userdir-ldap/web-cookies";
+countrylist = "/var/www/userdir-ldap/domains.tab";
+
+# Finger daemon settings
+# use_inetd = 1;
Modified: fai-config/files/home/dvswitch/.Xsession/r1dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r1dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/r1dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -12,20 +12,22 @@
xset s off
# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh r1grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+xterm -e ssh encoder1 'ps fax | grep "bash -c dvsink-command -h encoder1 -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
+xterm -e ssh r1grab1 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+xterm -e ssh r1grab2 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
# setup dvswitch
xterm -e dvswitch &
sleep 1
xterm -e "dc-start-source firewire:r1dvswitch" &
sleep 3
-xterm -e "dc-start-source firewire:r1grab" &
+xterm -e "dc-start-source firewire:r1grab1" &
sleep 3
-dvsource-file -l /home/dvswitch/fosdem.dv &
+xterm -e "dc-start-source firewire:r1grab2" &
+sleep 3
+dvsource-file -l /home/dvswitch/dc12.dv &
xterm -e "dc-start-sink file:r1dvswitch" &
-#xterm -e "while true ; do dvsink-command -h r1dvswitch -p 4321 -- cat > /home/flumotion/janson ; done" &
-#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+xterm -e "while true ; do dc-start-sink icecast:encoder1 ; done" &
# last command
xfce4-session
Modified: fai-config/files/home/dvswitch/.Xsession/r2dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r2dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/r2dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -12,20 +12,22 @@
xset s off
# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh r2grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+xterm -e ssh encoder1 'ps fax | grep "bash -c dvsink-command -h encoder1 -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
+xterm -e ssh r2grab1 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
+xterm -e ssh r2grab2 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
# setup dvswitch
xterm -e dvswitch &
sleep 1
xterm -e "dc-start-source firewire:r2dvswitch" &
sleep 3
-xterm -e "dc-start-source firewire:r2grab" &
+xterm -e "dc-start-source firewire:r2grab1" &
sleep 3
-dvsource-file -l /home/dvswitch/fosdem.dv &
+xterm -e "dc-start-source firewire:r2grab2" &
+sleep 3
+dvsource-file -l /home/dvswitch/dc12.dv &
xterm -e "dc-start-sink file:r2dvswitch" &
-#xterm -e "while true ; do dvsink-command -h r2dvswitch -p 4321 -- cat > /home/flumotion/ferrer ; done" &
-#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+xterm -e "while true ; do dc-start-sink icecast:encoder1 ; done" &
# last command
xfce4-session
Deleted: fai-config/files/home/dvswitch/.Xsession/r3dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r3dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/r3dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,31 +0,0 @@
-#
-# manual edits will be lost
-# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
-#
-
-export DISPLAY=":0.0"
-
-setxkbmap -option terminate:ctrl_alt_bksp &
-
-# disable screensaver
-xset -dpms
-xset s off
-
-# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh r3grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-
-# setup dvswitch
-xterm -e dvswitch &
-sleep 1
-xterm -e "dc-start-source firewire:r3dvswitch" &
-sleep 3
-xterm -e "dc-start-source firewire:r3grab" &
-sleep 3
-dvsource-file -l /home/dvswitch/fosdem.dv &
-xterm -e "dc-start-sink file:r3dvswitch" &
-#xterm -e "while true ; do dvsink-command -h r3dvswitch -p 4321 -- cat > /home/flumotion/k ; done" &
-#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
-
-# last command
-xfce4-session
Deleted: fai-config/files/home/dvswitch/.Xsession/r4dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r4dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/r4dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,31 +0,0 @@
-#
-# manual edits will be lost
-# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
-#
-
-export DISPLAY=":0.0"
-
-setxkbmap -option terminate:ctrl_alt_bksp &
-
-# disable screensaver
-xset -dpms
-xset s off
-
-# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh r4grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-
-# setup dvswitch
-xterm -e dvswitch &
-sleep 1
-xterm -e "dc-start-source firewire:r4dvswitch" &
-sleep 3
-xterm -e "dc-start-source firewire:r4grab" &
-sleep 3
-dvsource-file -l /home/dvswitch/fosdem.dv &
-xterm -e "dc-start-sink file:r4dvswitch" &
-#xterm -e "while true ; do dvsink-command -h r4dvswitch -p 4321 -- cat > /home/flumotion/h1302 ; done" &
-#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
-
-# last command
-xfce4-session
Deleted: fai-config/files/home/dvswitch/.Xsession/r5dvswitch
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/r5dvswitch 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/r5dvswitch 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,31 +0,0 @@
-#
-# manual edits will be lost
-# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
-#
-
-export DISPLAY=":0.0"
-
-setxkbmap -option terminate:ctrl_alt_bksp &
-
-# disable screensaver
-xset -dpms
-xset s off
-
-# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh r5grab 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-
-# setup dvswitch
-xterm -e dvswitch &
-sleep 1
-xterm -e "dc-start-source firewire:r5dvswitch" &
-sleep 3
-xterm -e "dc-start-source firewire:r5grab" &
-sleep 3
-dvsource-file -l /home/dvswitch/fosdem.dv &
-xterm -e "dc-start-sink file:r5dvswitch" &
-#xterm -e "while true ; do dvsink-command -h r5dvswitch -p 4321 -- cat > /home/flumotion/h1302 ; done" &
-#xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
-
-# last command
-xfce4-session
Deleted: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,33 +0,0 @@
-#
-# manual edits will be lost
-# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
-#
-
-export DISPLAY=":0.0"
-
-setxkbmap -option terminate:ctrl_alt_bksp &
-
-# disable screensaver
-xset -dpms
-xset s off
-
-# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh blinky 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh itchy 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-
-# setup dvswitch
-xterm -e dvswitch &
-sleep 1
-xterm -e "dc-start-source firewire+tally:scratchy" &
-sleep 3
-xterm -e "dc-start-source firewire+tally:itchy" &
-sleep 3
-xterm -e "dc-start-source firewire:blinky" &
-sleep 3
-dvsource-file -l /home/dvswitch/dc11simple.dv &
-xterm -e "dc-start-sink file:scratchy" &
-xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
-
-# last command
-xfce4-session
Deleted: fai-config/files/home/dvswitch/.Xsession/selma
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/selma 2012-06-28 03:13:43 UTC (rev 755)
+++ fai-config/files/home/dvswitch/.Xsession/selma 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,33 +0,0 @@
-#
-# manual edits will be lost
-# use svn://svn.debian.org/svn/debconf-video/fai-config/files/home/dvswitch/.Xsession/$hostname
-#
-
-export DISPLAY=":0.0"
-
-setxkbmap -option terminate:ctrl_alt_bksp &
-
-# disable screensaver
-xset -dpms
-xset s off
-
-# kill old sinks in case there are some left
-xterm -e ssh todd 'ps fax | grep "bash -c dvsink-command -h selma -p 4321 -- ffmpeg2theora"|grep -v grep | sed -e "s/^ *//" | cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh jackie 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-xterm -e ssh patty 'ps fax | grep "dvgrab -noavc -"|grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | xargs -n 1 kill -9'
-
-# setup dvswitch
-xterm -e dvswitch &
-sleep 1
-xterm -e "dc-start-source firewire+tally:selma" &
-sleep 1
-xterm -e "dc-start-source firewire+tally:patty" &
-sleep 3
-xterm -e "dc-start-source firewire:jackie" &
-sleep 3
-dvsource-file -l /home/dvswitch/dc11simple.dv &
-xterm -e "dc-start-sink file:selma" &
-xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
-
-# last command
-xfce4-session
Modified: fai-config/scripts/DEBCONF12/10-fix-fqdn
===================================================================
--- fai-config/scripts/DEBCONF11/10-fix-fqdn 2012-02-03 15:53:23 UTC (rev 751)
+++ fai-config/scripts/DEBCONF12/10-fix-fqdn 2012-06-28 05:45:39 UTC (rev 756)
@@ -1,13 +1,13 @@
#!/bin/bash
# fix /etc/mailname
-echo "$HOSTNAME.dc11.debconf.org" > /etc/mailname
+echo "$HOSTNAME.dc12.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.dc11.debconf.org $HOSTNAME" >> /etc/hosts.tmp
+echo "$IPADDRESS $HOSTNAME.dc12.debconf.org $HOSTNAME" >> /etc/hosts.tmp
mv /etc/hosts.tmp /etc/hosts
More information about the Debconf-video-commits
mailing list