[tor-commits] [flashproxy/master] fix errors in apache example config and add instructions on enabling SSL and HSTS

[infinity0 at torproject.org]

commit 82e6dc766a2625f14599968e82fe3c6e5fbc704c
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Thu Oct 10 11:31:03 2013 +0100

    fix errors in apache example config and add instructions on enabling SSL and HSTS
---
 facilitator/examples/fp-facilitator |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/facilitator/examples/fp-facilitator b/facilitator/examples/fp-facilitator
index 125d0cc..500521d 100644
--- a/facilitator/examples/fp-facilitator
+++ b/facilitator/examples/fp-facilitator
@@ -4,24 +4,28 @@
 # /etc/apache2/sites-available/fp-facilitator, or wherever is appropriate. Then
 # you can run `a2ensite fp-facilitator` to enable it.
 #
+# You should also run `a2enmod ssl headers` to enable SSL and HSTS.
+#
+MaxClients 256
 <VirtualHost *:443>
 	# Update this with your hostname!
 	ServerName fp-facilitator.example.com
 	DocumentRoot /dev/null
 	# Make sure the path below matchs where you installed the facilitator.
 	ScriptAliasMatch ^(.*) /usr/bin/facilitator.cgi$1
-	MaxClients 256
 
 	CustomLog ${APACHE_LOG_DIR}/fp-access.log common
 	ErrorLog ${APACHE_LOG_DIR}/fp-error.log
 	LogLevel warn
-	SSLEngine on
 
+	# requires mod_ssl
+	SSLEngine on
 	# Manually install your certificate to the following location.
 	SSLCertificateFile /etc/apache2/fp-facilitator.pem
 	# If you got an intermediate certificate, uncomment the following line
 	# and install the certificate to that location too.
 	#SSLCertificateChainFile /etc/apache2/fp-intermediate.pem
 
+	# requires mod_headers
 	Header add Strict-Transport-Security "max-age=15768000"
 </VirtualHost>