From 3df63c9ab265430b11b3a136f06433f512d8c40c Mon Sep 17 00:00:00 2001
From: root <root@mail.bitbase.dk>
Date: Sat, 2 Jan 2010 03:26:42 +0100
Subject: Update local-php.conf to use FilesMatch (not AddType).

---
 apache2/conf.d/local-php.conf | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'apache2/conf.d')

diff --git a/apache2/conf.d/local-php.conf b/apache2/conf.d/local-php.conf
index 2973fe7..f427805 100644
--- a/apache2/conf.d/local-php.conf
+++ b/apache2/conf.d/local-php.conf
@@ -1,2 +1,6 @@
-AddType application/x-httpd-php .php .phtml .php3
-AddType application/x-httpd-php-source .phps
+<FilesMatch "\.ph(p3?|tml)$">
+	SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch "\.phps$">
+	SetHandler application/x-httpd-php-source
+</FilesMatch>
-- 
cgit v1.2.3


From 21b1a66d40194e398d0c80a151fe315aff0ac563 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 15 May 2010 09:34:13 +0200
Subject: Adjust Alias to match newer gitweb default config.

---
 apache2/conf.d/local-git.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'apache2/conf.d')

diff --git a/apache2/conf.d/local-git.conf b/apache2/conf.d/local-git.conf
index 2140bc2..d667e9e 100644
--- a/apache2/conf.d/local-git.conf
+++ b/apache2/conf.d/local-git.conf
@@ -14,9 +14,7 @@ AddDefaultCharset UTF-8
 	allow from all
 </Directory>
 
-Alias /gitweb.css /usr/share/gitweb/gitweb.css
-Alias /git-favicon.png /usr/share/gitweb/git-favicon.png
-Alias /git-logo.png /usr/share/gitweb/git-logo.png
+Alias /gitweb/ /usr/share/gitweb/
 
 <Directory /usr/share/gitweb>
 	Options None
-- 
cgit v1.2.3


From 6cc2dc4632a55c63ebd8efafb568d9947461cbf9 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 15 May 2010 09:37:25 +0200
Subject: Use x-httpd-suphp (not x-httpd-php) to match newer suphp.

---
 apache2/conf.d/local-suphp.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apache2/conf.d')

diff --git a/apache2/conf.d/local-suphp.conf b/apache2/conf.d/local-suphp.conf
index a249342..bc17d2b 100644
--- a/apache2/conf.d/local-suphp.conf
+++ b/apache2/conf.d/local-suphp.conf
@@ -1,8 +1,8 @@
 # This file is based on /etc/apache2/mods-available/suphp.conf
 # Comment out those rules to enable the functionality only per vhost.
 <IfModule mod_suphp.c>
-	AddHandler x-httpd-php .php .php3 .php4 .php5 .phtml
-	suPHP_AddHandler x-httpd-php
+	AddHandler x-httpd-suphp .php .php3 .php4 .php5 .phtml
+	suPHP_AddHandler x-httpd-suphp
 	suPHP_Engine on
 # # Use a specific php config file (a dir which contains a php.ini file)
 #	suPHP_ConfigPath /etc/php4/cgi/suphp/
-- 
cgit v1.2.3