diff options
| -rw-r--r-- | apache2/conf.d/local-git.conf | 4 | ||||
| -rw-r--r-- | apache2/conf.d/local-php.conf | 10 | ||||
| -rwxr-xr-x | mailman/dump-all-config.sh | 3 | ||||
| -rw-r--r-- | mailman/mklist.inc | 2 |
4 files changed, 16 insertions, 3 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> diff --git a/mailman/dump-all-config.sh b/mailman/dump-all-config.sh index b3b5062..826abd4 100755 --- a/mailman/dump-all-config.sh +++ b/mailman/dump-all-config.sh @@ -12,7 +12,8 @@ if [ -x /usr/lib/mailman/bin/list_lists -a -x /usr/lib/mailman/bin/config_list ]; then for list in `/usr/lib/mailman/bin/list_lists --bare`; do /usr/lib/mailman/bin/config_list -o $list.py $list - /usr/lib/mailman/bin/list_members --fullnames --preserve -o $list.members $list + /usr/lib/mailman/bin/list_members --fullnames --preserve --regular -o $list.members $list + /usr/lib/mailman/bin/list_members --fullnames --preserve --digest -o $list.members-digest $list done else echo "This script requires Mailman 2.1" diff --git a/mailman/mklist.inc b/mailman/mklist.inc index f4dba3c..47ee3b6 100644 --- a/mailman/mklist.inc +++ b/mailman/mklist.inc @@ -24,7 +24,7 @@ mklist() { lang="${1:-$LISTLANG}" owner="${2:-$OWNER}" emailhost="${3:-$LISTDOMAIN}" - urlhost="${4:-$LISTWEBDOMAIN}" + urlhost="${4:-${LISTWEBDOMAIN:-$emailhost}}" if ! echo "$existinglists" | grep -q "^$list\$"; then newlist -l "$lang"${urlhost:+ -u "$urlhost"}${emailhost:+ -e "$emailhost"} -q "$list" "$owner" "`gpw | head -n 1`" |