From cae2dffd98ac9939c721c8f4d998792b4d85383c Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 20 Jul 2013 14:42:12 +0100
Subject: Only turn off mod_userdir if it's enabled

---
 debian/ikiwiki-hosting-web.postinst | 1 -
 templates/apache-site.tmpl          | 6 ++++++
 templates/apache-sitealias.tmpl     | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

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 18c053a..54e8ced 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>
 
 	DocumentRoot <TMPL_VAR DESTDIR>
 	<Directory />
@@ -56,7 +58,9 @@
 	SuexecUserGroup <TMPL_VAR USER> <TMPL_VAR USER>
 	</TMPL_IF>
 
+	<IfModule mod_userdir.c>
 	UserDir disabled
+	</IfModule>
 
 	DocumentRoot <TMPL_VAR DESTDIR>
 	<Directory />
@@ -96,7 +100,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 9ffb23a..11ed302 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 URL_ESCAPED>$1 [L,R,NE]
-- 
cgit v1.2.3