From 1bd993ec81ba3e0f3c40e0dad15f2ada0cb4c017 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 18 Nov 2010 09:46:11 +0000
Subject: [PATCH] change conf dirs

---
 conf/etc/apache2/{default => default.conf}            | 9 ++-------
 conf/{etc/telecaster => }/home/fluxbox/autostart.sh   | 0
 conf/{etc/telecaster => }/home/fluxbox/init           | 0
 conf/{etc/telecaster => }/home/fluxbox/init.ubuntu    | 0
 conf/{etc/telecaster => }/home/fluxbox/startup.ubuntu | 0
 conf/{etc/telecaster => }/home/vnc/xstartup           | 0
 conf/{etc/telecaster => }/home/vnc/xstartup.ubuntu    | 0
 telecaster.py                                         | 2 ++
 8 files changed, 4 insertions(+), 7 deletions(-)
 rename conf/etc/apache2/{default => default.conf} (87%)
 rename conf/{etc/telecaster => }/home/fluxbox/autostart.sh (100%)
 rename conf/{etc/telecaster => }/home/fluxbox/init (100%)
 rename conf/{etc/telecaster => }/home/fluxbox/init.ubuntu (100%)
 rename conf/{etc/telecaster => }/home/fluxbox/startup.ubuntu (100%)
 rename conf/{etc/telecaster => }/home/vnc/xstartup (100%)
 rename conf/{etc/telecaster => }/home/vnc/xstartup.ubuntu (100%)

diff --git a/conf/etc/apache2/default b/conf/etc/apache2/default.conf
similarity index 87%
rename from conf/etc/apache2/default
rename to conf/etc/apache2/default.conf
index c09339a..eca10ea 100644
--- a/conf/etc/apache2/default
+++ b/conf/etc/apache2/default.conf
@@ -1,12 +1,9 @@
-#NameVirtualHost *:80
 <VirtualHost *:80>
 	ServerAdmin webmaster@localhost
-	ServerName telecaster-04.parisson.com
+	ServerName telecasterXXX.parisson.com
 	DocumentRoot /var/www/
 
-	# BEGIN TELECASTER	
 	SuexecUserGroup prebarreau prebarreau
-	# END TELECASTER
 
 	<Directory />
 		Options FollowSymLinks
@@ -48,7 +45,6 @@
         Allow from 127.0.0.0/255.0.0.0 ::1/128
     </Directory>
 
-    # BEGIN TELECASTER
     Alias /telecaster/ /var/www/telecaster/
     <Directory /var/www/telecaster>
          AllowOverride All
@@ -57,7 +53,6 @@
          Order allow,deny
          Allow from all
     </Directory>
-    Alias favicon.ico /var/www/telecaster/favicon.ico
-    # END TELECASTER
+    Alias /favicon.ico /var/www/telecaster/favicon.ico
 
 </VirtualHost>
diff --git a/conf/etc/telecaster/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh
similarity index 100%
rename from conf/etc/telecaster/home/fluxbox/autostart.sh
rename to conf/home/fluxbox/autostart.sh
diff --git a/conf/etc/telecaster/home/fluxbox/init b/conf/home/fluxbox/init
similarity index 100%
rename from conf/etc/telecaster/home/fluxbox/init
rename to conf/home/fluxbox/init
diff --git a/conf/etc/telecaster/home/fluxbox/init.ubuntu b/conf/home/fluxbox/init.ubuntu
similarity index 100%
rename from conf/etc/telecaster/home/fluxbox/init.ubuntu
rename to conf/home/fluxbox/init.ubuntu
diff --git a/conf/etc/telecaster/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu
similarity index 100%
rename from conf/etc/telecaster/home/fluxbox/startup.ubuntu
rename to conf/home/fluxbox/startup.ubuntu
diff --git a/conf/etc/telecaster/home/vnc/xstartup b/conf/home/vnc/xstartup
similarity index 100%
rename from conf/etc/telecaster/home/vnc/xstartup
rename to conf/home/vnc/xstartup
diff --git a/conf/etc/telecaster/home/vnc/xstartup.ubuntu b/conf/home/vnc/xstartup.ubuntu
similarity index 100%
rename from conf/etc/telecaster/home/vnc/xstartup.ubuntu
rename to conf/home/vnc/xstartup.ubuntu
diff --git a/telecaster.py b/telecaster.py
index f83c034..7837524 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -39,6 +39,7 @@ version = '0.4.2'
 
 
 import os
+import sys
 import pwd
 import cgi
 import cgitb
@@ -133,6 +134,7 @@ class TeleCaster:
 conf_file = '/etc/telecaster/telecaster.xml'
 
 if __name__ == '__main__':
+    sys.stderr = sys.stdout
     t = TeleCaster(conf_file)
     t.main()
 
-- 
2.39.5