Caddy 0.10.11

New release of Caddy 0.10.11 with updated quic version (v39). 



/reviewed-on !301

stack/caddy/Caddyfile.in

@@ -3,7 +3,7 @@
 {{ parameter_dict['domain'] }} {
 
 tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
-  
+
   ca {{ca_custom_frontend_dict['rendered']}}
 
 }
@@ -16,20 +16,37 @@ root {{ directory_dict['public_html'] }}
 
 {% if parameter_dict['enable-basic-auth'] == 'true'  -%}
 basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
+
 {%- endif %}
 
-}
+{% if parameter_dict['proxy'] == 'true'  -%}
+
+  {% if parameter_dict['type'] == 'zope'  -%}
+
+  proxy / {{parameter_dict['url']}}/VirtualHostBase/https/{{ parameter_dict['domain'] }}/VirtualHostRoot/ {
+
+  insecure_skip_verify
+
+  }
+
+  {% else %}
+    proxy / 	{{parameter_dict['url']}}
+  {%- endif %}
+
+  {%- endif %}
+
+  bind {{caddy_configuration_dict['ipv6']}}
 
-bind {{caddy_configuration_dict['ipv6']}}
+}
 
 {%- endif %}
 
-[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port-ipv6']}} {
+[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port']}} {
 
   tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
-  
+
     ca {{ certificate_authority_dict['ca-cert-file'] }}
-  
+
   }
 
   log {{caddy_configuration_dict['access_log']}}
@@ -42,11 +59,25 @@ bind {{caddy_configuration_dict['ipv6']}}
   basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
   {%- endif %}
   
-  bind {{caddy_configuration_dict['ipv6']}}
+  {% if parameter_dict['proxy'] == 'true'  -%}
+
+  {% if parameter_dict['type'] == 'zope'  -%}
+
+  proxy / {{parameter_dict['url']}}/VirtualHostBase/https/[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port']}}/VirtualHostRoot/ {
 
+  insecure_skip_verify
+
+  }
+
+  {% else %}
+    proxy / 	{{parameter_dict['url']}}
+  {%- endif %}
+
+  {%- endif %}
+  bind {{caddy_configuration_dict['ipv6']}}
 }
 
-[{{caddy_configuration_dict['local_ip']}}]:{{parameter_dict['port-ipv4']}} {
+[{{caddy_configuration_dict['local_ip']}}]:{{parameter_dict['port']}} {
 
   log {{caddy_configuration_dict['access_log']}}
   

stack/caddy/buildout.cfg

@@ -27,7 +27,7 @@ mode = 0644
 [template-caddyfile]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/Caddyfile.in
-md5sum = 88c4c33e374ea3f61cdd36b2816d24ba
+md5sum = 05b8347df3c5803a18a515687a3504e3
 filename = Caddyfile.in
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 mode = 0644
@@ -35,7 +35,7 @@ mode = 0644
 [template-caddy]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-caddy.cfg.in
-md5sum = 3b796dee5c509393fd396fd019914a2e
+md5sum = 4ed3a50a15a793fec330332be30a9f3a
 output = ${buildout:directory}/instance-caddy.cfg.in
 mode = 0644
 
@@ -49,7 +49,7 @@ mode = 0644
 [template-caddy-service]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-caddy-service.sh.in
-md5sum = 5467fac7b95acde681e613ae98ce990d
+md5sum = 1736f72c7c76afe133753389da7c0b1f
 output = ${buildout:directory}/template-caddy-service.sh.in
 mode = 0644
 
@@ -59,7 +59,7 @@ path    = ${go_github.com_mholt_caddy:location}
 go      = ${gowork:golang}/bin/go
 configure-command = :
 make-targets =
-make-binary = cd ${:path}/caddy && ${:go} install -v
+make-binary = cd ${:path}/caddy  && ${:go} install -v
 environment =
   PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
   GOPATH=${gowork:directory}

stack/caddy/gowork.cfg

@@ -9,5 +9,5 @@ depends_gitfetch  =
 [go_github.com_mholt_caddy]
 <= go-git-package
 go.importpath = github.com/mholt/caddy
-repository    = https://github.com/mholt/caddy.git
-revision  = v0.10.10-0-gc4dfbb9956
+repository    = https://github.com/mholt/caddy
+revision      = v0.10.11-0-gd3f338ddab

stack/caddy/instance-caddy.cfg.in

@@ -116,16 +116,18 @@ mode = 0600
 recipe = slapos.cookbook:publish
 password = $${slap-parameter:password}
 user = $${slap-parameter:username}
-secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
+secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port}
 
 [slap-parameter]
 domain =
 key-content =
 cert-content =
 caddy-ca-certificate =
-port-ipv6 = 9443
-port-ipv4 = 4443
+port = 9443
 enable-quic = true
 enable-basic-auth =
 username = admin
-password = $${htpasswd:passwd}
+password = $${htpasswd:passwd}
\ No newline at end of file
+proxy = false
+type = zope
+url =
\ No newline at end of file

stack/caddy/template-caddy-service.sh.in

@@ -2,8 +2,10 @@
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
 
-{{ caddy_exec }} -conf {{caddy_configuration_dict['rendered']}}
+{{ caddy_exec }}  -conf {{caddy_configuration_dict['rendered']}} \
  {%- if parameter_dict['enable-quic'] != 'false'  %}
  -quic
- {%- endif -%}
+ {%- endif -%} 
+ 
+ 
  
\ No newline at end of file