diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index bc707a43b7ae83fdd567f87b7129a7895a39aafd..f9df67fc6b60fbd8c629fb8cfe693a5f254435aa 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -98,7 +98,7 @@ mode = 0644 recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2 mode = 644 -md5sum = 341bb135769421fdb1bc3666c921dbb2 +md5sum = 88d7622b207760f4c0bdb1b149730478 download-only = true on-update = true @@ -106,7 +106,7 @@ on-update = true recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in mode = 644 -md5sum = 24a717e6ccadf5708b8d5d82a75a7b25 +md5sum = d5c3728faa0972c55506b6cfc2359b59 download-only = true on-update = true @@ -114,7 +114,7 @@ on-update = true recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2 mode = 644 -md5sum = c8481ad7ef56b245e89df76cd19242db +md5sum = e7c613f15fec8b440180d3c26476ed18 download-only = true on-update = true diff --git a/software/kvm/instance-kvm-cluster.cfg.jinja2.in b/software/kvm/instance-kvm-cluster.cfg.jinja2.in index 452efc5dc6c9b314bed97a5a972ea257ee5d2c05..a1de0923710d33955b448d222fca573dab5aff7b 100644 --- a/software/kvm/instance-kvm-cluster.cfg.jinja2.in +++ b/software/kvm/instance-kvm-cluster.cfg.jinja2.in @@ -72,7 +72,7 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }} config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }} {% endif -%} config-enable-monitor = {{ dumps(kvm_parameter_dict.get('enable-monitor', True)) }} -config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }} +config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} config-monitor-username = ${monitor-htpasswd:username} config-monitor-password = ${monitor-htpasswd:passwd} @@ -240,7 +240,7 @@ recipe = slapos.cookbook:publish {% for name, value in publish_dict.items() -%} {{ name }} = {{ value }} {% endfor %} -{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%} +{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%} {% if monitor_interface_url -%} monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url} {% endif -%} diff --git a/software/kvm/instance-kvm-input-schema.json b/software/kvm/instance-kvm-input-schema.json index 5fed8519517784eacc017f6669f224c6ff315585..79d3848002fe0a7b1ccde495c1d3a1f0b806e401 100644 --- a/software/kvm/instance-kvm-input-schema.json +++ b/software/kvm/instance-kvm-input-schema.json @@ -168,13 +168,13 @@ "description": "Give Url of HTML web interface that will be used to render this monitor instance.", "type": "string", "format": "uri", - "default": "https://monitor.node.vifib.com" + "default": "https://monitor.app.officejs.com" }, "monitor-cors-domains": { "title": "Monitor CORS domains", "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.", "type": "string", - "default": "monitor.node.vifib.com" + "default": "monitor.app.officejs.com" }, "enable-http-server": { "title": "Enable local http server", diff --git a/software/kvm/instance-kvm-resilient.cfg.jinja2 b/software/kvm/instance-kvm-resilient.cfg.jinja2 index 8c1b16ced38446d508eb6f70554892f203d9170c..ac61bc44f00d3409f8bc084072926c4c849be686 100644 --- a/software/kvm/instance-kvm-resilient.cfg.jinja2 +++ b/software/kvm/instance-kvm-resilient.cfg.jinja2 @@ -8,10 +8,10 @@ {% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%} {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%} -{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.node.vifib.com")} -%} +{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%} {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%} {% endif -%} -{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.node.vifib.com') -%} +{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.app.officejs.com') -%} [buildout] eggs-directory = {{ eggs_directory }} diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2 index ac8743da8de26f2c0895e00e26a0cbd4a6da1df6..aa7565272020aaf8be5425b0d3aad3fb405f1a28 100644 --- a/software/kvm/instance-kvm.cfg.jinja2 +++ b/software/kvm/instance-kvm.cfg.jinja2 @@ -320,7 +320,7 @@ port = ${httpd:port} [monitor-instance-parameter] monitor-httpd-port = 8026 monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }} -cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }} +cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} {% if slapparameter_dict.get('monitor-username', '') -%} username = {{ slapparameter_dict['monitor-username'] }} {% endif -%} @@ -369,7 +369,7 @@ monitor-base-url = ${publish:monitor-base-url} monitor-url = ${publish:monitor-url} monitor-user = ${publish:monitor-user} monitor-password = ${publish:monitor-password} -{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%} +{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%} {% if monitor_interface_url -%} monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url} {% endif -%} diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 6a0a04fc93e9a826e61d84c117d41aad03057d39..26485df60ec4a2b084d1f7814164dea997117f8c 100644 --- a/software/slaprunner/common.cfg +++ b/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 = f7076baab3b51818d76be2aa8ce23f4c +md5sum = 8fedcc83e2ecb488910ddd8a1c82fe24 mode = 0644 [template-runner-import-script] @@ -90,7 +90,7 @@ mode = 0644 [template-resilient] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2 -md5sum = 1721ed960ae5b9ae55864bcdc5b1d487 +md5sum = 160bf71d8a15f1359d80eb5586109781 filename = instance-resilient.cfg.jinja2 mode = 0644 diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2 index 939a275f1b2e270a0d23a9c620175f3de71f31e4..343997ab4c656243c5ac50b693e142fe08e202e5 100644 --- a/software/slaprunner/instance-resilient.cfg.jinja2 +++ b/software/slaprunner/instance-resilient.cfg.jinja2 @@ -11,9 +11,9 @@ {% set number_of_instances = 2 %} {% endif %} {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%} -{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.node.vifib.com")} -%} +{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%} {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%} -{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.node.vifib.com') -%} +{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.app.officejs.com') -%} {% import 'parts' as parts %} {% import 'replicated' as replicated %} diff --git a/software/slaprunner/instance-runner-input-schema.json b/software/slaprunner/instance-runner-input-schema.json index 1c75c843fdef4d98af82b673785aebe809593ee7..81caf8d2849b2c4921e110639d3253da8730b9a5 100644 --- a/software/slaprunner/instance-runner-input-schema.json +++ b/software/slaprunner/instance-runner-input-schema.json @@ -103,13 +103,13 @@ "description": "Give Url of HTML web interface that will be used to render this monitor instance.", "type": "string", "format": "uri", - "default": "https://monitor.node.vifib.com" + "default": "https://monitor.app.officejs.com" }, "monitor-cors-domains": { "title": "Monitor CORS domains", "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.", "type": "string", - "default": "monitor.node.vifib.com" + "default": "monitor.app.officejs.com" }, "cpu-usage-ratio": { "title": "CPU Usage Ratio", diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index d78406005cdc29d5bc061f83f6d1360149820a51..8825d5d5dc7ba1b778907cfa36d46e0a17c7f0a4 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -478,7 +478,7 @@ monitor-url = $${publish:monitor-url} monitor-user = $${publish:monitor-user} monitor-password = $${publish:monitor-password} {% if not slapparameter_dict.get('authorized-key', '') -%} -{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%} +{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%} monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url} {% endif -%} #--------------------------- @@ -722,7 +722,7 @@ monitor-httpd-port = $${slap-parameter:monitor-port} {% if slapparameter_dict.get('name', '') -%} monitor-title = {{ slapparameter_dict['name'] }} {% endif -%} -cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }} +cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} {% if slapparameter_dict.get('monitor-username', '') -%} username = {{ slapparameter_dict['monitor-username'] }} {% endif -%}