Allow setting ProxyPreserveHost and nocanon
diff --git a/apache/files/proxy.conf b/apache/files/proxy.conf
index 5b0e1db..ec2769a 100644
--- a/apache/files/proxy.conf
+++ b/apache/files/proxy.conf
@@ -13,7 +13,10 @@
{%- if site.proxy.get('initial_pooled', True) == False %}
SetEnv proxy-initial-not-pooled 1
{%- endif %}
- ProxyPass / {{ site.proxy.protocol }}://{{ site.proxy.host }}:{{ site.proxy.port }}/
+ ProxyPass / {{ site.proxy.protocol }}://{{ site.proxy.host }}:{{ site.proxy.port }}/{% if site.proxy.get('nocanon', False)%} nocanon{% endif %}
+ {%- if site.proxy.preservehost is defined %}
+ ProxyPreserveHost {% if site.proxy.preservehost %}On{% else %}Off{% endif %}
+ {%- endif %}
{%- if site.get('ssl', {'enabled': False}).get('enabled', False) %}
RequestHeader set X-Forwarded-Proto "https"
RequestHeader set Front-End-Https "On"