fix install

diff --git a/conf/etc/apache2/default b/conf/etc/apache2/default
index 40e1bb311d64107b93975ba637fddb2b56dc2d2d..c09339a4b5b85dc89240e187e19a6be66bdaf336 100644 (file)
--- a/conf/etc/apache2/default
+++ b/conf/etc/apache2/default
@@ -3,7 +3,10 @@
        ServerAdmin webmaster@localhost
        ServerName telecaster-04.parisson.com
        DocumentRoot /var/www/
+
+       # BEGIN TELECASTER      
        SuexecUserGroup prebarreau prebarreau
+       # END TELECASTER
 
        <Directory />
                Options FollowSymLinks
@@ -15,8 +18,8 @@
                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
+        # in /apache2-default/, but still have / go to the right place
+        RedirectMatch ^/$ /telecaster/telecaster.py
        </Directory>
 
        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
@@ -45,16 +48,16 @@
         Allow from 127.0.0.0/255.0.0.0 ::1/128
     </Directory>
 
-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>
-
-Alias favicon.ico /var/www/favicon.ico
-#Alias /telecaster/favicon.ico /var/www/favicon.ico
+    # BEGIN TELECASTER
+    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>
+    Alias favicon.ico /var/www/telecaster/favicon.ico
+    # END TELECASTER
 
 </VirtualHost>

diff --git a/favicon.ico b/favicon.ico
new file mode 100644 (file)
index 0000000..859b21c
Binary files /dev/null and b/favicon.ico differ

diff --git a/install.py b/install.py
index 8b2f6bbabd63d86d2158648e104f5b68b8297d2a..92ab86e320fb29af299527e0e6bf76bdaf9c7821 100644 (file)
--- a/install.py
+++ b/install.py
@@ -41,7 +41,7 @@
 import os, sys
 import platform
 
-install_dir = '/usr/share/telecaster'
+install_dir = '/var/www/telecaster'
 if not os.path.exists(install_dir):
     os.mkdir(install_dir)
 
@@ -62,6 +62,7 @@ if not os.path.exists(init_link):
     os.system('ln -s /etc/init.d/vncserver ' + init_link)
     
 user = raw_input('Give a user to use the TeleCaster system : ')
+os.system('chown -R ' + user + ':' + user + ' ' + install_dir) 
 home = os.sep + 'home' + os.sep + user + os.sep
 home_dirs = ['fluxbox', 'vnc']
 
@@ -72,6 +73,10 @@ for dir in home_dirs:
     os.system('cp ' + conf_dir + os.sep + 'telecaster/home/' + dir + '/* ' + home_dir)
     os.system('chown -R ' + user + ':' + user + ' ' + home_dir) 
 
+#var_dir = '/var/www/telecaster'
+#if not os.path.exists(var_dir):
+#    os.system('ln -s ' + install_dir + ' ' + var_dir)
+
 print """
    Installation successfull !
    Now configure your apache VirtualHost to get TeleCaster in your browser.