change apache conf

diff --git a/conf/etc/apache2/default.conf b/conf/etc/apache2/default.conf
deleted file mode 100644 (file)
index eca10ea..0000000
--- a/conf/etc/apache2/default.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-<VirtualHost *:80>
-       ServerAdmin webmaster@localhost
-       ServerName telecasterXXX.parisson.com
-       DocumentRoot /var/www/
-
-       SuexecUserGroup prebarreau prebarreau
-
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride all
-       </Directory>
-       <Directory /var/www/>
-               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
-       </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>
-
-       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/"
-    <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>
-
-    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
-
-</VirtualHost>

diff --git a/conf/etc/apache2/sites-available/telecaster.conf b/conf/etc/apache2/sites-available/telecaster.conf
new file mode 100644 (file)
index 0000000..71e8312
--- /dev/null
+++ b/conf/etc/apache2/sites-available/telecaster.conf
@@ -0,0 +1,37 @@
+<VirtualHost *:80>
+       ServerAdmin webmaster@localhost
+       ServerName telecasterXXX.parisson.com
+       DocumentRoot /var/www/
+
+       SuexecUserGroup prebarreau prebarreau
+        
+        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
+
+       <Directory /var/www/>
+               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
+       </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/telecaster/favicon.ico
+
+</VirtualHost>