XXX monitor-cors-domains

software/rapid-cdn/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 2dc6f1e1ad7ab7be4c8cd262e095ece5
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = 291f73c3782040d02fd56a46f61c201b
+md5sum = e5fbc52290c91345ecd4fd028fca6c86
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
@@ -130,7 +130,7 @@ md5sum = f6f2d12f17ce384c157152d906376fef
 
 [instance-frontend-input-schema]
 filename = instance-frontend-input-schema.json
-md5sum = ff4cc869771cd10f625fa5bf384bb5e3
+md5sum = 1743b6fa34963a5f1fbda2056a696c6b
 
 [instance-frontend-user-input-schema]
 filename = instance-frontend-user-input-schema.json
@@ -138,7 +138,7 @@ md5sum = 930a8b0e3c52ed1b766cc709bf61b645
 
 [instance-frontend-global-input-schema]
 filename = instance-frontend-global-input-schema.json
-md5sum = 7392c5fe6eecc490f9c5e777d446cc04
+md5sum = 3c54180cc1f4c8745b469cbcb710fc60
 
 [instance-input-schema]
 filename = instance-input-schema.json

software/rapid-cdn/instance-frontend-global-input-schema.json

@@ -116,6 +116,11 @@
           "title": "Legacy: Sent enable-http3 as string to outdated nodes",
           "type": "boolean"
         },
+        "monitor-cors-domains": {
+          "default": "monitor.app.officejs.com",
+          "title": "Monitor CORS Domains",
+          "type": "string"
+        },
         "rotate-num": {
           "default": 4000,
           "title": "Amount of daily log rotations",

software/rapid-cdn/instance-frontend-input-schema.json

@@ -29,10 +29,6 @@
       "type": "string",
       "title": "Domain"
     },
-    "monitor-cors-domain": {
-      "type": "string",
-      "title": "Monitor CORS Domain"
-    },
     "monitor-password": {
       "type": "string",
       "title": "Monitor password"

software/rapid-cdn/instance-master.cfg.in

@@ -282,7 +282,6 @@ return = slave-instance-information-list monitor-base-url backend-client-csr-url
 {#- BEGIN: Frontend node request #}
 {%- set DEFAULT_FRONTEND = {
         'domain': instance_parameter_dict['configuration'].get('domain', CLUSTER_DEFAULTS['domain']),
-        'monitor-cors-domain': instance_parameter_dict['configuration']['expert'].get('monitor-cors-domains', CLUSTER_DEFAULTS['expert']['monitor-cors-domains']),
         'monitor-username': '${monitor-instance-parameter:username}',
         'monitor-password': '${monitor-htpasswd:passwd}',
         'backend-client-caucase-url': CAUCASE_URL,
@@ -401,7 +400,7 @@ custom-group = instance-publish-slave-information:output
 [request-kedifa]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional.serialised
-config-monitor-cors-domains = {{ instance_parameter_dict['configuration'].get('monitor-cors-domains', 'monitor.app.officejs.com') }}
+config-monitor-cors-domains = {{ instance_parameter_dict['configuration'].get('monitor-cors-domains', CLUSTER_DEFAULTS['kedifa-node']['expert']['monitor-cors-domains']) }}
 config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 config-monitor-httpd-port = {{ dumps(instance_parameter_dict['configuration']['kedifa-node']['expert'].get('monitor-httpd-port', CLUSTER_DEFAULTS['kedifa-node']['expert']['monitor-httpd-port'])) }}