From d77a6342308c6fd8d661eccb35ec3e3aebdc51eb Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Thu, 18 Nov 2010 09:48:47 +0000
Subject: [PATCH] change apache conf

---
 .../telecaster.conf}                          | 39 +++++--------------
 1 file changed, 9 insertions(+), 30 deletions(-)
 rename conf/etc/apache2/{default.conf => sites-available/telecaster.conf} (62%)

diff --git a/conf/etc/apache2/default.conf b/conf/etc/apache2/sites-available/telecaster.conf
similarity index 62%
rename from conf/etc/apache2/default.conf
rename to conf/etc/apache2/sites-available/telecaster.conf
index eca10ea..71e8312 100644
--- a/conf/etc/apache2/default.conf
+++ b/conf/etc/apache2/sites-available/telecaster.conf
@@ -4,11 +4,16 @@
 	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 />
-		Options FollowSymLinks
-		AllowOverride all
-	</Directory>
 	<Directory /var/www/>
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride all
@@ -19,32 +24,6 @@
         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
-- 
2.39.5