diff options
Diffstat (limited to 'apache2')
| -rw-r--r-- | apache2/conf.d/local-git.conf | 4 | ||||
| -rw-r--r-- | apache2/conf.d/local-php.conf | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/apache2/conf.d/local-git.conf b/apache2/conf.d/local-git.conf index a3894b1..8fc553a 100644 --- a/apache2/conf.d/local-git.conf +++ b/apache2/conf.d/local-git.conf @@ -1,3 +1,5 @@ +Alias /static /usr/share/gitweb/static/ + AddDefaultCharset UTF-8 <Directory /srv/git> @@ -8,7 +10,7 @@ AddDefaultCharset UTF-8 </Directory> <Directory /usr/lib/cgi-bin> - Options ExecCgi + Options ExecCgi FollowSymLinks AllowOverride None Order allow,deny allow from all diff --git a/apache2/conf.d/local-php.conf b/apache2/conf.d/local-php.conf index f427805..fc6e91f 100644 --- a/apache2/conf.d/local-php.conf +++ b/apache2/conf.d/local-php.conf @@ -1,6 +1,16 @@ +# requires: php5 + <FilesMatch "\.ph(p3?|tml)$"> SetHandler application/x-httpd-php </FilesMatch> <FilesMatch "\.phps$"> SetHandler application/x-httpd-php-source </FilesMatch> +# To re-enable php in user directories comment the following lines +# (from <IfModule ...> to </IfModule>.) Do NOT set it to On as it +# prevents .htaccess files from disabling it. +<IfModule mod_userdir.c> + <Directory /home/*/public_html> + php_admin_value engine Off + </Directory> +</IfModule> |