Merge branch 'master' of ssh://ikiwiki-hosting.branchable.com

1 files changed, 13 insertions, 2 deletions

diff --git a/doc/design/apacheconfig.mdwn b/doc/design/apacheconfig.mdwn
index ec9bb38..2e71337 100644
--- a/doc/design/apacheconfig.mdwn
+++ b/doc/design/apacheconfig.mdwn
@@ -5,7 +5,7 @@ It can be useful to tweak apache settings for a single site. To allow this,
 use `/etc/ikiwiki-hosting/config/$username/apache.conf.tmpl`
 
 This is an apache2 config fragment, that, if present, is inserted into the
-site's generated apache config file by `ikisite enable`. Remeber to run
+site's generated apache config file by `ikisite enable`. Remember to run
 `ikisite enable` if modifying it.
 
 It is inserted inside the `<VirtualHost>` tag in the apache config file,
@@ -34,7 +34,7 @@ for a given site, this file can be used to enable it.
 
 ---
 
-To enable SSL, just install the ssl cerificate to
+To enable SSL, just install the ssl certificate to
 `/etc/ikiwiki-hosting/config/$username/ssl.crt`
 and the key to 
 `/etc/ikiwiki-hosting/config/$username/ssl.key`.
@@ -49,3 +49,14 @@ if the CA need to provide additional certificate chain material.
 Note that it's up to you to configure apache to use SNI if using SSL
 for multiple virtual hosts on a single IP. See
 <http://wiki.apache.org/httpd/NameBasedSSLVHostsWithSNI>
+
+If you want some Apache configuration to be applied to the SSL version
+of the site but not the normal version (enabling HTTP authentication
+for [[!iki plugins/httpauth desc="the httpauth plugin"]], perhaps),
+put it in `/etc/ikiwiki-hosting/config/$username/apache-ssl.conf.tmpl`.
+
+---
+
+Special configuration for the `source.$hostname.$domain` (gitweb)
+virtual host can be provided too, in
+`/etc/ikiwiki-hosting/config/$username/apache-source.conf.tmpl`.