]> git.parisson.com Git - telecaster-cgi.git/commitdiff
rearrange conf again, make a /home/$USER/.telecaster dir
authoryomguy <yomguy@parisson.com>
Thu, 1 Jul 2010 08:35:43 +0000 (08:35 +0000)
committeryomguy <yomguy@parisson.com>
Thu, 1 Jul 2010 08:35:43 +0000 (08:35 +0000)
25 files changed:
conf/etc/telecaster/pre-barreau_conferences.xml [new file with mode: 0644]
etc/apache2/default.conf [deleted file]
etc/default_conferences.xml [deleted file]
etc/fluxbox/autostart.sh [deleted file]
etc/fluxbox/init [deleted file]
etc/fluxbox/keys [deleted file]
etc/fluxbox/menu [deleted file]
etc/jack-rack/eq_comp_limit_02.rack [deleted file]
etc/jackd/jackd [deleted file]
etc/jackd/jackd.conf [deleted file]
etc/localhost.xml [deleted file]
etc/pre-barreau_conferences.xml [deleted file]
etc/restartd/restartd.conf [deleted file]
etc/telecaster.cfg [deleted file]
etc/telecaster.xml [deleted file]
etc/telecaster_cellar_mp3.xml [deleted file]
etc/telecaster_default_broadcasting.xml [deleted file]
etc/telecaster_edcast_mp3.cfg [deleted file]
etc/telecaster_mp3.cfg [deleted file]
etc/telecaster_mp3.xml [deleted file]
etc/vncserver/vncserver [deleted file]
etc/vncserver/vncserver.conf [deleted file]
etc/vncserver/xstartup [deleted file]
station.py
telecaster.py

