Commit d3508b7e authored by Nicolas Wavrant's avatar Nicolas Wavrant

runner: fix compability with last version of stack monitor

parent 8a93a336
......@@ -44,7 +44,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
md5sum = ccb3e18ca8c7dce570bab367a680140f
md5sum = fe400e3c3bdfcf967bbf3a8574c40d4f
mode = 0644
[template-runner-import-script]
......
......@@ -315,7 +315,7 @@ var_dir = $${directory:var}
project_folder = $${directory:project}
runner_home = $${runnerdirectory:home}
git_http_backend = ${git:location}/libexec/git-core/git-http-backend
cgi_httpd_conf = $${cgi-httpd-configuration-file:output}
cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
[httpd-conf]
recipe = slapos.recipe.template:jinja2
......@@ -418,7 +418,7 @@ name = Monitor Frontend
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url domain
config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}
config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
......
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