diff options
| -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 | ||||
| -rwxr-xr-x | apt/apt.conf.d/99-local-set-preferred-x-session-manager | 4 | ||||
| -rwxr-xr-x | apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator | 4 | ||||
| -rwxr-xr-x | apt/apt.conf.d/99-local-set-preferred-x-www-browser | 4 |
6 files changed, 18 insertions, 10 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/ diff --git a/apt/apt.conf.d/99-local-set-preferred-x-session-manager b/apt/apt.conf.d/99-local-set-preferred-x-session-manager index a842f9f..4e0b73f 100755 --- a/apt/apt.conf.d/99-local-set-preferred-x-session-manager +++ b/apt/apt.conf.d/99-local-set-preferred-x-session-manager @@ -2,5 +2,7 @@ DPkg { -Post-Invoke {"if [ -x /usr/sbin/update-alternatives ] && [ -x /usr/bin/gnome-session ]; then /usr/sbin/update-alternatives --set x-session-manager /usr/bin/gnome-session; else exit 0; fi";}; +Post-Invoke { +"s=/usr/bin/gnome-session; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-session-manager $s" +;}; }; diff --git a/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator b/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator index a16ef99..ac74e1b 100755 --- a/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator +++ b/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator @@ -2,5 +2,7 @@ DPkg { -Post-Invoke {"if [ -x /usr/sbin/update-alternatives ] && [ -x /usr/bin/urxvt ]; then /usr/sbin/update-alternatives --set x-terminal-emulator /usr/bin/urxvt; else exit 0; fi";}; +Post-Invoke { +"s=/usr/bin/urxvtcd; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-terminal-emulator $s" +;}; }; diff --git a/apt/apt.conf.d/99-local-set-preferred-x-www-browser b/apt/apt.conf.d/99-local-set-preferred-x-www-browser index 9302c6e..5fbbe90 100755 --- a/apt/apt.conf.d/99-local-set-preferred-x-www-browser +++ b/apt/apt.conf.d/99-local-set-preferred-x-www-browser @@ -2,5 +2,7 @@ DPkg { -Post-Invoke {"if [ -x /usr/sbin/update-alternatives ] && [ -x /usr/bin/iceweasel ]; then /usr/sbin/update-alternatives --set x-www-browser /usr/bin/iceweasel; else exit 0; fi";}; +Post-Invoke { +"s=/usr/bin/iceweasel; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-www-browser $s" +;}; }; |