monitor: returns IPv6 address in monitor URL

dad77472 · Nicolas Wavrant · 9514c72c · dad77472 · dad77472
Commit dad77472 authored Aug 24, 2016 by Nicolas Wavrant
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

stack/monitor/buildout.cfg stack/monitor/buildout.cfg +1 -1

stack/monitor/instance-monitor.cfg.jinja2.in stack/monitor/instance-monitor.cfg.jinja2.in +1 -2

No files found.
--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -87,7 +87,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 84998b1ca3c29445dca70b495515c35b
+md5sum = a2c93e22c7d7e32ca795486dfe9ad06e
 context =
    key apache_location apache:location
    key gzip_location gzip:location

--- a/stack/monitor/instance-monitor.cfg.jinja2.in
+++ b/stack/monitor/instance-monitor.cfg.jinja2.in
@@ -331,8 +331,7 @@ monitor-title = ${slap-configuration:instance-title}
 monitor-httpd-ipv6 = ${slap-configuration:ipv6-random}
 monitor-httpd-port = 8196
 # XXX - Set monitor-base-url = ${monitor-httpd-conf-parameter:url} => https://[ipv6]:port
-monitor-base-url = ${monitor-frontend-promise:url}
+monitor-base-url = ${monitor-httpd-conf-parameter:url}
-#monitor-base-url = ${monitor-httpd-conf-parameter:url}
 root-instance-title = ${slap-configuration:root-instance-title}
 monitor-url-list =
 cors-domains = monitor.app.officejs.com