add missing directive for ssl proxy vhosts

12 files changed, 16 insertions, 4 deletions

diff --git a/templates/vhosts/perl/perl.erb b/templates/vhosts/perl/perl.erb
index 5cb30bc..056730a 100644
--- a/templates/vhosts/perl/perl.erb
+++ b/templates/vhosts/perl/perl.erb
@@ -307,6 +307,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.pl/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php/php.erb b/templates/vhosts/php/php.erb
index 4d5d984..c19b174 100644
--- a/templates/vhosts/php/php.erb
+++ b/templates/vhosts/php/php.erb
@@ -317,6 +317,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb
index db01248..56e09ec 100644
--- a/templates/vhosts/php_drupal/php_drupal.erb
+++ b/templates/vhosts/php_drupal/php_drupal.erb
@@ -378,6 +378,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_gallery2/php_gallery.erb b/templates/vhosts/php_gallery2/php_gallery.erb
index fdcc89b..2abe1b3 100644
--- a/templates/vhosts/php_gallery2/php_gallery.erb
+++ b/templates/vhosts/php_gallery2/php_gallery.erb
@@ -339,6 +339,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index 9911a15..73029ad 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.erb
@@ -378,6 +378,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_mediawiki/php_mediawiki.erb b/templates/vhosts/php_mediawiki/php_mediawiki.erb
index ac51dcc..447b34e 100644
--- a/templates/vhosts/php_mediawiki/php_mediawiki.erb
+++ b/templates/vhosts/php_mediawiki/php_mediawiki.erb
@@ -295,6 +295,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb
index 888c066..8f83c71 100644
--- a/templates/vhosts/php_silverstripe/php_silverstripe.erb
+++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb
@@ -379,6 +379,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_simplemachine/php_simplemachine.erb b/templates/vhosts/php_simplemachine/php_simplemachine.erb
index 7042647..d9d1f25 100644
--- a/templates/vhosts/php_simplemachine/php_simplemachine.erb
+++ b/templates/vhosts/php_simplemachine/php_simplemachine.erb
@@ -305,6 +305,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_spip/php_spip.erb b/templates/vhosts/php_spip/php_spip.erb
index c63cf77..6a26c4c 100644
--- a/templates/vhosts/php_spip/php_spip.erb
+++ b/templates/vhosts/php_spip/php_spip.erb
@@ -317,6 +317,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_typo3/php_typo3.erb b/templates/vhosts/php_typo3/php_typo3.erb
index 6272576..e80aede 100644
--- a/templates/vhosts/php_typo3/php_typo3.erb
+++ b/templates/vhosts/php_typo3/php_typo3.erb
@@ -358,6 +358,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/php_wordpress/php_wordpress.erb b/templates/vhosts/php_wordpress/php_wordpress.erb
index 2a90c69..241465f 100644
--- a/templates/vhosts/php_wordpress/php_wordpress.erb
+++ b/templates/vhosts/php_wordpress/php_wordpress.erb
@@ -308,6 +308,7 @@
 
     ProxyPreserveHost On
     ProxyRequests off
+    SSLProxyEngine On
     <%- if run_mode.to_s == 'static-itk' -%>
     ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
     <%- else -%>
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb
index a7dfa37..ad0aba1 100644
--- a/templates/vhosts/webdav/webdav.erb
+++ b/templates/vhosts/webdav/webdav.erb
@@ -222,8 +222,8 @@
 
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / https://127.0.0.1/
-    ProxyPassReverse / https://127.0.0.1/
+    ProxyPass / http://127.0.0.1/
+    ProxyPassReverse / http://127.0.0.1/
 
     <%- if ssl_mode.to_s == 'force' then -%>
     Redirect permanent / https://<%= servername %>/
@@ -287,8 +287,9 @@
 
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://127.0.0.1/
-    ProxyPassReverse / http://127.0.0.1/
+    SSLProxyEngine On
+    ProxyPass / https://127.0.0.1/
+    ProxyPassReverse / https://127.0.0.1/
 
     <%- if default_charset.to_s != 'absent' then -%>
     AddDefaultCharset <%= default_charset %>