diff --git a/conf/etc/telecaster/pre-barreau_conferences.xml b/conf/etc/telecaster/pre-barreau_conferences.xml
new file mode 100644 (file)
index 0000000..e524c66
--- /dev/null
@@ -0,0 +1,302 @@
+<telecaster>
+    <host>augustins.pre-barreau.com</host>
+    <title>Pre-Barreau</title>
+    <port>8000</port>
+    <format>mp3</format>
+    
+    <department>
+        <name>CRFPA</name>
+        <conferences>
+          <conference>
+            <name>Droit_administratif_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_administratif_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_des_obligations_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_commercial_des_affaires_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_communautaire_et_europeen_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_du_travail_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_fiscal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_international_prive_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_patrimonial_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_public_des_activites_economiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Corrections</name>
+          </conference>
+          <conference>
+            <name>Droit_penal_Cours</name>
+          </conference>
+          <conference>
+            <name>Droit_Libertes_publiques_Cours</name>
+          </conference>
+          <conference>
+            <name>Note_de_synthese_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_administrative_et_contentieuse_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_civile_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedures_collectives_et_suretes_Cours</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Corrections</name>
+          </conference>
+          <conference>
+            <name>Procedure_penale_Cours</name>
+          </conference>
+          <conference>
+            <name>TEST</name>
+          </conference>
+        </conferences>
+        
+    </department>
+
+    <department>
+        <name>AE</name>
+        <conferences>
+            <conference>
+                <name>Administratif_Cours</name>
+            </conference>
+            <conference>
+                <name>Administratif_Correction</name>
+            </conference>
+            <conference>
+                <name>Adm_Correction</name>
+            </conference>
+            <conference>
+                <name>Civil_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Correction</name>
+            </conference>
+            <conference>
+                <name>Commercial_Cours</name>
+            </conference>
+            <conference>
+                <name>Deontologie_Cours</name>
+            </conference>
+            <conference>
+                <name>Civil_Cours</name>
+            </conference>
+            <conference>
+                <name>Methodo_Oraux</name>
+            </conference>
+            <conference>
+                <name>Penal_Correction</name>
+            </conference>
+            <conference>
+                <name>Penal_Cours</name>
+            </conference>
+            <conference>
+                <name>Procedures_Cours</name>
+            </conference>
+            <conference>
+                <name>Reunion_info</name>
+            </conference>
+            <conference>
+                <name>Social_Correction</name>
+            </conference>
+            <conference>
+                <name>Social_Cours</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+            <conference>
+                <name>TEST</name>
+            </conference>
+        </conferences>
+    </department>
+
+    <department>
+        <name>ENM</name>
+        <conferences>
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+                
+
+    <department>
+        <name>FJP</name>
+        <conferences>
+            <conference>
+                <name>Actualisation</name>
+            </conference> 
+            <conference>
+                <name>TEST</name>
+            </conference>
+            <conference>
+                <name>REUNION</name>
+            </conference>
+        </conferences>
+    </department>
+
+        <professor>
+            <name>MARINHO A.</name>
+        </professor>
+        <professor>
+            <name>GIUSTINIANI G.</name>
+        </professor>
+        <professor>
+            <name>BOFFA R.</name>
+        </professor>
+        <professor>
+            <name>MEUNIER J.</name>
+        </professor>
+        <professor>
+            <name>THERY C.</name>
+        </professor>
+        <professor>
+            <name>JLB</name>
+        </professor>
+        <professor>
+            <name>AZZI T.</name>
+        </professor>
+        <professor>
+            <name>ETIENNEY A.</name>
+        </professor>
+        <professor>
+            <name>MARKUS J.</name>
+        </professor>
+        <professor>
+            <name>ANDREU L.</name>
+        </professor>
+        <professor>
+            <name>ROUMIER W.</name>
+        </professor>
+        <professor>
+            <name>HAIK R.</name>
+        </professor>
+        <professor>
+            <name>POISSON S.</name>
+        </professor>
+        <professor>
+            <name>CARTIER-BRESSON A.</name>
+        </professor>
+        <professor>
+            <name>MBONGO P.</name>
+        </professor>
+        <professor>
+            <name>MATHONNET P.</name>
+        </professor>
+        <professor>
+            <name>FOULQUIER N.</name>
+        </professor>
+        <professor>
+            <name>RILOV. F</name>
+        </professor>
+        <professor>
+            <name>JEANSEN E.</name>
+        </professor>
+        <professor>
+            <name>LA J.</name>
+        </professor>
+        <professor>
+            <name>MECARELLI G.</name>
+        </professor>
+        <professor>
+            <name>COLLET M.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>VIAL C.</name>
+        </professor>
+        <professor>
+            <name>PAGNERRE E.</name>
+        </professor>
+        <professor>
+            <name>PANOU C.</name>
+        </professor>
+        <professor>
+            <name>GILBERT S.</name>
+        </professor>
+        <professor>
+            <name>ROBBE S.</name>
+        </professor>
+
+
+        <comment><text>1ere_sem</text></comment>
+        <comment><text>2e_sem</text></comment>
+        <comment><text>3e_sem</text></comment>
+        <comment><text>4e_sem</text></comment>
+        <comment><text>5e_sem</text></comment>
+        <comment><text>6e_sem</text></comment>
+        <comment><text>7e_sem</text></comment>
+        <comment><text>8e_sem</text></comment>
+        <comment><text>9e_sem</text></comment>
+        <comment><text>10e_sem</text></comment>
+        <comment><text>11e_sem</text></comment>
+        <comment><text>12e_sem</text></comment>
+        <comment><text>13e_sem</text></comment>
+        <comment><text>14e_sem</text></comment>
+        <comment><text>15e_sem</text></comment>
+        <comment><text>16e_sem</text></comment>
+       
+</telecaster>
+
diff --git a/etc/apache2/default.conf b/etc/apache2/default.conf
deleted file mode 100644 (file)
index 27967c0..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-NameVirtualHost *:80
-<VirtualHost *:80>
-       ServerAdmin webmaster@localhost
-       DocumentRoot /var/www/
-        
-        # TELECASTER : You must load suexec apache2 module !
-       SuexecUserGroup ardour  ardour
-
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       <Directory /var/www/>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-               # This directive allows us to have apache2's default start page
-                # in /apache2-default/, but still have / go to the right place
-                
-                # TELECASTER : if you need direct access...
-                RedirectMatch ^/$ /telecaster/telecaster.py
-       </Directory>
-        
-        # TELECASTER alias
-        Alias /telecaster/ /var/www/telecaster/
-        <Directory /var/www/telecaster>
-                AllowOverride All
-                AddHandler cgi-script cgi py
-                Options ExecCGI
-                Order allow,deny
-                Allow from all
-        </Directory>
-        
-        # DEFAULT CONF
-        # Possible values include: debug, info, notice, warn, error, crit,
-       # alert, emerg.
-       LogLevel warn
-
-       CustomLog /var/log/apache2/access.log combined
-       ServerSignature On
-       ErrorLog /var/log/apache2/error.log
-
-       
-        Alias /doc/ "/usr/share/doc/"
-        <Directory "/usr/share/doc/">
-            Options Indexes MultiViews FollowSymLinks
-            AllowOverride None
-            Order deny,allow
-            Deny from all
-            Allow from 127.0.0.0/255.0.0.0 ::1/128
-        </Directory>
-
-       ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-       <Directory "/usr/lib/cgi-bin">
-               AllowOverride None
-               Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-        
-</VirtualHost>
diff --git a/etc/default_conferences.xml b/etc/default_conferences.xml
deleted file mode 100644 (file)
index eb3c4f0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<telecaster>
-    <url>localhost</url>
-    <title>My Streams</title>
-    <port>8000</port>
-    <format>mp3</format>
-
-    <department>
-        <name>Audio</name>
-        <conferences>
-            <conference>
-                <name>Recording</name>
-            </conference>
-            <conference>
-                <name>Broadcasting</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Computer</name>
-        <conferences>
-            <conference>
-                <name>Languages</name>
-            </conference>
-            <conference>
-                <name>Open source systems</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Physics</name>
-        <conferences>
-            <conference>
-                <name>Mechanics</name>
-            </conference>
-            <conference>
-                <name>Acoustics</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Ethnology</name>
-        <conferences>
-            <conference>
-                <name>Ethomusicology</name>
-            </conference>
-            <conference>
-                <name>Documentation</name>
-            </conference>
-        </conferences>
-    </department>
-</telecaster>
diff --git a/etc/fluxbox/autostart.sh b/etc/fluxbox/autostart.sh
deleted file mode 100755 (executable)
index d8415ad..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path.
-
-pid=`pgrep jack-rack`
-if [ ! $pid = "" ]; then 
- echo "NOT Starting jack-rack..." >> /tmp/vnc.log
-
-else
- echo "Starting jack-rack..." >> /tmp/vnc.log
-
- jack-rack -n /home/prebarreau/rack/comp_limit_2_02.rack &
- sleep 10
- jack_connect system:capture_1 jack_rack:in_1
- jack_connect system:capture_2 jack_rack:in_2
-
-fi
-
-qjackctl &
-
diff --git a/etc/fluxbox/init b/etc/fluxbox/init
deleted file mode 100644 (file)
index dbaf657..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-session.screen0.slit.placement:        BottomRight
-session.screen0.slit.direction:        Vertical
-session.screen0.slit.onTop:    False
-session.screen0.slit.autoHide: False
-session.screen0.tab.placement: Top
-session.screen0.toolbar.onTop: False
-session.screen0.toolbar.autoHide:      False
-session.screen0.toolbar.placement:     BottomCenter
-session.screen0.toolbar.widthPercent:  66
-session.screen0.workspaceNames:        one,two,three,four
-session.screen0.strftimeFormat:        %k:%M
-session.screen0.focusNewWindows:       True
-session.screen0.focusModel:    ClickToFocus
-session.screen0.fullMaximization:      False
-session.screen0.edgeSnapThreshold:     0
-session.screen0.rowPlacementDirection: LeftToRight
-session.screen0.workspaces:    4
-session.screen0.focusLastWindow:       True
-session.screen0.colPlacementDirection: TopToBottom
-session.screen0.windowPlacement:       RowSmartPlacement
-session.screen0.tab.width:     64
-session.screen0.tab.height:    16
-session.screen0.showwindowposition: true
-session.screen0.rootCommand: sh ~/.fluxbox/autostart.sh
-session.opaqueMove:    False
-session.autoRaiseDelay:        250
-session.menuFile:      ~/.fluxbox/menu
-session.cacheLife:     5
-session.styleFile:     /usr/share/fluxbox/styles/BlueNight
-session.keyFile: ~/.fluxbox/keys
-session.colorsPerChannel:      4
-session.doubleClickInterval:   250
-session.cacheMax:      200
-session.imageDither:   True
-session.configVersion: 1
diff --git a/etc/fluxbox/keys b/etc/fluxbox/keys
deleted file mode 100644 (file)
index d76b18f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-OnDesktop Mouse1 :HideMenus
-OnDesktop Mouse2 :WorkspaceMenu
-OnDesktop Mouse3 :RootMenu
-OnDesktop Mouse4 :NextWorkspace
-OnDesktop Mouse5 :PrevWorkspace
-
-Mod1 Tab :NextWindow
-Mod1 Shift Tab :PrevWindow
-Mod1 F1 :Workspace 1
-Mod1 F2 :Workspace 2
-Mod1 F3 :Workspace 3
-Mod1 F4 :Workspace 4
-Mod1 F5 :Workspace 5
-Mod1 F6 :Workspace 6
-Mod1 F7 :Workspace 7
-Mod1 F8 :Workspace 8
-Mod1 F9 :Workspace 9
-Mod1 F10 :Workspace 10
-Mod1 F11 :Workspace 11
-Mod1 F12 :Workspace 12
diff --git a/etc/fluxbox/menu b/etc/fluxbox/menu
deleted file mode 100644 (file)
index ed1edfb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[begin] (fluxbox)
-[include] (/etc/X11/fluxbox/fluxbox-menu)
-[end]
diff --git a/etc/jack-rack/eq_comp_limit_02.rack b/etc/jack-rack/eq_comp_limit_02.rack
deleted file mode 100644 (file)
index abce668..0000000
Binary files a/etc/jack-rack/eq_comp_limit_02.rack and /dev/null differ
diff --git a/etc/jackd/jackd b/etc/jackd/jackd
deleted file mode 100755 (executable)
index 31d9047..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          jackd
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: init-Script for system wide fetchmail daemon
-### END INIT INFO
-
-
-DAEMON=/usr/bin/jackd
-USER=
-OPTIONS=""
-LOG=/var/log/jackd.log
-PIDFILE=/var/run/jackd.pid
-
-test -f /etc/default/jackd || exit 0
-. /etc/default/jackd
-
-JACKDHOME=/home/$USER
-
-if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
-       echo "Edit /etc/default/jackd to start jackd"
-       exit 0
-fi
-
-test -f $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-case "$1" in
-       start)  
-               log_begin_msg "Starting jackd audio server:" "jackd"
-            echo $DAEMON $OPTIONS ' &' > $JACKDHOME/.jackdinit
-            chmod +x $JACKDHOME/.jackdinit
-            su -c $JACKDHOME/.jackdinit $USER > ${LOG}
-               sleep 2
-            pid=`pgrep -u ${USER} jackd` 
-               if [ pid = '' ]; then
-                       log_failure_msg "JACK daemon can't be started! Check logfile: ${LOG}"
-            else
-                echo $pid > $PIDFILE
-               fi
-               
-               ;;
-       stop)
-               log_begin_msg "Stopping jackd audio server:" "jackd"
-                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
-               if [ ! pid = '' ]; then
-                        kill -9 $pid
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-                rm $PIDFILE
-               ;;
-       try-restart)
-               if test -e $PIDFILE ; then
-                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
-                       PIDDIR=/proc/$pid
-                       if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
-                               $0 restart
-                               exit 0
-                       fi
-               fi
-               test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*jackd* && $0 start
-               ;;
-
-       *)
-               log_warning_msg "Usage: /etc/init.d/jackd {start|stop|restart|force-reload|awaken|debug-run}"
-               log_warning_msg "  start - starts system-wide jackd service"
-               log_warning_msg "  stop  - stops system-wide jackd service"
-               log_warning_msg "  restart, force-reload - starts a new system-wide jackd service"
-               log_warning_msg "  awaken - tell system-wide jackd to start a poll cycle immediately"
-               log_warning_msg "  debug-run [strace [strace options...]] - start a debug run of the"
-               log_warning_msg "    system-wide jackd service, optionally running it under strace"
-               exit 1
-               ;;
-esac
-
-exit 0
diff --git a/etc/jackd/jackd.conf b/etc/jackd/jackd.conf
deleted file mode 100644 (file)
index 54f0848..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set to "yes" to start jackd at boot
-START_DAEMON=yes
-
-# The jackd process will run under this user
-USER=prebarreau
-
-# Options to pass to jackd
-OPTIONS="-R -P70 -dalsa -r48000 -p1024 -n3 -D -Chw:0,1 -Phw:0,1 "
-
diff --git a/etc/localhost.xml b/etc/localhost.xml
deleted file mode 100644 (file)
index 91384de..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-<teleoddcast>
-    <url>http://localhost</url>
-    <title>Augustins - Pre-Barreau</title>
-    <port>8000</port>
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-            <conference>
-                <name>Liberté publiques - Cours</name>
-            </conference>
-            <conference>
-                <name>Note de synthèse - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure administrative et contentieuse - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédure administrative et contentieuse - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure civile - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédure civile - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure pénale - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédure pénale - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit commercial des affaires - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit commercial des affaires - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit communautaire et européen - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit communautaire et européen - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit fiscal - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit fiscal - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit pénal - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit pénal - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit de la famille et des personnes - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit de la famille et des personnes - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit patrimonial - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit patrimonial - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit du travail - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit du travail - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit administratif - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit administratif - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit public des activités Ã©conomiques - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit public des activités Ã©conomiques - Corrections</name>
-            </conference>
-            <conference>
-                <name>Droit international privé - Cours</name>
-            </conference>
-            <conference>
-                <name>Droit international privé - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédures collectives et sûretés - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédures collectives et sûretés - Corrections</name>
-            </conference>
-            <conference>
-                <name>Procédure communautaire - Cours</name>
-            </conference>
-            <conference>
-                <name>Procédures civile d'exécution - Cours</name>
-            </conference>
-            <conference>
-                <name>Comptabilité privée - Cours</name>
-            </conference>
-            <conference>
-                <name>Finances publiques - Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-</teleoddcast>
diff --git a/etc/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
deleted file mode 100644 (file)
index 11af5d5..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-<telecaster>
-    <host>localhost</host>
-    <title>Pre-Barreau</title>
-    <port>8000</port>
-    <format>mp3</format>
-    
-    <department>
-        <name>CRFPA</name>
-        <conferences>
-          <conference>
-            <name>Droit_administratif_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_administratif_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_des_obligations_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_commercial_des_affaires_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_communautaire_et_europeen_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_de_la_famille_et_des_personnes_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_du_travail_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_fiscal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_international_prive_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_patrimonial_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_public_des_activites_economiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Corrections</name>
-          </conference>
-          <conference>
-            <name>Droit_penal_Cours</name>
-          </conference>
-          <conference>
-            <name>Droit_Libertes_publiques_Cours</name>
-          </conference>
-          <conference>
-            <name>Note_de_synthese_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_administrative_et_contentieuse_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_civile_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedures_collectives_et_suretes_Cours</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Corrections</name>
-          </conference>
-          <conference>
-            <name>Procedure_penale_Cours</name>
-          </conference>
-          <conference>
-            <name>TEST</name>
-          </conference>
-        </conferences>
-        
-    </department>
-
-    <department>
-        <name>AE</name>
-        <conferences>
-            <conference>
-                <name>Administratif_Cours</name>
-            </conference>
-            <conference>
-                <name>Adm_Correction</name>
-            </conference>
-            <conference>
-                <name>Civil_Correction</name>
-            </conference>
-            <conference>
-                <name>Commercial_Correctio</name>
-            </conference>
-            <conference>
-                <name>Commercial_Cours</name>
-            </conference>
-            <conference>
-                <name>Deontologie_Cours</name>
-            </conference>
-            <conference>
-                <name>Droit civil - Cours</name>
-            </conference>
-            <conference>
-                <name>Methodo_Oraux</name>
-            </conference>
-            <conference>
-                <name>Penal_Correction</name>
-            </conference>
-            <conference>
-                <name>Penal_Cours</name>
-            </conference>
-            <conference>
-                <name>Procedures_Cours</name>
-            </conference>
-            <conference>
-                <name>Reunion_info</name>
-            </conference>
-            <conference>
-                <name>Social_Corrections</name>
-            </conference>
-            <conference>
-                <name>Social_Cours</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-            <conference>
-                <name>TEST</name>
-            </conference>
-        </conferences>
-    </department>
-
-    <department>
-        <name>ENM</name>
-        <conferences>
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-                
-
-    <department>
-        <name>FJP</name>
-        <conferences>
-            <conference>
-                <name>Actualisation</name>
-            </conference> 
-            <conference>
-                <name>TEST</name>
-            </conference>
-            <conference>
-                <name>REUNION</name>
-            </conference>
-        </conferences>
-    </department>
-
-        <professor>
-            <name>MARINHO A.</name>
-        </professor>
-        <professor>
-            <name>GIUSTINIANI G.</name>
-        </professor>
-        <professor>
-            <name>BOFFA R.</name>
-        </professor>
-        <professor>
-            <name>MEUNIER J.</name>
-        </professor>
-        <professor>
-            <name>THERY C.</name>
-        </professor>
-        <professor>
-            <name>JLB</name>
-        </professor>
-        <professor>
-            <name>AZZI T.</name>
-        </professor>
-        <professor>
-            <name>ETIENNEY A.</name>
-        </professor>
-        <professor>
-            <name>MARKUS J.</name>
-        </professor>
-        <professor>
-            <name>ANDREU L.</name>
-        </professor>
-        <professor>
-            <name>ROUMIER W.</name>
-        </professor>
-        <professor>
-            <name>HAIK R.</name>
-        </professor>
-        <professor>
-            <name>POISSON S.</name>
-        </professor>
-        <professor>
-            <name>CARTIER-BRESSON A.</name>
-        </professor>
-        <professor>
-            <name>MBONGO P.</name>
-        </professor>
-        <professor>
-            <name>MATHONNET P.</name>
-        </professor>
-        <professor>
-            <name>FOULQUIER N.</name>
-        </professor>
-        <professor>
-            <name>RILOV. F</name>
-        </professor>
-        <professor>
-            <name>JEANSEN E.</name>
-        </professor>
-        <professor>
-            <name>LA J.</name>
-        </professor>
-        <professor>
-            <name>MECARELLI G.</name>
-        </professor>
-        <professor>
-            <name>COLLET M.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>VIAL C.</name>
-        </professor>
-        <professor>
-            <name>PAGNERRE E.</name>
-        </professor>
-        <professor>
-            <name>PANOU C.</name>
-        </professor>
-        <professor>
-            <name>GILBERT S.</name>
-        </professor>
-        <professor>
-            <name>ROBBE S.</name>
-        </professor>
-
-
-        <comment><text>1ere_sem</text></comment>
-        <comment><text>2e_sem</text></comment>
-        <comment><text>3e_sem</text></comment>
-        <comment><text>4e_sem</text></comment>
-        <comment><text>5e_sem</text></comment>
-        <comment><text>6e_sem</text></comment>
-        <comment><text>7e_sem</text></comment>
-        <comment><text>8e_sem</text></comment>
-        <comment><text>9e_sem</text></comment>
-        <comment><text>10e_sem</text></comment>
-        <comment><text>11e_sem</text></comment>
-        <comment><text>12e_sem</text></comment>
-        <comment><text>13e_sem</text></comment>
-        <comment><text>14e_sem</text></comment>
-        <comment><text>15e_sem</text></comment>
-        <comment><text>16e_sem</text></comment>
-       
-</telecaster>
-
diff --git a/etc/restartd/restartd.conf b/etc/restartd/restartd.conf
deleted file mode 100644 (file)
index 4773953..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Restartd configuration file
-
-# Format:
-#
-# <process_name> <regexp> <action_if_not_running> <action_if_running>
-#
-# process_name: the name of the process which is just for logging
-# as it does not affect for the regexp
-#
-# regexp: the POSIX regular expression for the command line of the
-# process
-#
-# action_if_not_running: a script or program name to execute if the
-# regexp does not match the full process command line
-#
-# action_if_running: a script or program name to execute if the regexp
-# matches the full process command line
-
-# Example:
-#
-# restartd ".*restartd" "/bin/echo 'It is not running!' >/tmp/restartd.out" "/bin/echo 'It is running!' >/tmp/restartd.out"
-preb_jack  ".*/usr/bin/jackd"  "/etc/init.d/vncserver stop; sleep 5; su -c /home/prebarreau/bin/preb_jack prebarreau; /etc/init.d/vncserver start" ""
-#preb_jack  ".*/usr/bin/jackd"  "su -c /home/prebarreau/bin/preb_jack prebarreau" ""
diff --git a/etc/telecaster.cfg b/etc/telecaster.cfg
deleted file mode 100644 (file)
index f59d763..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/Default_School_-_CRFPA_-_Droit_administratif_Cours.ogg
-ServerPublic=0
-AutomaticReconnectSecs=10
-Encode=OggVorbis
-BitrateNominal=512
-NumberChannels=1
-OggQuality=1
-Samplerate=44100
-ServerType=Icecast2
-ExternalFile=/tmp/test
-#YP Settings
-ServerStreamURL=http://www.pre-barreau.com
-ServerName=Default_School_-_CRFPA_-_Droit_administratif_Cours
-ServerDescription=Default_School_-_CRFPA_-_Droit_administratif_Cours_-_1_-_azd_-_azfza
-ServerGenre=Teaching
-#Advanced Settings
-LogLevel=1
-LogFile=oddcastv3.log
-SaveAsWAV=1
-OutputControl=SERVER,GENERAL,OUTPUT
-
diff --git a/etc/telecaster.xml b/etc/telecaster.xml
deleted file mode 100644 (file)
index 6a52cd0..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Default School</short_name>
-        <name>Default School</name>
-        <description>A school where you can learn</description>
-        <url>http://mydomain.com</url>
-        <genre>Other</genre>
-        <channels>1</channels>
-    </infos>
-    <server>
-        <host>localhost</host>
-        <port>8000</port>
-        <sourcepassword>source2parisson</sourcepassword>
-        <public>0</public>
-        <root_dir>/var/www/telecaster/</root_dir>
-        <odd_conf_file>etc/telecaster.cfg</odd_conf_file>
-        <lock_file>lock/telecaster.lock</lock_file>
-        <rsync_host>localhost/tmp/</rsync_host>
-    </server>
-    <media>
-        <record>true</record>
-        <dir>/tmp/media</dir>
-        <format>mp3</format>
-        <bitrate>64</bitrate>
-        <ogg_quality>2</ogg_quality>
-        <samplerate>44100</samplerate>
-        <voices>2</voices>
-        <shuffle>1</shuffle>
-    </media>
-</telecaster>
diff --git a/etc/telecaster_cellar_mp3.xml b/etc/telecaster_cellar_mp3.xml
deleted file mode 100644 (file)
index 775f135..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Cellar_Parisson_LIVE</short_name>
-        <name>Cellar_Parisson_LIVE</name>
-        <description>Cellar Studio LIVE Streams - House and Techno free samples</description>
-        <url>http://cellar.parisson.com</url>
-        <genre>Techno</genre>
-        <channels>1</channels>
-    </infos>
-    <server>
-        <host>parisson.com</host>
-        <port>8000</port>
-        <sourcepassword>source2parisson</sourcepassword>
-        <public>0</public>
-        <root_dir>/var/www/telecaster/</root_dir>
-        <odd_conf_file>etc/Cellar_Parisson_LIVE.cfg</odd_conf_file>
-        <lock_file>lock/telecaster.lock</lock_file>
-        <rsync_host>localhost/tmp/</rsync_host>
-    </server>
-    <media>
-        <record>true</record>
-        <dir>/home/ardour/telecaster/media</dir>
-        <raw_dir>/home/ardour/telecaster/backup</raw_dir>
-        <format>mp3</format>
-        <bitrate>192</bitrate>
-        <ogg_quality>2</ogg_quality>
-        <samplerate>44100</samplerate>
-        <voices>2</voices>
-        <shuffle>1</shuffle>
-    </media>
-</telecaster>
diff --git a/etc/telecaster_default_broadcasting.xml b/etc/telecaster_default_broadcasting.xml
deleted file mode 100644 (file)
index f2d6781..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<teleoddcast>
-    <url>http://cellar.parisson.com</url>
-    <title>Cellar LIVE streams from Parisson Stutios - Sweet Funky House for your ears !</title>
-    <port>8000</port>
-    <department>
-        <name>Audio</name>
-        <conferences>
-            <conference>
-                <name>Recording</name>
-            </conference>
-            <conference>
-                <name>Broadcasting</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Computer</name>
-        <conferences>
-            <conference>
-                <name>Languages</name>
-            </conference>
-            <conference>
-                <name>Open source systems</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Physics</name>
-        <conferences>
-            <conference>
-                <name>Mechanics</name>
-            </conference>
-            <conference>
-                <name>Acoustics</name>
-            </conference>
-        </conferences>
-    </department>
-    <department>
-        <name>Ethnology</name>
-        <conferences>
-            <conference>
-                <name>Ethomusicology</name>
-            </conference>
-            <conference>
-                <name>Documentation</name>
-            </conference>
-        </conferences>
-    </department>
-</teleoddcast>
diff --git a/etc/telecaster_edcast_mp3.cfg b/etc/telecaster_edcast_mp3.cfg
deleted file mode 100644 (file)
index 60836bb..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
-ServerType=Icecast2
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/stream.mp3
-# YP (Stream Directory) Settings
-ServerPublic=0
-ServerIRC=
-ServerAIM=
-ServerICQ=
-ServerStreamURL=http://www.pre-barreau.com
-ServerName=This is my server name
-ServerDescription=This is my server description
-ServerGenre=Teaching
-AutomaticReconnectSecs=10
-AutoConnect=0
-# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=MP3
-# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
-BitrateNominal=64
-BitrateMin=32
-BitrateMax=128
-NumberChannels=1
-Samplerate=44100
-#
-SaveDirectoryFlag=1
-SaveDirectory=/home/pre-barreau/backup
-SaveAsWAV=0
-#
-# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=3
-OggBitrateQualityFlag=Quality
-# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=0
-LameQuality=5
-LameCopywrite=0
-LameOriginal=0
-LameStrictISO=0
-LameDisableReservior=0
-LameVBRMode=vbr_abr
-LameLowpassfreq=0
-LameHighpassfreq=0
-LAMEPreset=0
-# AAC (FAAC) specific settings.
-AACQuality=100
-AACCutoff=
-# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=1
-# Log File
-LogFile=/tmp/streamTranscoder_1
-
diff --git a/etc/telecaster_mp3.cfg b/etc/telecaster_mp3.cfg
deleted file mode 100644 (file)
index c5906f4..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/Pre-Barreau_-_ICP_-_AE_-_Adm_Correction.mp3
-ServerPublic=0
-AutomaticReconnectSecs=10
-Encode=MP3 Lame
-BitrateNominal=64
-OggQuality=3
-NumberChannels=2
-Samplerate=44100
-ServerType=Icecast2
-ExternalFile=/tmp/test
-#YP Settings
-ServerStreamURL=http://www.pre-barreau.com
-ServerName=Pre-Barreau_-_ICP_-_AE_-_Adm_Correction
-ServerDescription=Pre-Barreau_-_ICP_-_AE_-_Adm_Correction_-_2_-_GIUSTINIANI_G._-_1er_cours
-ServerGenre=Teaching
-#Advanced Settings
-LogLevel=1
-LogFile=/tmp/oddcastv3.log
-SaveDirectoryFlag=1
-SaveDirectory=/home/prebarreau/backup
-SaveAsWAV=0
-OutputControl=SERVER,GENERAL,OUTPUT
-
diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
deleted file mode 100644 (file)
index fa7361b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<telecaster>
-    <infos>
-        <short_name>Pre-Barreau</short_name>
-        <name>Pre-Barreau</name>
-        <description>La preparation au Barreau de Paris</description>
-        <url>http:///telecaster-04.parisson.com</url>
-        <genre>Other</genre>
-    </infos>
-    <server>
-        <host>localhost</host>
-        <port>8000</port>
-        <sourcepassword>source2parisson</sourcepassword>
-        <public>0</public>
-        <root_dir>/var/www/telecaster/</root_dir>
-        <odd_conf_file>etc/telecaster_edcast_mp3.cfg</odd_conf_file>
-        <lock_file>lock/telecaster.lock</lock_file>
-        <rsync_host>localhost/tmp/</rsync_host>
-        <rss>
-            <dir>/var/www/rss/</dir>
-        </rss>
-    </server>
-    <media>
-        <record>true</record>
-        <dir>/home/pre-barreau/media</dir>
-        <raw_dir>/home/pre-barreau/backup</raw_dir>
-        <format>mp3</format>
-        <bitrate>96</bitrate>
-        <channels>1</channels>
-        <ogg_quality>3</ogg_quality>
-        <samplerate>44100</samplerate>
-    </media>
-    <jack>
-        <input>
-        <name>system:capture_1</name>
-        </input>
-    </jack>
-</telecaster>
diff --git a/etc/vncserver/vncserver b/etc/vncserver/vncserver
deleted file mode 100755 (executable)
index 07bf1f3..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-#
-# VNCserver init script
-#
-### BEGIN INIT INFO
-# Provides:          vncserver
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: init-Script for system wide fetchmail daemon
-### END INIT INFO
-#
-# A fetchmailrc file containg hosts and passwords for all local users should be
-# placed in /etc/fetchmailrc.  Remember to make the /etc/fetchmailrc mode 600
-# to avoid disclosing the users' passwords.
-#
-# This script will NOT start or stop fetchmail if the /etc/fetchmailrc file
-# does not exist or /etc/default/fetchmail is set to no.
-
-set -e
-
-# Defaults
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
-DAEMON=/usr/bin/vncserver
-USER=
-PORT=
-OPTIONS=""
-
-test -f /etc/default/vncserver || exit 0
-. /etc/default/vncserver
-
-OPTIONS="$OPTIONS"
-
-PIDFILE="/var/run/vncserver.pid"
-
-if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
-       echo "Edit /etc/default/vncserver to start vncserver"
-       exit 0
-fi
-
-test -f $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-case "$1" in
-       start)
-               if test -e $PIDFILE ; then
-                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
-                       PIDDIR=/proc/$pid
-                   if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
-                               log_failure_msg "vncserver already started; not starting."
-                               exit 0
-                       else
-                               log_warning_msg "Removing stale PID file $PIDFILE."
-                               rm -f $PIDFILE
-                       fi
-               fi
-               log_begin_msg "Starting vncserver audio server:" "vncserver"
-               if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS :$PORT; then
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-               ;;
-       stop)
-               if ! test -e $PIDFILE ; then
-                       log_failure_msg "Pidfile not found! Is vncserver running?"
-                       exit 0
-               fi
-               log_begin_msg "Stopping vncserver:" "vncserver"
-               if start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then
-                       $DAEMON -kill :$PORT 
-                        rm -f $PIDFILE
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-               ;;
-       force-reload|restart)
-               log_begin_msg "Restarting vncserver:" "vncserver"
-               if ! start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then
-                       log_end_msg 1
-                       exit 1
-               fi
-               sleep 1
-                rm -f $PIDFILE || true
-               if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS; then
-                       log_end_msg 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-               ;;
-       try-restart)
-               if test -e $PIDFILE ; then
-                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
-                       PIDDIR=/proc/$pid
-                       if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
-                               $0 restart
-                               exit 0
-                       fi
-               fi
-               test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
-               ;;
-       awaken)
-               log_begin_msg "Awakening vncserver:" "vncserver"
-               if [ -s $PIDFILE ]; then
-                       start-stop-daemon -K -s 10 -q -p $PIDFILE -x $DAEMON
-                       log_end_msg 0
-                       exit 0
-               else
-                       log_end_msg 1
-                       exit 1
-               fi
-               ;;
-       *)
-               log_warning_msg "Usage: /etc/init.d/vncserver {start|stop|restart|force-reload|awaken|debug-run}"
-               log_warning_msg "  start - starts system-wide vncserver service"
-               log_warning_msg "  stop  - stops system-wide vncserver service"
-               log_warning_msg "  restart, force-reload - starts a new system-wide vncserver service"
-               log_warning_msg "  awaken - tell system-wide vncserver to start a poll cycle immediately"
-               log_warning_msg "  debug-run [strace [strace options...]] - start a debug run of the"
-               log_warning_msg "    system-wide vncserver service, optionally running it under strace"
-               exit 1
-               ;;
-esac
-
-exit 0
diff --git a/etc/vncserver/vncserver.conf b/etc/vncserver/vncserver.conf
deleted file mode 100644 (file)
index 1d53129..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Set to "yes" to start vncserver at boot
-START_DAEMON=yes
-
-# The vncserver process will run under this user
-USER=prebarreau
-
-# The vncserver port (i.e. 2 for 5902)
-PORT="1"
-
-# Options to pass to vncserver
-OPTIONS="-geometry 1024x768 -depth 8"
-
diff --git a/etc/vncserver/xstartup b/etc/vncserver/xstartup
deleted file mode 100755 (executable)
index 75e1b7d..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Uncomment the following two lines for normal desktop:
-# unset SESSION_MANAGER
-# exec /etc/X11/xinit/xinitrc
-
-[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
-xsetroot -solid grey
-xset s 0
-vncconfig -iconic &
-#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
-#x-window-manager &
-fluxbox &
index e3e10e551e93f6572075abb4f5ff62b5bc9c1d94..a10cf9d03392df3e9cc96f7e40dfbe090f0e56f0 100644 (file)
@@ -41,14 +41,11 @@ import shutil
 import datetime
 import time
 import urllib
-import codecs
-import string
-import signal
-#import jack
-import unicodedata
 from tools import *
 from mutagen.oggvorbis import OggVorbis
 from mutagen.id3 import ID3, TIT2, TP1, TAL, TDA, TDAT, TDRC, TCO, COM
+#import jack
+
 
 class Conference:
     """A conference object including metadata"""
@@ -119,6 +116,9 @@ class Station(Conference):
         self.rsync_host = self.conf['server']['rsync_host']
         self.record = str_to_bool(self.conf['media']['record'])
         self.raw_dir = self.conf['media']['raw_dir']
+        self.user = os.get_login()
+        self.user_dir = '/home/' + self.user + '.telecaster'
+
         if not os.path.exists(self.media_dir):
             os.makedirs(self.media_dir)
         if not os.path.exists(self.raw_dir):
@@ -164,7 +164,7 @@ class Station(Conference):
             else:
                 newlines.append(line)
 
-        odd_conf_file = 'etc/'+self.title+'.cfg'
+        odd_conf_file = self.user_dir + os.sep + self.title+'.cfg'
         oddconf = open(odd_conf_file,'w')
         oddconf.writelines(newlines)
         oddconf.close()
index c520c52d556895723aadd8e888b607d05cab2ef3..88656bf2a105434e4bea54a0209e5a6e8a351127 100755 (executable)
 """
 
 version = '0.3.9'
-# Only for Unix and Linux systems
+
 
 import os
 import cgi
 import cgitb
 import shutil
-import datetime
 import time
-import codecs
-import string
-import signal
-import unicodedata
 from tools import *
 from webview import *
 from station import *
-from mutagen.oggvorbis import OggVorbis
-from mutagen.id3 import ID3, TIT2, TP1, TAL, TDA, TCO, COM
 cgitb.enable()
 
 
@@ -72,6 +65,10 @@ class TeleCaster:
         self.title = self.conf['infos']['name']
         self.uid = os.getuid()
         self.url = self.conf['infos']['url']
+        self.user = os.get_login()
+        self.user_dir = '/home/' + self.user + '.telecaster'
+        if not os.path.exists(self.user_dir):
+            os.makedirs(self.user_dir)
 
     def main(self):
         odd_pid = get_pid('^edcast_jack\ -n', self.uid)