Commit f0f126b2 authored by Eteri's avatar Eteri Committed by Rafael Monnerat

caddy: add ipv4

parent b7d86865
......@@ -22,7 +22,7 @@ basicauth / admin {{htpasswd_dict}}
{%- endif %}
[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port']}} {
[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port-ipv6']}} {
tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
......@@ -36,4 +36,14 @@ basicauth / admin {{htpasswd_dict}}
basicauth / admin {{htpasswd_dict}}
}
[{{caddy_configuration_dict['local_ip']}}]:{{parameter_dict['port-ipv4']}} {
log {{caddy_configuration_dict['access_log']}}
root {{ directory_dict['public_html'] }}
basicauth / admin {{htpasswd_dict}}
}
\ No newline at end of file
......@@ -27,7 +27,7 @@ mode = 0644
[template-caddyfile]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/Caddyfile.in
md5sum = 2580eeb504d93627d1990f42663f80c7
md5sum = 5de9738527f48bc5480eeb0ad97727a5
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 = b684a143d5620e8ed89744ec8c7f079e
md5sum = cee290eac3f9f8dbc614ac7373f412fc
output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644
......
......@@ -114,14 +114,16 @@ mode = 0600
[publish-connection-information]
recipe = slapos.cookbook:publish
init-password = $${htpasswd:passwd}
init-user = admin
url = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port}
#init-password = $${htpasswd:passwd}
#init-user = admin
url-ipv6 = https://admin:$${htpasswd:passwd}@[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
url-ipv4 = http://admin:$${htpasswd:passwd}@[$${caddy-configuration:local_ip}]:$${slap-parameter:port-ipv4}
[slap-parameter]
domain =
key-content =
cert-content =
caddy-ca-certificate =
port = 9443
port-ipv6 = 4443
port-ipv4 = 9443
enable-quic =
\ 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