diff options
| author | root <root@homebase.dk> | 2010-06-18 08:49:40 +0200 |
|---|---|---|
| committer | root <root@homebase.dk> | 2010-06-18 08:49:40 +0200 |
| commit | d571bda1393dfe7ea85dee072f6c5ab56296c78d (patch) | |
| tree | 55e4b5961a9beaa3dc5625d35243101952b1d070 /apache2 | |
| parent | 80dd21617f3d176eee304934dd0dca622a40f5ce (diff) | |
| parent | 6cc2dc4632a55c63ebd8efafb568d9947461cbf9 (diff) | |
Merge branch 'master' of git://source.jones.dk/local-COMMON
Diffstat (limited to 'apache2')
| -rw-r--r-- | apache2/conf.d/local-git.conf | 4 | ||||
| -rw-r--r-- | apache2/conf.d/local-php.conf | 8 | ||||
| -rw-r--r-- | apache2/conf.d/local-suphp.conf | 4 |
3 files changed, 9 insertions, 7 deletions
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 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> 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/ |