diff options
| author | Mark Pemberton <mpemberton5@gmail.com> | 2011-05-21 21:38:25 -0400 |
|---|---|---|
| committer | Mark Pemberton <mpemberton5@gmail.com> | 2011-05-21 21:38:25 -0400 |
| commit | b105867e75f103ae2b0c54edfaa9ce6467a8a258 (patch) | |
| tree | 299bd99f271a55a98de88e8b27e457ea8401d2f1 /doc | |
| parent | e0149e24e2b5fac3b875fda468b18fbe2b6b1218 (diff) | |
| parent | 97bba97049eeed2ecec022caa641b50ca507cb72 (diff) | |
| download | semanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.gz semanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.bz2 | |
Merge branch 'master' into privatekey2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 1 | ||||
| -rw-r--r-- | doc/ssl-client-certificates.rst | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index a54e71e..3c4e939 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -14,6 +14,7 @@ ChangeLog for SemantiScuttle - Update php-gettext library to 1.0.10 - api/posts/add respects the "replace" parameter now - Fix privacy issue when fetching tags of several users +- Fix Google custom search XML - Only URLs with an allowed protocol may be added to the database - Support HTTPS connections when $root is not configured - SQL schema version table to ease future database upgrades diff --git a/doc/ssl-client-certificates.rst b/doc/ssl-client-certificates.rst index e12b507..7abf17a 100644 --- a/doc/ssl-client-certificates.rst +++ b/doc/ssl-client-certificates.rst @@ -94,7 +94,14 @@ you use. Apache configuration -------------------- To make use of SSL client certificates, you need to deliver SemanticScuttle -via HTTPS. +via HTTPS. + +Note that you can equip several virtual hosts with SSL certificates +and keep them on the same, standard SSL port by using SNI - +`Server Name Indication`__. + +.. _SNI: http://wiki.apache.org/httpd/NameBasedSSLVHostsWithSNI +__ SNI_ A basic virtual host configuration with SSL looks like this: |