From 3df63c9ab265430b11b3a136f06433f512d8c40c Mon Sep 17 00:00:00 2001 From: root 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(-) 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 + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + -- cgit v1.2.3 From 1e59c38f0a0241ba14a914adb1c02a03d0199d8b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Apr 2010 18:07:56 +0200 Subject: More compact yet easier readable APT hook alternatives resolving. --- apt/apt.conf.d/99-local-set-preferred-x-session-manager | 4 +++- apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator | 4 +++- apt/apt.conf.d/99-local-set-preferred-x-www-browser | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) 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..a28f44e 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/urxvt; [ ! -x $s ] || 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" +;}; }; -- cgit v1.2.3 From e644143d5223ab2ff8f931c6a2e21cd53a43c363 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Apr 2010 18:08:56 +0200 Subject: Select urxvtcd (not urxvt) in APT hook. --- apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a28f44e..4dbb803 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 @@ -3,6 +3,6 @@ DPkg { Post-Invoke { -"s=/usr/bin/urxvt; [ ! -x $s ] || update-alternatives --set x-terminal-emulator $s" +"s=/usr/bin/urxvtcd; [ ! -x $s ] || update-alternatives --set x-terminal-emulator $s" ;}; }; -- cgit v1.2.3 From a4d8cc703997d55331dfb611d70d325ac6962518 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Apr 2010 18:27:37 +0200 Subject: Fix add path to update-alternatives in APT hook. --- apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4dbb803..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 @@ -3,6 +3,6 @@ DPkg { Post-Invoke { -"s=/usr/bin/urxvtcd; [ ! -x $s ] || update-alternatives --set x-terminal-emulator $s" +"s=/usr/bin/urxvtcd; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-terminal-emulator $s" ;}; }; -- cgit v1.2.3 From 21b1a66d40194e398d0c80a151fe315aff0ac563 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard 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(-) 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 -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/ Options None -- cgit v1.2.3 From 6cc2dc4632a55c63ebd8efafb568d9947461cbf9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard 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(-) 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. - 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