Commit a844ffd0 authored by Eteri's avatar Eteri

caddy: add bind to a specific ip

parent ddc44378
...@@ -19,22 +19,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}} ...@@ -19,22 +19,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
{%- endif %} {%- endif %}
{% if parameter_dict['proxy'] == 'true' -%}
{% if parameter_dict['zope'] == 'true' -%}
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']}}
} }
...@@ -59,21 +43,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}} ...@@ -59,21 +43,6 @@ basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}} basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
{%- endif %} {%- endif %}
{% if parameter_dict['proxy'] == 'true' -%}
{% if parameter_dict['zope'] == 'true' -%}
proxy / {{parameter_dict['url']}}/VirtualHostBase/https/[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port-ipv6']}}/VirtualHostRoot/ {
insecure_skip_verify
}
{% else %}
proxy / {{parameter_dict['url']}}
{%- endif %}
{%- endif %}
bind {{caddy_configuration_dict['ipv6']}} bind {{caddy_configuration_dict['ipv6']}}
} }
......
...@@ -27,7 +27,7 @@ mode = 0644 ...@@ -27,7 +27,7 @@ mode = 0644
[template-caddyfile] [template-caddyfile]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/Caddyfile.in url = ${:_profile_base_location_}/Caddyfile.in
md5sum = 991eb3cc2fe46bd6bfb77e2db9cb378f md5sum = 6f3bef122ac60fdbeff156eae92b206c
filename = Caddyfile.in filename = Caddyfile.in
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 0644 mode = 0644
...@@ -35,7 +35,7 @@ mode = 0644 ...@@ -35,7 +35,7 @@ mode = 0644
[template-caddy] [template-caddy]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-caddy.cfg.in url = ${:_profile_base_location_}/instance-caddy.cfg.in
md5sum = 4a8f049778640556d52a9de98f7eb987 md5sum = 3b796dee5c509393fd396fd019914a2e
output = ${buildout:directory}/instance-caddy.cfg.in output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644 mode = 0644
......
...@@ -119,7 +119,7 @@ user = $${slap-parameter:username} ...@@ -119,7 +119,7 @@ user = $${slap-parameter:username}
secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6} secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
[slap-parameter] [slap-parameter]
domain = caddy-test.erp5.net:9443 domain =
key-content = key-content =
cert-content = cert-content =
caddy-ca-certificate = caddy-ca-certificate =
...@@ -129,6 +129,3 @@ enable-quic = true ...@@ -129,6 +129,3 @@ enable-quic = true
enable-basic-auth = enable-basic-auth =
username = admin username = admin
password = $${htpasswd:passwd} password = $${htpasswd:passwd}
\ No newline at end of file
proxy = true
zope = true
url = https://[2001:67c:1254:72::5d03]:2151
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment