stack/monitor: change cors-domains and interface-url hardcoded values by instance parameters

stack/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = 24c7f5527d994e231b4c2bf9fecb68a6
+md5sum = 39258fb8dea4da11c3cbda0a24b1f1a6
 
 [monitor-httpd-conf]
 _update_hash_filename_ = templates/monitor-httpd.conf.in

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

@@ -9,6 +9,8 @@ cert = ${slap-connection:cert-file}
 # XXX Default values if doesn't exists
 root-instance-title = UNKNOWN H-S
 instance-title = UNKNOWN Instance
+configuration.monitor-cors-domains = monitor.app.officejs.com
+configuration.monitor-interface-url = https://monitor.app.officejs.com
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -333,17 +335,15 @@ monitor-base-url = ${monitor-frontend:connection-secure_access}
 #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
+cors-domains = ${slap-configuration:configuration.monitor-cors-domains}
 # XXX Hard coded parameter
 collector-db = /srv/slapgrid/var/data-log/collector.db
 # Credentials
 password = ${monitor-htpasswd:passwd}
 username = admin
 instance-configuration =
-
 configuration-file-path = ${monitor-directory:etc}/monitor_knowledge0.cfg
-
-interface-url = https://monitor.app.officejs.com
+interface-url = ${slap-configuration:configuration.monitor-interface-url}
 
 [monitor-frontend]
 <= slap-connection
@@ -427,7 +427,7 @@ depends =
 
 [monitor-publish]
 monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
-monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
+monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=ojsm_landing&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
 
 
 [buildout]