caddy-frontend: Make cached no-op

software/caddy-frontend/buildout.hash.cfg

@@ -59,7 +59,7 @@ md5sum = 8a0b6c937384c299dd36274c9fa8d104
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
-md5sum = 1a1a53d9ac4a1591c017d86850a94796
+md5sum = 42a574141f2d8e27669e3848d2e600a1
 
 [template-log-access]
 filename = templates/template-log-access.conf.in

software/caddy-frontend/templates/cached-virtualhost.conf.in

@@ -2,50 +2,50 @@
 {% set server_alias_list =  slave_parameter.get('server-alias', '').split() %}
 {% set ssl_proxy_verify = ('' ~ slave_parameter.get('ssl-proxy-verify', '')).lower() in TRUE_VALUES -%}
 
-# Only accept generic (i.e not Zope) backends on http
-<VirtualHost *:{{ cached_port }}>
-  ServerName {{ slave_parameter.get('custom_domain') }}
-  {%- for server_alias in server_alias_list %}
-  ServerAlias {{ server_alias }}
-  {% endfor %}
-  SSLProxyEngine on
+# TODO-Caddy # Only accept generic (i.e not Zope) backends on http
+# TODO-Caddy <VirtualHost *:{{ cached_port }}>
+# TODO-Caddy   ServerName {{ slave_parameter.get('custom_domain') }}
+# TODO-Caddy   {%- for server_alias in server_alias_list %}
+# TODO-Caddy   ServerAlias {{ server_alias }}
+# TODO-Caddy   {% endfor %}
+# TODO-Caddy   SSLProxyEngine on
 
-{% if ssl_proxy_verify -%}
-{%   if 'ssl_proxy_ca_crt' in slave_parameter -%}
-  SSLProxyCACertificateFile {{ slave_parameter.get('path_to_ssl_proxy_ca_crt', '') }}
-{%   endif %}
-  SSLProxyVerify require
-  #SSLProxyCheckPeerCN on
-  SSLProxyCheckPeerExpire on
-{% endif %}
-  # Rewrite part
-  ProxyPreserveHost On
-  ProxyTimeout 600
-  RewriteEngine On
-
-  RewriteRule ^/(.*)$ {{ slave_parameter.get('backend_url', '') }}/$1 [L,P]
-</VirtualHost>
-
-<VirtualHost *:{{ ssl_cached_port }}>
-  ServerName {{ slave_parameter.get('custom_domain') }}
-  {%- for server_alias in server_alias_list %}
-  ServerAlias {{ server_alias }}
-  {% endfor %}
-  SSLProxyEngine on
-
-{% if ssl_proxy_verify -%}
-{%   if 'ssl_proxy_ca_crt' in slave_parameter -%}
-  SSLProxyCACertificateFile {{ slave_parameter.get('path_to_ssl_proxy_ca_crt', '') }}
-{%   endif %}
-  SSLProxyVerify require
-  #SSLProxyCheckPeerCN on
-  SSLProxyCheckPeerExpire on
-{% endif %}
-  # Rewrite part
-  ProxyPreserveHost On
-  ProxyTimeout 600
-  RewriteEngine On
-
-  RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
-</VirtualHost>
+# TODO-Caddy {% if ssl_proxy_verify -%}
+# TODO-Caddy {%   if 'ssl_proxy_ca_crt' in slave_parameter -%}
+# TODO-Caddy   SSLProxyCACertificateFile {{ slave_parameter.get('path_to_ssl_proxy_ca_crt', '') }}
+# TODO-Caddy {%   endif %}
+# TODO-Caddy   SSLProxyVerify require
+# TODO-Caddy   #SSLProxyCheckPeerCN on
+# TODO-Caddy   SSLProxyCheckPeerExpire on
+# TODO-Caddy {% endif %}
+# TODO-Caddy   # Rewrite part
+# TODO-Caddy   ProxyPreserveHost On
+# TODO-Caddy   ProxyTimeout 600
+# TODO-Caddy   RewriteEngine On
+# TODO-Caddy 
+# TODO-Caddy   RewriteRule ^/(.*)$ {{ slave_parameter.get('backend_url', '') }}/$1 [L,P]
+# TODO-Caddy </VirtualHost>
 
+# TODO-Caddy <VirtualHost *:{{ ssl_cached_port }}>
+# TODO-Caddy   ServerName {{ slave_parameter.get('custom_domain') }}
+# TODO-Caddy   {%- for server_alias in server_alias_list %}
+# TODO-Caddy   ServerAlias {{ server_alias }}
+# TODO-Caddy   {% endfor %}
+# TODO-Caddy   SSLProxyEngine on
+# TODO-Caddy 
+# TODO-Caddy {% if ssl_proxy_verify -%}
+# TODO-Caddy {%   if 'ssl_proxy_ca_crt' in slave_parameter -%}
+# TODO-Caddy   SSLProxyCACertificateFile {{ slave_parameter.get('path_to_ssl_proxy_ca_crt', '') }}
+# TODO-Caddy {%   endif %}
+# TODO-Caddy   SSLProxyVerify require
+# TODO-Caddy   #SSLProxyCheckPeerCN on
+# TODO-Caddy   SSLProxyCheckPeerExpire on
+# TODO-Caddy {% endif %}
+# TODO-Caddy   # Rewrite part
+# TODO-Caddy   ProxyPreserveHost On
+# TODO-Caddy   ProxyTimeout 600
+# TODO-Caddy   RewriteEngine On
+# TODO-Caddy 
+# TODO-Caddy   RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
+# TODO-Caddy </VirtualHost>
+# TODO-Caddy