From: yomguy <> Date: Thu, 18 Nov 2010 09:46:11 +0000 (+0000) Subject: change conf dirs X-Git-Tag: 0.9~200 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ea9d23b30eb4444a730e0a46e13288ef8ce3e68e;p=telecaster-client.git change conf dirs --- diff --git a/conf/etc/apache2/default b/conf/etc/apache2/default deleted file mode 100644 index c09339a..0000000 --- a/conf/etc/apache2/default +++ /dev/null @@ -1,63 +0,0 @@ -#NameVirtualHost *:80 - - ServerAdmin webmaster@localhost - ServerName telecaster-04.parisson.com - DocumentRoot /var/www/ - - # BEGIN TELECASTER - SuexecUserGroup prebarreau prebarreau - # END TELECASTER - - - Options FollowSymLinks - AllowOverride all - - - Options Indexes FollowSymLinks MultiViews - AllowOverride all - 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 - RedirectMatch ^/$ /telecaster/telecaster.py - - - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - - AllowOverride None - Options ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - ServerSignature On - - Alias /doc/ "/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 - - - # BEGIN TELECASTER - Alias /telecaster/ /var/www/telecaster/ - - AllowOverride All - AddHandler cgi-script cgi py - Options ExecCGI - Order allow,deny - Allow from all - - Alias favicon.ico /var/www/telecaster/favicon.ico - # END TELECASTER - - diff --git a/conf/etc/apache2/default.conf b/conf/etc/apache2/default.conf new file mode 100644 index 0000000..eca10ea --- /dev/null +++ b/conf/etc/apache2/default.conf @@ -0,0 +1,58 @@ + + ServerAdmin webmaster@localhost + ServerName telecasterXXX.parisson.com + DocumentRoot /var/www/ + + SuexecUserGroup prebarreau prebarreau + + + Options FollowSymLinks + AllowOverride all + + + Options Indexes FollowSymLinks MultiViews + AllowOverride all + 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 + RedirectMatch ^/$ /telecaster/telecaster.py + + + ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + + + ErrorLog /var/log/apache2/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/access.log combined + ServerSignature On + + Alias /doc/ "/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 + + + Alias /telecaster/ /var/www/telecaster/ + + AllowOverride All + AddHandler cgi-script cgi py + Options ExecCGI + Order allow,deny + Allow from all + + Alias /favicon.ico /var/www/telecaster/favicon.ico + + diff --git a/conf/etc/telecaster/home/fluxbox/autostart.sh b/conf/etc/telecaster/home/fluxbox/autostart.sh deleted file mode 100755 index 690047b..0000000 --- a/conf/etc/telecaster/home/fluxbox/autostart.sh +++ /dev/null @@ -1,36 +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 - sleep 1 -else - jack-rack -n /etc/telecaster/eq_comp_limit_02.rack & - sleep 10 - jack_connect system:capture_1 jack_rack:in_1 - jack_connect system:capture_2 jack_rack:in_2 -fi - -qjackctl & - -edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack & -sleep 3 - -# MONO setup -jack_disconnect jack_rack:out_2 LIVE:in_2 -jack_connect jack_rack:out_1 LIVE:in_1 -jack_connect jack_rack:out_1 LIVE:in_2 -jack_connect jack_rack:out_1 system:playback_1 -jack_connect jack_rack:out_1 system:playback_2 - - -# STEREO setup -#jack_connect jack_rack:out_1 LIVE:in_1 -#jack_connect jack_rack:out_2 LIVE:in_2 -#jack_connect jack_rack:out_1 system:playback_1 -#jack_connect jack_rack:out_2 system:playback_2 - - - - diff --git a/conf/etc/telecaster/home/fluxbox/init b/conf/etc/telecaster/home/fluxbox/init deleted file mode 100644 index 25769d1..0000000 --- a/conf/etc/telecaster/home/fluxbox/init +++ /dev/null @@ -1,37 +0,0 @@ -session.screen0.iconbar.mode: {static groups} (workspace) -session.screen0.tab.placement: Top -session.screen0.tab.width: 64 -session.screen0.tab.height: 16 -session.screen0.tabs.usePixmap: false -session.screen0.toolbar.onTop: False -session.screen0.toolbar.autoHide: False -session.screen0.toolbar.placement: BottomCenter -session.screen0.toolbar.widthPercent: 66 -session.screen0.slit.placement: RightBottom -session.screen0.slit.direction: Vertical -session.screen0.slit.onTop: False -session.screen0.slit.autoHide: False -session.screen0.edgeSnapThreshold: 0 -session.screen0.strftimeFormat: %k:%M -session.screen0.colPlacementDirection: TopToBottom -session.screen0.showwindowposition: true -session.screen0.rowPlacementDirection: LeftToRight -session.screen0.focusNewWindows: True -session.screen0.windowPlacement: RowSmartPlacement -session.screen0.rootCommand: sh ~/.fluxbox/autostart.sh -session.screen0.workspaces: 4 -session.screen0.focusModel: ClickToFocus -session.screen0.focusLastWindow: True -session.screen0.workspaceNames: one,two,three,four -session.screen0.fullMaximization: False -session.colorsPerChannel: 4 -session.menuFile: ~/.fluxbox/menu -session.configVersion: 10 -session.doubleClickInterval: 250 -session.cacheLife: 5 -session.cacheMax: 200 -session.opaqueMove: False -session.styleFile: /usr/share/fluxbox/styles/BlueNight -session.keyFile: ~/.fluxbox/keys -session.autoRaiseDelay: 250 -session.imageDither: True diff --git a/conf/etc/telecaster/home/fluxbox/init.ubuntu b/conf/etc/telecaster/home/fluxbox/init.ubuntu deleted file mode 100644 index 86638e4..0000000 --- a/conf/etc/telecaster/home/fluxbox/init.ubuntu +++ /dev/null @@ -1,4 +0,0 @@ -session.menuFile: ~/.fluxbox/menu -session.keyFile: ~/.fluxbox/keys -session.configVersion: 11 - diff --git a/conf/etc/telecaster/home/fluxbox/startup.ubuntu b/conf/etc/telecaster/home/fluxbox/startup.ubuntu deleted file mode 100644 index 4a5b2cb..0000000 --- a/conf/etc/telecaster/home/fluxbox/startup.ubuntu +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# fluxbox startup-script: -# -# Lines starting with a '#' are ignored. - -# Change your keymap: -xmodmap "/home/telecaster/.Xmodmap" - -# Applications you want to run with fluxbox. -# MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END. -# -# unclutter -idle 2 & -# wmnd & -# wmsmixer -w & -# idesk & - -# And last but not least we start fluxbox. -# Because it is the last app you have to run it with ''exec'' before it. - -fluxbox & -# or if you want to keep a log: -# exec fluxbox -log "/home/telecaster/.fluxbox/log" -#!/bin/sh -# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path. - -fbpid=$! - -sleep 1 - -{ -pid=`pgrep jack-rack` - -if [ ! $pid = "" ]; then - sleep 1 -else - jack-rack -n /etc/telecaster/eq_comp_limit_02.rack & - sleep 10 - jack_connect system:capture_1 jack_rack:in_1 - jack_connect system:capture_2 jack_rack:in_2 -fi - -qjackctl & - -edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack & -sleep 3 - -# MONO setup -jack_disconnect jack_rack:out_2 LIVE:in_2 -jack_connect jack_rack:out_1 LIVE:in_1 -jack_connect jack_rack:out_1 LIVE:in_2 - -# STEREO setup -#jack_connect jack_rack:out_1 LIVE:in_1 -#jack_connect jack_rack:out_2 LIVE:in_2 - -echo "ok" > /tmp/tt -} & - -wait $fbpid diff --git a/conf/etc/telecaster/home/vnc/xstartup b/conf/etc/telecaster/home/vnc/xstartup deleted file mode 100755 index 416bd91..0000000 --- a/conf/etc/telecaster/home/vnc/xstartup +++ /dev/null @@ -1,16 +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 & -#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S & -fluxbox & - diff --git a/conf/etc/telecaster/home/vnc/xstartup.ubuntu b/conf/etc/telecaster/home/vnc/xstartup.ubuntu deleted file mode 100755 index ce84087..0000000 --- a/conf/etc/telecaster/home/vnc/xstartup.ubuntu +++ /dev/null @@ -1,16 +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 & -#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S & -startfluxbox & - diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh new file mode 100755 index 0000000..690047b --- /dev/null +++ b/conf/home/fluxbox/autostart.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path. + +pid=`pgrep jack-rack` + +if [ ! $pid = "" ]; then + sleep 1 +else + jack-rack -n /etc/telecaster/eq_comp_limit_02.rack & + sleep 10 + jack_connect system:capture_1 jack_rack:in_1 + jack_connect system:capture_2 jack_rack:in_2 +fi + +qjackctl & + +edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack & +sleep 3 + +# MONO setup +jack_disconnect jack_rack:out_2 LIVE:in_2 +jack_connect jack_rack:out_1 LIVE:in_1 +jack_connect jack_rack:out_1 LIVE:in_2 +jack_connect jack_rack:out_1 system:playback_1 +jack_connect jack_rack:out_1 system:playback_2 + + +# STEREO setup +#jack_connect jack_rack:out_1 LIVE:in_1 +#jack_connect jack_rack:out_2 LIVE:in_2 +#jack_connect jack_rack:out_1 system:playback_1 +#jack_connect jack_rack:out_2 system:playback_2 + + + + diff --git a/conf/home/fluxbox/init b/conf/home/fluxbox/init new file mode 100644 index 0000000..25769d1 --- /dev/null +++ b/conf/home/fluxbox/init @@ -0,0 +1,37 @@ +session.screen0.iconbar.mode: {static groups} (workspace) +session.screen0.tab.placement: Top +session.screen0.tab.width: 64 +session.screen0.tab.height: 16 +session.screen0.tabs.usePixmap: false +session.screen0.toolbar.onTop: False +session.screen0.toolbar.autoHide: False +session.screen0.toolbar.placement: BottomCenter +session.screen0.toolbar.widthPercent: 66 +session.screen0.slit.placement: RightBottom +session.screen0.slit.direction: Vertical +session.screen0.slit.onTop: False +session.screen0.slit.autoHide: False +session.screen0.edgeSnapThreshold: 0 +session.screen0.strftimeFormat: %k:%M +session.screen0.colPlacementDirection: TopToBottom +session.screen0.showwindowposition: true +session.screen0.rowPlacementDirection: LeftToRight +session.screen0.focusNewWindows: True +session.screen0.windowPlacement: RowSmartPlacement +session.screen0.rootCommand: sh ~/.fluxbox/autostart.sh +session.screen0.workspaces: 4 +session.screen0.focusModel: ClickToFocus +session.screen0.focusLastWindow: True +session.screen0.workspaceNames: one,two,three,four +session.screen0.fullMaximization: False +session.colorsPerChannel: 4 +session.menuFile: ~/.fluxbox/menu +session.configVersion: 10 +session.doubleClickInterval: 250 +session.cacheLife: 5 +session.cacheMax: 200 +session.opaqueMove: False +session.styleFile: /usr/share/fluxbox/styles/BlueNight +session.keyFile: ~/.fluxbox/keys +session.autoRaiseDelay: 250 +session.imageDither: True diff --git a/conf/home/fluxbox/init.ubuntu b/conf/home/fluxbox/init.ubuntu new file mode 100644 index 0000000..86638e4 --- /dev/null +++ b/conf/home/fluxbox/init.ubuntu @@ -0,0 +1,4 @@ +session.menuFile: ~/.fluxbox/menu +session.keyFile: ~/.fluxbox/keys +session.configVersion: 11 + diff --git a/conf/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu new file mode 100644 index 0000000..4a5b2cb --- /dev/null +++ b/conf/home/fluxbox/startup.ubuntu @@ -0,0 +1,60 @@ +#!/bin/sh +# +# fluxbox startup-script: +# +# Lines starting with a '#' are ignored. + +# Change your keymap: +xmodmap "/home/telecaster/.Xmodmap" + +# Applications you want to run with fluxbox. +# MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END. +# +# unclutter -idle 2 & +# wmnd & +# wmsmixer -w & +# idesk & + +# And last but not least we start fluxbox. +# Because it is the last app you have to run it with ''exec'' before it. + +fluxbox & +# or if you want to keep a log: +# exec fluxbox -log "/home/telecaster/.fluxbox/log" +#!/bin/sh +# Ensure the XPATH variable is set appropriately to the Linux distribution's Xvfb installation path. + +fbpid=$! + +sleep 1 + +{ +pid=`pgrep jack-rack` + +if [ ! $pid = "" ]; then + sleep 1 +else + jack-rack -n /etc/telecaster/eq_comp_limit_02.rack & + sleep 10 + jack_connect system:capture_1 jack_rack:in_1 + jack_connect system:capture_2 jack_rack:in_2 +fi + +qjackctl & + +edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack & +sleep 3 + +# MONO setup +jack_disconnect jack_rack:out_2 LIVE:in_2 +jack_connect jack_rack:out_1 LIVE:in_1 +jack_connect jack_rack:out_1 LIVE:in_2 + +# STEREO setup +#jack_connect jack_rack:out_1 LIVE:in_1 +#jack_connect jack_rack:out_2 LIVE:in_2 + +echo "ok" > /tmp/tt +} & + +wait $fbpid diff --git a/conf/home/vnc/xstartup b/conf/home/vnc/xstartup new file mode 100755 index 0000000..416bd91 --- /dev/null +++ b/conf/home/vnc/xstartup @@ -0,0 +1,16 @@ +#!/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 & +#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S & +fluxbox & + diff --git a/conf/home/vnc/xstartup.ubuntu b/conf/home/vnc/xstartup.ubuntu new file mode 100755 index 0000000..ce84087 --- /dev/null +++ b/conf/home/vnc/xstartup.ubuntu @@ -0,0 +1,16 @@ +#!/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 & +#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S & +startfluxbox & + 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()