diff options
author | Joey Hess <joey@kitenet.net> | 2014-04-19 15:19:39 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-04-19 15:19:39 -0400 |
commit | dc75701e52872a57c98776d15862036e1fd7bc26 (patch) | |
tree | b48ebf54edaaf8763773bbf84faf539d85b3b712 | |
parent | 6d3e02606a71d3fea714bcfda57f62c07a5338f3 (diff) | |
parent | cae2dffd98ac9939c721c8f4d998792b4d85383c (diff) |
Merge remote-tracking branch 'remotes/smcv/ready/userdir'
-rwxr-xr-x | debian/ikiwiki-hosting-web.postinst | 1 | ||||
-rw-r--r-- | templates/apache-site.tmpl | 6 | ||||
-rw-r--r-- | templates/apache-sitealias.tmpl | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/ikiwiki-hosting-web.postinst b/debian/ikiwiki-hosting-web.postinst index bb55de8..ab97553 100755 --- a/debian/ikiwiki-hosting-web.postinst +++ b/debian/ikiwiki-hosting-web.postinst @@ -11,7 +11,6 @@ fi #DEBHELPER# a2enmod suexec -a2enmod userdir # only so it can be forced disabled, ironically a2enmod ssl if which invoke-rc.d >/dev/null 2>&1; then invoke-rc.d apache2 restart diff --git a/templates/apache-site.tmpl b/templates/apache-site.tmpl index f8855e9..58e8697 100644 --- a/templates/apache-site.tmpl +++ b/templates/apache-site.tmpl @@ -9,7 +9,9 @@ SuexecUserGroup <TMPL_VAR USER> <TMPL_VAR USER> </TMPL_IF> + <IfModule mod_userdir.c> UserDir disabled + </IfModule> <TMPL_IF REDIRECT_TO_HTTPS> RewriteEngine On @@ -71,7 +73,9 @@ SuexecUserGroup <TMPL_VAR USER> <TMPL_VAR USER> </TMPL_IF> + <IfModule mod_userdir.c> UserDir disabled + </IfModule> DocumentRoot <TMPL_VAR DESTDIR> <Directory /> @@ -122,7 +126,9 @@ SuexecUserGroup <TMPL_VAR USER> <TMPL_VAR USER> </TMPL_IF> + <IfModule mod_userdir.c> UserDir disabled + </IfModule> DocumentRoot /usr/share/gitweb ScriptAlias /index.cgi <TMPL_VAR CGIDIR>/gitweb.cgi diff --git a/templates/apache-sitealias.tmpl b/templates/apache-sitealias.tmpl index 92b2d5e..bc72722 100644 --- a/templates/apache-sitealias.tmpl +++ b/templates/apache-sitealias.tmpl @@ -9,7 +9,9 @@ SuexecUserGroup <TMPL_VAR USER> <TMPL_VAR USER> </TMPL_IF> + <IfModule mod_userdir.c> UserDir disabled + </IfModule> RewriteEngine On RewriteRule ^/(.*) <TMPL_VAR URL_ESCAPED>$1 [L,R,NE] @@ -35,7 +37,9 @@ SuexecUserGroup <TMPL_VAR USER> <TMPL_VAR USER> </TMPL_IF> + <IfModule mod_userdir.c> UserDir disabled + </IfModule> RewriteEngine On RewriteRule ^/(.*) <TMPL_VAR HTTPS_URL_ESCAPED>$1 [L,R,NE] |