Skip to content

slapos
slapos
Commit 95eb1ab3 authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

fixup! varnish: Provide web-checker's required parameters.

parent 16180362
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
software/varnish/instance-varnish.cfg.in
View file @ 95eb1ab3
...@@ -27,7 +27,7 @@ web-checker-working-directory = ${directory:web-checker} ...@@ -27,7 +27,7 @@ web-checker-working-directory = ${directory:web-checker}
frontend-url = {{ web_checker_dict.get('frontend-url', 'http://%(ip)s:%(port)s/') % { frontend-url = {{ web_checker_dict.get('frontend-url', 'http://%(ip)s:%(port)s/') % {
'ip': ip, 'ip': ip,
'port': tcpv4_port, 'port': tcpv4_port,
} -%} } }}
mail-address = {{ web_checker_dict['mail-address'] }} mail-address = {{ web_checker_dict['mail-address'] }}
smtp-host = {{ web_checker_dict['smtp-host'] }} smtp-host = {{ web_checker_dict['smtp-host'] }}
wget-binary-path = {{ parameter_dict['wget'] }}/bin/wget wget-binary-path = {{ parameter_dict['wget'] }}/bin/wget
......
software/varnish/software.cfg
View file @ 95eb1ab3
...@@ -87,7 +87,7 @@ extra-context = ...@@ -87,7 +87,7 @@ extra-context =
[template-varnish] [template-varnish]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-varnish.cfg.in url = ${:_profile_base_location_}/instance-varnish.cfg.in
md5sum = febb523b1cb1aff5214d6f07c78644bb md5sum = 4334d900f212d170fd0ca35865879bdf
mode = 640 mode = 640
[eggs] [eggs]
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7