summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-11-18 17:19:46 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-11-18 17:19:46 -0200
commitc40df22bc9b9730ef27be30bed41aa887d0c7022 (patch)
tree25ebcde756c38de708a7f7ae6634f282049636f6
parent0c39217920c131dcc5e6caf7c945bb130fe0c827 (diff)
downloadpuppet-apache-c40df22bc9b9730ef27be30bed41aa887d0c7022.tar.gz
puppet-apache-c40df22bc9b9730ef27be30bed41aa887d0c7022.tar.bz2
Set HTTPS=on if X_FORWARDED_PROTO is https
-rw-r--r--templates/apache2.conf.erb3
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index ee28bdc..79b9ac1 100644
--- a/templates/apache2.conf.erb
+++ b/templates/apache2.conf.erb
@@ -644,3 +644,6 @@ ErrorDocument 404 http://<%= domain %>/missing.html
# Include the virtual host configurations:
Include /etc/apache2/sites-enabled/
+
+# See http://www.metaltoad.com/blog/running-drupal-secure-pages-behind-proxy
+SetEnvIf X_FORWARDED_PROTO https HTTPS=on