caddy: change publish information

95a71e1c · Eteri · Rafael Monnerat · ff09efe8 · 95a71e1c · 95a71e1c
Commit 95a71e1c authored Nov 06, 2017 by Eteri Committed by Rafael Monnerat Nov 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

stack/caddy/buildout.cfg stack/caddy/buildout.cfg +2 -2

stack/caddy/instance-caddy.cfg.in stack/caddy/instance-caddy.cfg.in +3 -2

No files found.
--- a/stack/caddy/buildout.cfg
+++ b/stack/caddy/buildout.cfg
@@ -27,7 +27,7 @@ mode = 0644
 [template-caddyfile]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/Caddyfile.in
-md5sum = bb3b314ebeb58e9875d547a053a9f268
+#md5sum = bb3b314ebeb58e9875d547a053a9f268
 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 = fe529c1911458fba92e93457c72a779a
+md5sum = 3b796dee5c509393fd396fd019914a2e
 output = ${buildout:directory}/instance-caddy.cfg.in
 mode = 0644

--- a/stack/caddy/instance-caddy.cfg.in
+++ b/stack/caddy/instance-caddy.cfg.in
@@ -114,8 +114,9 @@ mode = 0600
 [publish-connection-information]
 recipe = slapos.cookbook:publish
-url-ipv6 = https://$${slap-parameter:username}:$${slap-parameter:password}@[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
+password = $${slap-parameter:password}
-url-ipv4 = http://$${slap-parameter:username}:$${slap-parameter:password}@[$${caddy-configuration:local_ip}]:$${slap-parameter:port-ipv4}
+user = $${slap-parameter:username}
+secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6}
 [slap-parameter]
 domain =