monitor: change monitor-url-list parameter name

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 07839b433d0efefb559695e8954dfb32
+md5sum = f2d704c269244c4eb842aefbc9ff9201
 mode = 0644
 
 [template-runner-import-script]

software/slaprunner/instance-runner.cfg

@@ -736,7 +736,7 @@ username = {{ slapparameter_dict['monitor-username'] }}
 password = {{ slapparameter_dict['monitor-password'] }}
 {% endif -%}
 {% if slapparameter_dict.get('monitor-url-list', '') -%}
-opml-url-list = {{ slapparameter_dict['monitor-url-list'] }}
+monitor-url-list = {{ slapparameter_dict['monitor-url-list'] }}
 {% endif -%}
 # check if not resilient runner
 {% if not slapparameter_dict.get('authorized-key', '') -%}

stack/monitor/README.md

@@ -42,7 +42,7 @@ You don't need to define all parameters, you can only set what is required to be
 - monitor-httpd-ipv6: is the ipv6 of the computer partition.
 - monitor-httpd-port: the port to bind monitor httpd server on.
 - monitor-base-url: this url that will be used/showed in monitor interface. This url is present in some monitor generated output files. There can be two value, the default: ${monitor-frontend-promise:url} which access monitor httpd server through the frontend and ${monitor-httpd-conf-parameter:url} which is the url with ipv6 (https://[IPv6]:port/).
-- opml-url-list: list of OPML URL of monitor sub-instances, if this is the root instance with at least one child.
+- monitor-url-list: set list of Monitor Base URL of monitor sub-instances, if this is the root instance with at least one child.
 - cors-domains: the domain used by the monitor web interface. The default is: monitor.app.officejs.com.
 - username: monitor username, this should be the same in all sub-instances. Default is: admin.
 - password: monitor password, this should be the same in all sub-instances. Default is generated (${monitor-htpasswd:username}).

stack/monitor/buildout.cfg

@@ -100,7 +100,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 = 7ae453794e320d3b512ec037efc5fc1f  
+md5sum = 9d6f50e616655c1ae11ace419ac2861e  
 context =
     key apache_location apache:location
     key gzip_location gzip:location

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -151,7 +151,7 @@ private-path-list =
     ${directory:log}
 # 
 monitor-url-list = 
-  ${monitor-instance-parameter:opml-url-list}
+  ${monitor-instance-parameter:monitor-url-list}
 
 parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
 
@@ -377,7 +377,7 @@ monitor-httpd-port = 8196
 # XXX - Set monitor-base-url = ${monitor-httpd-conf-parameter:url} => https://[ipv6]:port
 monitor-base-url = ${monitor-frontend-promise:url}
 root-instance-title = ${slap-configuration:root-instance-title}
-opml-url-list =
+monitor-url-list =
 cors-domains = monitor.app.officejs.com 
 # XXX Hard coded parameter
 collector-db = /srv/slapgrid/var/data-log/collector.db