fix colophon, add new templates

diff --git a/css/telecaster.css b/css/telecaster.css
index b65354f43c52727dd417c57acb120a86851aab85..b1a9e5f40b42983e20f528dd0df1598fe3882c66 100644 (file)
--- a/css/telecaster.css
+++ b/css/telecaster.css
@@ -34,14 +34,15 @@ div.tools { background-color: #030250;
 }
 
 div.colophon { background-color: transparent;
-     color: #FFFFFF;
+     color: #000000;
         font-size: 80%;
      float: right;
      padding: 0.5em 0px 0px 1em;
      font: 0.8125em/1em Verdana, sans-serif;
 }
 
-div.colophon a { color: #FFFFFF;
+div.colophon a { color: #000000;
+                 
 }
 
 div.title { background-color: #030250;

diff --git a/etc/apache2/default.conf b/etc/apache2/default.conf
new file mode 100644 (file)
index 0000000..27967c0
--- /dev/null
+++ b/etc/apache2/default.conf
@@ -0,0 +1,63 @@
+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/telecaster_cellar_mp3.xml b/etc/telecaster_cellar_mp3.xml
new file mode 100644 (file)
index 0000000..775f135
--- /dev/null
+++ b/etc/telecaster_cellar_mp3.xml
@@ -0,0 +1,31 @@
+<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
new file mode 100644 (file)
index 0000000..f2d6781
--- /dev/null
+++ b/etc/telecaster_default_broadcasting.xml
@@ -0,0 +1,49 @@
+<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>