From 54ff69a8dec62e4972d51c1065899b00150e4391 Mon Sep 17 00:00:00 2001
From: Thomas Gambier <thomas.gambier@nexedi.com>
Date: Fri, 13 Sep 2024 09:50:41 +0200
Subject: [PATCH] default software_type is now 'default'
See merge request nexedi/slapos!1642
---
software/backupserver/buildout.hash.cfg | 2 +-
software/backupserver/instance.cfg.in | 2 +-
software/beremiz-ide/buildout.hash.cfg | 4 +-
.../instance-beremiz.cfg.jinja2.in | 1 -
software/beremiz-ide/instance.cfg.in | 1 -
software/caucase/buildout.hash.cfg | 2 +-
software/caucase/instance.cfg.jinja2 | 2 -
software/cloudooo/buildout.hash.cfg | 2 +-
software/cloudooo/instance.cfg.in | 1 -
.../instance-erp5-input-schema.json | 2 +-
software/erp5testnode/buildout.hash.cfg | 2 +-
software/erp5testnode/instance.cfg | 1 -
.../erp5testnode/testsuite/buildout.hash.cfg | 2 +-
.../erp5testnode/testsuite/instance.cfg.in | 1 -
software/fluentd/buildout.hash.cfg | 2 +-
software/fluentd/instance.cfg | 1 -
software/galene/buildout.hash.cfg | 2 +-
software/galene/instance.cfg.in | 1 -
software/gitlab/buildout.hash.cfg | 2 +-
software/gitlab/instance.cfg.in | 2 +-
software/headless-chromium/buildout.hash.cfg | 2 +-
software/headless-chromium/instance.cfg.in | 1 -
software/hellorina/instance.cfg.in | 2 -
software/hellorina/software.cfg | 2 +-
software/html5as-base/instance.cfg.in | 1 -
software/html5as-base/software.cfg | 2 +-
software/html5as/buildout.hash.cfg | 2 +-
software/html5as/instance.cfg.in | 1 -
.../htmlvalidatorserver/buildout.hash.cfg | 2 +-
software/htmlvalidatorserver/instance.cfg.in | 1 -
software/js-drone/buildout.hash.cfg | 2 +-
software/js-drone/instance.cfg.in | 1 -
software/jscrawler/buildout.hash.cfg | 2 +-
software/jscrawler/instance.cfg.in | 1 -
software/jupyter/buildout.hash.cfg | 4 +-
.../instance-jupyter-input-schema.json | 4 +-
software/jupyter/instance-jupyter.cfg.in | 4 +-
software/jupyter/instance.cfg.in | 1 -
software/kvm/README.rst | 2 +-
software/kvm/buildout.hash.cfg | 6 +-
.../instance-kvm-cluster-input-schema.json | 8 +-
.../kvm/instance-kvm-cluster.cfg.jinja2.in | 2 +-
software/kvm/instance-kvm-input-schema.json | 4 +-
software/kvm/instance-kvm.cfg.jinja2 | 4 +-
software/kvm/instance.cfg.in | 3 -
software/mail-server/buildout.hash.cfg | 2 +-
software/mail-server/instance.cfg.in | 1 -
software/monitor/buildout.hash.cfg | 2 +-
software/monitor/instance.cfg | 1 -
software/neoppod/buildout.hash.cfg | 2 +-
software/neoppod/instance.cfg.in | 2 -
software/ors-amarisoft/buildout.hash.cfg | 2 +-
software/ors-amarisoft/instance.cfg | 2 +-
software/peertube/buildout.hash.cfg | 2 +-
software/peertube/instance.cfg.in | 1 -
software/powerdns/buildout.hash.cfg | 4 +-
.../instance-powerdns-replicate.cfg.jinja2 | 2 +-
software/powerdns/instance.cfg | 5 +-
software/proftpd/buildout.hash.cfg | 2 +-
software/proftpd/instance.cfg.in | 2 -
software/rapid-cdn/README.rst | 8 +-
software/rapid-cdn/buildout.hash.cfg | 6 +-
software/rapid-cdn/instance-frontend.cfg.in | 1 -
software/rapid-cdn/instance-master.cfg.in | 1 -
software/rapid-cdn/instance.cfg.in | 3 +-
software/rapid-cdn/test/test.py | 2 +-
...luster_request_instance_parameter_dict.txt | 10 +-
...luster_request_instance_parameter_dict.txt | 132 +++++++++---------
...luster_request_instance_parameter_dict.txt | 2 +-
...luster_request_instance_parameter_dict.txt | 2 +-
...luster_request_instance_parameter_dict.txt | 2 +-
...luster_request_instance_parameter_dict.txt | 4 +-
...luster_request_instance_parameter_dict.txt | 4 +-
...luster_request_instance_parameter_dict.txt | 132 +++++++++---------
...luster_request_instance_parameter_dict.txt | 6 +-
...luster_request_instance_parameter_dict.txt | 22 +--
...luster_request_instance_parameter_dict.txt | 10 +-
...luster_request_instance_parameter_dict.txt | 132 +++++++++---------
...luster_request_instance_parameter_dict.txt | 26 ++--
...luster_request_instance_parameter_dict.txt | 4 +-
...luster_request_instance_parameter_dict.txt | 4 +-
software/re6stnet/buildout.hash.cfg | 2 +-
software/re6stnet/instance.cfg.in | 2 -
software/repman/buildout.hash.cfg | 4 +-
software/repman/instance-repman.cfg.jinja2.in | 1 -
software/repman/instance.cfg.in | 1 -
software/seleniumserver/buildout.hash.cfg | 2 +-
software/seleniumserver/instance.cfg.in | 1 -
software/slapos-master/buildout.hash.cfg | 2 +-
software/slapos-master/instance-erp5.cfg.in | 2 +-
software/theia/buildout.hash.cfg | 2 +-
software/theia/instance-input-schema.json | 4 +-
software/theia/instance.cfg.in | 5 +-
software/tsn-demo/buildout.hash.cfg | 2 +-
software/tsn-demo/instance.cfg | 1 -
software/turnserver/buildout.hash.cfg | 2 +-
software/turnserver/instance.cfg.in | 1 -
stack/erp5-zope2/buildout.hash.cfg | 4 +-
stack/erp5-zope2/instance-erp5.cfg.in | 2 +-
stack/erp5-zope2/instance.cfg.in | 2 -
stack/erp5/buildout.hash.cfg | 2 +-
stack/erp5/instance.cfg.in | 2 -
stack/lamp/buildout.hash.cfg | 2 +-
stack/lamp/instance.cfg.in | 1 -
stack/slapos.cfg | 4 +-
105 files changed, 327 insertions(+), 370 deletions(-)
diff --git a/software/backupserver/buildout.hash.cfg b/software/backupserver/buildout.hash.cfg
index 10aafa06b..181ff2ae3 100644
--- a/software/backupserver/buildout.hash.cfg
+++ b/software/backupserver/buildout.hash.cfg
@@ -50,4 +50,4 @@ md5sum = 931038cfa23216af1628b960a2e10de6
[template]
filename = instance.cfg.in
-md5sum = 974e21f30669e1b83e1e0cd8def0adc3
+md5sum = 87bbe16a03003ae4071caa507b560cfe
diff --git a/software/backupserver/instance.cfg.in b/software/backupserver/instance.cfg.in
index 818cc3e51..3d5ec20a1 100644
--- a/software/backupserver/instance.cfg.in
+++ b/software/backupserver/instance.cfg.in
@@ -19,7 +19,7 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:pullrdiffbackup}
+default = $${:pullrdiffbackup}
pullrdiffbackup = dynamic-template-pullrdiffbackup:output
[slap-configuration]
diff --git a/software/beremiz-ide/buildout.hash.cfg b/software/beremiz-ide/buildout.hash.cfg
index 05f3cbf99..f0086ebb3 100644
--- a/software/beremiz-ide/buildout.hash.cfg
+++ b/software/beremiz-ide/buildout.hash.cfg
@@ -15,11 +15,11 @@
[instance]
filename = instance.cfg.in
-md5sum = ed2bd38b78f2a66f474205249f6e6f2c
+md5sum = b38ba6283dc617e491cc594abb08551d
[template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in
-md5sum = 29c65611d51975e5bb2a1e2002a0a6c8
+md5sum = 218b95ed1290be788b7c67908dfcdc12
[template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in
diff --git a/software/beremiz-ide/instance-beremiz.cfg.jinja2.in b/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
index e8034566c..d93231d62 100644
--- a/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
+++ b/software/beremiz-ide/instance-beremiz.cfg.jinja2.in
@@ -261,7 +261,6 @@ config-url = https://[${nginx-params:ip}]:${nginx-params:port}
config-websocket-path-list = ${nginx-params:websocket-path}
return = secure_access domain
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-software-type = RootSoftwareInstance
name = Beremiz VNC
diff --git a/software/beremiz-ide/instance.cfg.in b/software/beremiz-ide/instance.cfg.in
index 8265a08a0..ba21cf3f1 100644
--- a/software/beremiz-ide/instance.cfg.in
+++ b/software/beremiz-ide/instance.cfg.in
@@ -7,7 +7,6 @@ develop-eggs-directory = {{ buildout_develop_directory }}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = template-{{ instance_template_type }}:output
-RootSoftwareInstance = ${:default}
test = template-beremiz-test:output
[slap-configuration]
diff --git a/software/caucase/buildout.hash.cfg b/software/caucase/buildout.hash.cfg
index f82080dec..b9de485e5 100644
--- a/software/caucase/buildout.hash.cfg
+++ b/software/caucase/buildout.hash.cfg
@@ -19,4 +19,4 @@ md5sum = 2e7c1d8c553b398dd68c875a9fa38cdb
[instance]
filename = instance.cfg.jinja2
-md5sum = b4a50217c68233eb0e2922fd7606a6be
+md5sum = d8dd5b68286c7ad38033866927a97d80
diff --git a/software/caucase/instance.cfg.jinja2 b/software/caucase/instance.cfg.jinja2
index affb6ef72..bc2cff5b1 100644
--- a/software/caucase/instance.cfg.jinja2
+++ b/software/caucase/instance.cfg.jinja2
@@ -32,5 +32,3 @@ import-list =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = caucased:output
-# XXX: When will this name finally go away ?
-RootSoftwareInstance = ${:default}
diff --git a/software/cloudooo/buildout.hash.cfg b/software/cloudooo/buildout.hash.cfg
index f637d2d76..674903db0 100644
--- a/software/cloudooo/buildout.hash.cfg
+++ b/software/cloudooo/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template-cloudooo]
filename = instance.cfg.in
-md5sum = d1e4d7306c39f2ebc64d0407860d4301
+md5sum = 6f18a040f44d800dc43a8955f1f4f5b4
[template-cloudooo-instance]
filename = instance-cloudooo.cfg.in
diff --git a/software/cloudooo/instance.cfg.in b/software/cloudooo/instance.cfg.in
index ea8c60bcd..687a44c37 100644
--- a/software/cloudooo/instance.cfg.in
+++ b/software/cloudooo/instance.cfg.in
@@ -44,4 +44,3 @@ extra-context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = cloudooo-dynamic-template:output
-RootSoftwareInstance = ${:default}
diff --git a/software/erp5-zope2/instance-erp5-input-schema.json b/software/erp5-zope2/instance-erp5-input-schema.json
index 5c7ca176d..e99297aa9 100644
--- a/software/erp5-zope2/instance-erp5-input-schema.json
+++ b/software/erp5-zope2/instance-erp5-input-schema.json
@@ -170,7 +170,7 @@
},
"software-type": {
"description": "Request a front-end slave instance of this software type.",
- "default": "RootSoftwareInstance",
+ "default": "default",
"type": "string"
},
"virtualhostroot-http-port": {
diff --git a/software/erp5testnode/buildout.hash.cfg b/software/erp5testnode/buildout.hash.cfg
index 5b01771bc..5fca3e57e 100644
--- a/software/erp5testnode/buildout.hash.cfg
+++ b/software/erp5testnode/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
-md5sum = 06b0acece285ecbc0e746fa267a374b6
+md5sum = e0737eb3d0ddcf017d7284a98cd6cde1
[template-default]
filename = instance-default.cfg.jinja.in
diff --git a/software/erp5testnode/instance.cfg b/software/erp5testnode/instance.cfg
index 342ebcb39..db02d7fc5 100644
--- a/software/erp5testnode/instance.cfg
+++ b/software/erp5testnode/instance.cfg
@@ -16,7 +16,6 @@ cert = $${slap-connection:cert-file}
[switch_softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:default}
default = instance-default:output
[instance-default]
diff --git a/software/erp5testnode/testsuite/buildout.hash.cfg b/software/erp5testnode/testsuite/buildout.hash.cfg
index 0d64fba11..fa539435e 100644
--- a/software/erp5testnode/testsuite/buildout.hash.cfg
+++ b/software/erp5testnode/testsuite/buildout.hash.cfg
@@ -15,7 +15,7 @@
[template-erp5testnode]
filename = instance.cfg.in
-md5sum = 681f4159e4ac2542d0fbc7a894e43d79
+md5sum = 4cbd3b3b34267dea1016d951f46b8eb4
[template-resilient-test]
filename = instance-kvm-resilient-test.cfg.jinja2
diff --git a/software/erp5testnode/testsuite/instance.cfg.in b/software/erp5testnode/testsuite/instance.cfg.in
index ade174b49..a935b135a 100644
--- a/software/erp5testnode/testsuite/instance.cfg.in
+++ b/software/erp5testnode/testsuite/instance.cfg.in
@@ -3,7 +3,6 @@ extends = ${template:output}
[switch_softwaretype]
default = $${:test}
-RootSoftwareInstance = $${:test}
# Used for the test of resiliency. The system wants a "test" software_type.
test = dynamic-template-resilient-test:output
diff --git a/software/fluentd/buildout.hash.cfg b/software/fluentd/buildout.hash.cfg
index 78364574b..19d6f0ad1 100644
--- a/software/fluentd/buildout.hash.cfg
+++ b/software/fluentd/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[instance-profile]
filename = instance.cfg
-md5sum = 1fe38a024766347454ad7a3d9fb52d01
+md5sum = a88ac58fc22e804a176e4d43f917179e
[template-fluentd]
filename = instance-fluentd.cfg
diff --git a/software/fluentd/instance.cfg b/software/fluentd/instance.cfg
index 1569c3b64..d6cb44e46 100644
--- a/software/fluentd/instance.cfg
+++ b/software/fluentd/instance.cfg
@@ -9,7 +9,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-fluentd:output
-RootSoftwareInstance = $${:default}
[directory]
recipe = slapos.cookbook:mkdirectory
diff --git a/software/galene/buildout.hash.cfg b/software/galene/buildout.hash.cfg
index 9abc0da17..eae535dae 100644
--- a/software/galene/buildout.hash.cfg
+++ b/software/galene/buildout.hash.cfg
@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
-md5sum = 1747b8cda8d815055453420de4ed677f
+md5sum = 0d6db8da45bbdf311f9c6a2f916045a2
[template-default]
filename = instance-default.cfg.in
diff --git a/software/galene/instance.cfg.in b/software/galene/instance.cfg.in
index e04d860e7..7cb301ab9 100644
--- a/software/galene/instance.cfg.in
+++ b/software/galene/instance.cfg.in
@@ -17,7 +17,6 @@ cert = $${slap-connection:cert-file}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-default:output
-RootSoftwareInstance = $${:default}
[dynamic-template-default]
recipe = slapos.recipe.template:jinja2
diff --git a/software/gitlab/buildout.hash.cfg b/software/gitlab/buildout.hash.cfg
index 4247f7034..86b354c0a 100644
--- a/software/gitlab/buildout.hash.cfg
+++ b/software/gitlab/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
-md5sum = 956ae53af22b551fbb087415e835868b
+md5sum = 3ffdd78aeb77ab581c51ce419176dd37
[watcher]
_update_hash_filename_ = watcher.in
diff --git a/software/gitlab/instance.cfg.in b/software/gitlab/instance.cfg.in
index 1b362744d..6f7185d6c 100644
--- a/software/gitlab/instance.cfg.in
+++ b/software/gitlab/instance.cfg.in
@@ -15,7 +15,7 @@ offline = true
recipe = slapos.cookbook:switch-softwaretype
gitlab = instance-gitlab.cfg:output
gitlab-export = instance-gitlab-export.cfg:output
-RootSoftwareInstance = $${:gitlab}
+default = $${:gitlab}
# TODO -import, -pull-backup
diff --git a/software/headless-chromium/buildout.hash.cfg b/software/headless-chromium/buildout.hash.cfg
index b93e00dbc..d2dc5355a 100644
--- a/software/headless-chromium/buildout.hash.cfg
+++ b/software/headless-chromium/buildout.hash.cfg
@@ -1,6 +1,6 @@
[template-cfg]
filename = instance.cfg.in
-md5sum = c6cdcee1e16dd4bd3bc462d286dcb999
+md5sum = 25973164baf2304012beb37ecbc082cb
[instance-headless-chromium]
_update_hash_filename_ = instance-headless-chromium.cfg.in
diff --git a/software/headless-chromium/instance.cfg.in b/software/headless-chromium/instance.cfg.in
index a0a5b1732..d766adfd6 100644
--- a/software/headless-chromium/instance.cfg.in
+++ b/software/headless-chromium/instance.cfg.in
@@ -44,7 +44,6 @@ default-parameters =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = ${:default}
default = instance-headless-chromium:output
[slap-configuration]
diff --git a/software/hellorina/instance.cfg.in b/software/hellorina/instance.cfg.in
index 094c02048..37d7f9547 100644
--- a/software/hellorina/instance.cfg.in
+++ b/software/hellorina/instance.cfg.in
@@ -40,6 +40,4 @@ extra-context =
recipe = slapos.cookbook:switch-softwaretype
override = {{ dumps(override_switch_softwaretype |default) }}
default = root:output
-# BBB
-RootSoftwareInstance = ${:default}
server = server:output
diff --git a/software/hellorina/software.cfg b/software/hellorina/software.cfg
index 758a6cf55..ff0cad866 100644
--- a/software/hellorina/software.cfg
+++ b/software/hellorina/software.cfg
@@ -21,7 +21,7 @@ environment +=
[template]
recipe = slapos.recipe.template:jinja2
url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 2e90443314d2036f7077898ab49bfec1
+md5sum = 9d9edfa05d3a60297ae0e2ec8a6054ab
# XXX: "template.cfg" is hardcoded in instanciation recipe
output = ${buildout:directory}/template.cfg
context =
diff --git a/software/html5as-base/instance.cfg.in b/software/html5as-base/instance.cfg.in
index 9cc56e058..3d65a3aca 100644
--- a/software/html5as-base/instance.cfg.in
+++ b/software/html5as-base/instance.cfg.in
@@ -26,7 +26,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = ${:default}
default = instance-html5as:output
[slap-configuration]
diff --git a/software/html5as-base/software.cfg b/software/html5as-base/software.cfg
index c1dbd5795..e4e981b0c 100644
--- a/software/html5as-base/software.cfg
+++ b/software/html5as-base/software.cfg
@@ -27,7 +27,7 @@ recipe = slapos.recipe.template:jinja2
output = ${buildout:directory}/template.cfg
url = ${:_profile_base_location_}/${:filename}
filename = instance.cfg.in
-md5sum = 861e7ce5d65252067d31c7325c97917d
+md5sum = feadf0e0bee6d5b4182c2e016c6e183f
context =
section buildout buildout
key nginx_location nginx:location
diff --git a/software/html5as/buildout.hash.cfg b/software/html5as/buildout.hash.cfg
index 88024f337..a09276b63 100644
--- a/software/html5as/buildout.hash.cfg
+++ b/software/html5as/buildout.hash.cfg
@@ -17,7 +17,7 @@
[template-cfg]
filename = instance.cfg.in
-md5sum = 23c15a579b66cef866b30a2f53b1b737
+md5sum = 2c21a4063087b6a24677dec61b08865d
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
diff --git a/software/html5as/instance.cfg.in b/software/html5as/instance.cfg.in
index f5eaffad0..62bfc857f 100644
--- a/software/html5as/instance.cfg.in
+++ b/software/html5as/instance.cfg.in
@@ -56,7 +56,6 @@ default-parameters =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = ${:default}
default = instance-html5as:output
replicate = instance-replicate:output
diff --git a/software/htmlvalidatorserver/buildout.hash.cfg b/software/htmlvalidatorserver/buildout.hash.cfg
index 4b2525e98..35cb4f508 100644
--- a/software/htmlvalidatorserver/buildout.hash.cfg
+++ b/software/htmlvalidatorserver/buildout.hash.cfg
@@ -26,4 +26,4 @@ md5sum = 3733c484371115831721341f9b65dc0f
[template]
filename = instance.cfg.in
-md5sum = c86d4c6b5cc67139810399b1032c3410
+md5sum = 1f337ae300eca111078015a6d61d5972
diff --git a/software/htmlvalidatorserver/instance.cfg.in b/software/htmlvalidatorserver/instance.cfg.in
index 61182ec7f..0ff78bd7f 100644
--- a/software/htmlvalidatorserver/instance.cfg.in
+++ b/software/htmlvalidatorserver/instance.cfg.in
@@ -17,7 +17,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:validator}
default = $${:validator}
validator = dynamic-template-validator:output
diff --git a/software/js-drone/buildout.hash.cfg b/software/js-drone/buildout.hash.cfg
index d603e86ea..8cb95a0a7 100644
--- a/software/js-drone/buildout.hash.cfg
+++ b/software/js-drone/buildout.hash.cfg
@@ -22,7 +22,7 @@ md5sum = 01425a1c77e79788e1948398b9136724
[instance-profile]
filename = instance.cfg.in
-md5sum = 4733c63573e6812c124b356dc146ffcc
+md5sum = aa1d52767514868421fecd5bad073277
[instance-root]
filename = instance-root.cfg.jinja2
diff --git a/software/js-drone/instance.cfg.in b/software/js-drone/instance.cfg.in
index a147e5417..7e3dffb95 100644
--- a/software/js-drone/instance.cfg.in
+++ b/software/js-drone/instance.cfg.in
@@ -8,7 +8,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:default}
default = instance-root:output
[slap-configuration]
diff --git a/software/jscrawler/buildout.hash.cfg b/software/jscrawler/buildout.hash.cfg
index 61698a94f..b4fe028d0 100644
--- a/software/jscrawler/buildout.hash.cfg
+++ b/software/jscrawler/buildout.hash.cfg
@@ -15,7 +15,7 @@
[instance]
filename = instance.cfg.in
-md5sum = 7333d1dfd4e8e4c375f7f1748292f554
+md5sum = d9cf0d7b7db532106239cfef4ca19ac6
[template-jscrawler]
filename = instance-jscrawler.cfg.jinja2.in
diff --git a/software/jscrawler/instance.cfg.in b/software/jscrawler/instance.cfg.in
index 8d2cb79da..a7f5f7231 100644
--- a/software/jscrawler/instance.cfg.in
+++ b/software/jscrawler/instance.cfg.in
@@ -10,7 +10,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-jscrawler:output
-RootSoftwareInstance = ${:default}
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
diff --git a/software/jupyter/buildout.hash.cfg b/software/jupyter/buildout.hash.cfg
index 06e7af75c..851022af2 100644
--- a/software/jupyter/buildout.hash.cfg
+++ b/software/jupyter/buildout.hash.cfg
@@ -15,11 +15,11 @@
[instance]
filename = instance.cfg.in
-md5sum = 5f39952f94095b1f12f41db76867e71e
+md5sum = f533ac0c5afd01244c25a0d8b26f6e20
[instance-jupyter]
filename = instance-jupyter.cfg.in
-md5sum = 1812fa797b9eb687a634ebe96134b504
+md5sum = b781ee4c01f3ce0520d70256743acb59
[jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja
diff --git a/software/jupyter/instance-jupyter-input-schema.json b/software/jupyter/instance-jupyter-input-schema.json
index ba0c9f06f..02a293bcc 100644
--- a/software/jupyter/instance-jupyter-input-schema.json
+++ b/software/jupyter/instance-jupyter-input-schema.json
@@ -12,7 +12,7 @@
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"frontend-software-url": {
"title": "Frontend Software URL",
@@ -30,7 +30,7 @@
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"frontend-additional-software-url": {
"title": "Additional Frontend Software URL",
diff --git a/software/jupyter/instance-jupyter.cfg.in b/software/jupyter/instance-jupyter.cfg.in
index 5f6396644..d58156491 100644
--- a/software/jupyter/instance-jupyter.cfg.in
+++ b/software/jupyter/instance-jupyter.cfg.in
@@ -42,11 +42,11 @@ logfile = ${directory:log}/jupyter_notebook.log
notebook_dir = ${directory:notebook_dir}
[slap-parameter]
-frontend-software-type = RootSoftwareInstance
+frontend-software-type = default
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-instance-guid =
frontend-instance-name = Jupyter Frontend
-frontend-additional-software-type = RootSoftwareInstance
+frontend-additional-software-type = default
frontend-additional-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-additional-instance-guid =
frontend-additional-instance-name = Jupyter Frontend Additional
diff --git a/software/jupyter/instance.cfg.in b/software/jupyter/instance.cfg.in
index 6268b9de5..382eeec1d 100644
--- a/software/jupyter/instance.cfg.in
+++ b/software/jupyter/instance.cfg.in
@@ -9,7 +9,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
recipe = slapos.cookbook:switch-softwaretype
default = $${:jupyter}
jupyter = instance-jupyter:output
-RootSoftwareInstance = $${:default}
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised
diff --git a/software/kvm/README.rst b/software/kvm/README.rst
index 866f521e6..072f47e3e 100644
--- a/software/kvm/README.rst
+++ b/software/kvm/README.rst
@@ -33,7 +33,7 @@ See the instance-kvm-input-schema.json file for more instance parameters (cpu-co
KVM instance parameters:
~~~~~~~~~~~~~~~~~~~~~~~~~
-- frontend-software-type (default: RootSoftwareInstance)
+- frontend-software-type (default: default)
- frontend-software-url (default: http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg)
- frontend-instance-guid
- frontend-addtional-instance-guid
diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg
index 25aee9122..425d99733 100644
--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -15,15 +15,15 @@
[template]
filename = instance.cfg.in
-md5sum = b6204319cca4264b3c351d4dd1f2b5d0
+md5sum = ee1fe10d8db4d3c39e3a3f1b53d12883
[template-kvm]
filename = instance-kvm.cfg.jinja2
-md5sum = 4ae98a072354efbdd7440d800cc675c8
+md5sum = 9916c160b1c9711145d7e10506a9fca8
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 15415f63741dc8c478512f9e410bb0ae
+md5sum = 6e6f6748ec466eb49a4f872aec7563fa
[template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2
diff --git a/software/kvm/instance-kvm-cluster-input-schema.json b/software/kvm/instance-kvm-cluster-input-schema.json
index a6da6d83d..ce511f86b 100644
--- a/software/kvm/instance-kvm-cluster-input-schema.json
+++ b/software/kvm/instance-kvm-cluster-input-schema.json
@@ -14,9 +14,9 @@
},
"frontend-software-type": {
"title": "Frontend Software Type",
- "description": "Type of the frontend instance, like \"RootSoftwareInstance\".",
+ "description": "Type of the frontend instance, like \"default\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"frontend-software-url": {
"title": "Frontend Software URL",
@@ -32,9 +32,9 @@
},
"frontend-additional-software-type": {
"title": "Additional Frontend Software Type",
- "description": "Type of the frontend instance, like \"RootSoftwareInstance\".",
+ "description": "Type of the frontend instance, like \"default\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"frontend-additional-software-url": {
"title": "Additional Frontend Software URL",
diff --git a/software/kvm/instance-kvm-cluster.cfg.jinja2.in b/software/kvm/instance-kvm-cluster.cfg.jinja2.in
index c76edea50..ba5f6aed1 100644
--- a/software/kvm/instance-kvm-cluster.cfg.jinja2.in
+++ b/software/kvm/instance-kvm-cluster.cfg.jinja2.in
@@ -7,7 +7,7 @@
{% set slave_frontend_stype = slave_frontend_dict.get('software-type', 'custom-personal') -%}
{% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
{% set WEBSOCKET_FRONTEND_DEFAULT_SR = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg' %}
-{% set WEBSOCKET_FRONTEND_DEFAULT_ST = 'RootSoftwareInstance' %}
+{% set WEBSOCKET_FRONTEND_DEFAULT_ST = 'default' %}
{% set kvm_instance_dict = {} -%}
{% set kvm_hostname_list = [] -%}
{% set monitor_base_url_dict = {} -%}
diff --git a/software/kvm/instance-kvm-input-schema.json b/software/kvm/instance-kvm-input-schema.json
index a8781efc7..6f2fcdb32 100644
--- a/software/kvm/instance-kvm-input-schema.json
+++ b/software/kvm/instance-kvm-input-schema.json
@@ -285,7 +285,7 @@
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"frontend-software-url": {
"title": "Frontend Software URL",
@@ -303,7 +303,7 @@
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"frontend-additional-software-url": {
"title": "Additional Frontend Software URL",
diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2
index 75a1ff46b..3b4a0d214 100644
--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -1077,11 +1077,11 @@ log = ${directory:public}/ansible/vm-bootstrap.log
[slap-parameter]
# Default values if not specified
-frontend-software-type = RootSoftwareInstance
+frontend-software-type = default
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-instance-guid =
frontend-instance-name = VNC Real Frontend
-frontend-additional-software-type = RootSoftwareInstance
+frontend-additional-software-type = default
frontend-additional-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-additional-instance-guid =
frontend-additional-instance-name = VNC Real Frontend Additional
diff --git a/software/kvm/instance.cfg.in b/software/kvm/instance.cfg.in
index 77753df4c..9c84add35 100644
--- a/software/kvm/instance.cfg.in
+++ b/software/kvm/instance.cfg.in
@@ -21,9 +21,6 @@ kvm-export = dynamic-template-kvm-export:output
frozen = instance-frozen:output
pull-backup = template-pull-backup:output
-# BBB
-RootSoftwareInstance = $${:default}
-
# XXX - If this configuration is not generated by slapgrid, use empty values
[storage-configuration]
storage-home =
diff --git a/software/mail-server/buildout.hash.cfg b/software/mail-server/buildout.hash.cfg
index da97b6474..4ca8b8df7 100644
--- a/software/mail-server/buildout.hash.cfg
+++ b/software/mail-server/buildout.hash.cfg
@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
-md5sum = 7ab3b606972e1b338d28fc1374617835
+md5sum = 403a4a362b2ffec05f8d0b591bab92fa
[template-default]
_update_hash_filename_ = instance-default.cfg.in
diff --git a/software/mail-server/instance.cfg.in b/software/mail-server/instance.cfg.in
index a280cc201..0e24f3e2b 100644
--- a/software/mail-server/instance.cfg.in
+++ b/software/mail-server/instance.cfg.in
@@ -43,4 +43,3 @@ cert = $${slap-connection:cert-file}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-default:output
-RootSoftwareInstance = $${:default}
diff --git a/software/monitor/buildout.hash.cfg b/software/monitor/buildout.hash.cfg
index 8e6ebf211..c368337bb 100644
--- a/software/monitor/buildout.hash.cfg
+++ b/software/monitor/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
-md5sum = cfb3bf67b11e5b1278d94f7e729d740c
+md5sum = 7a218919e2601fd4b4e534dbce0703a6
[json-test-template]
_update_hash_filename_ = json-test-template.json.in.jinja2
diff --git a/software/monitor/instance.cfg b/software/monitor/instance.cfg
index d8347e4b6..525efc048 100644
--- a/software/monitor/instance.cfg
+++ b/software/monitor/instance.cfg
@@ -9,7 +9,6 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
recipe = slapos.cookbook:switch-softwaretype
default = instance-node-monitoring:output
edgetest-basic = instance-edgetest-basic:output
-RootSoftwareInstance = $${:default}
[instance-template]
recipe = slapos.recipe.template:jinja2
diff --git a/software/neoppod/buildout.hash.cfg b/software/neoppod/buildout.hash.cfg
index dbd78e1d4..8df2e3a11 100644
--- a/software/neoppod/buildout.hash.cfg
+++ b/software/neoppod/buildout.hash.cfg
@@ -38,7 +38,7 @@ md5sum = 3ae93702f3890a504cc8a93eb5ad52bc
[template-neo]
filename = instance.cfg.in
-md5sum = 78c46af020ebd0ff25a1b474a119695f
+md5sum = ab0ad72d2df7ffe049921a7ca6725349
[cluster]
filename = cluster.cfg.in
diff --git a/software/neoppod/instance.cfg.in b/software/neoppod/instance.cfg.in
index 5c572213f..9961b710f 100644
--- a/software/neoppod/instance.cfg.in
+++ b/software/neoppod/instance.cfg.in
@@ -23,6 +23,4 @@ extra-context +=
recipe = slapos.cookbook:switch-softwaretype
override = {{ dumps(override_switch_softwaretype |default) }}
default = neo-cluster:output
-# BBB
-RootSoftwareInstance = ${:default}
neo = neo:output
diff --git a/software/ors-amarisoft/buildout.hash.cfg b/software/ors-amarisoft/buildout.hash.cfg
index f1dc5e264..ab977bc0b 100644
--- a/software/ors-amarisoft/buildout.hash.cfg
+++ b/software/ors-amarisoft/buildout.hash.cfg
@@ -16,7 +16,7 @@
[template]
filename = instance.cfg
-md5sum = f096f3cbb414730a9f0d46b0c0f5eb22
+md5sum = 711d90973a5cfb2f61d3a3a53c07c64c
[template-ors]
filename = instance-ors.cfg
diff --git a/software/ors-amarisoft/instance.cfg b/software/ors-amarisoft/instance.cfg
index 5289b5ea1..5e23b9ea6 100644
--- a/software/ors-amarisoft/instance.cfg
+++ b/software/ors-amarisoft/instance.cfg
@@ -132,10 +132,10 @@ init =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
+# we don't select default software type to force user to choose the correct one
enb = dynamic-template-enb:output
core-network = dynamic-template-core-network:output
ue = dynamic-template-ue:output
-RootSoftwareInstance = $${:core-network}
[dynamic-template-enb]
< = jinja2-template-base
diff --git a/software/peertube/buildout.hash.cfg b/software/peertube/buildout.hash.cfg
index d55f7ef47..440590272 100644
--- a/software/peertube/buildout.hash.cfg
+++ b/software/peertube/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[instance-profile]
filename = instance.cfg.in
-md5sum = 145c7c84802ca0e3ee16ada31bde04b6
+md5sum = 6bacd625936eed07a6025fd5be92614f
[instance-peertube]
_update_hash_filename_ = instance-peertube.cfg.in
diff --git a/software/peertube/instance.cfg.in b/software/peertube/instance.cfg.in
index 5ddab8d34..70a4716b1 100644
--- a/software/peertube/instance.cfg.in
+++ b/software/peertube/instance.cfg.in
@@ -35,7 +35,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:default}
default = peertube:output
[slap-configuration]
diff --git a/software/powerdns/buildout.hash.cfg b/software/powerdns/buildout.hash.cfg
index 5c592f1f5..ad209759c 100644
--- a/software/powerdns/buildout.hash.cfg
+++ b/software/powerdns/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
-md5sum = 2f812f4814a0cc78a8b96d8014ac3104
+md5sum = 6d9e7375732706593fabe2b3629dc699
[template-powerdns]
filename = instance-powerdns.cfg
@@ -26,7 +26,7 @@ md5sum = 851353e1d4dd562ace58b3345c2da515
[template-dns-replicate]
_update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = f0a127e858f49beff4a5fcd2e71c088d
+md5sum = 4e9d75ae82ccca107b0903033b2095f2
[iso-list]
_update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
diff --git a/software/powerdns/instance-powerdns-replicate.cfg.jinja2 b/software/powerdns/instance-powerdns-replicate.cfg.jinja2
index cc933ab6f..fe12fbdba 100644
--- a/software/powerdns/instance-powerdns-replicate.cfg.jinja2
+++ b/software/powerdns/instance-powerdns-replicate.cfg.jinja2
@@ -15,7 +15,7 @@ context =
{% set part_list = [] -%}
{% set monitor_url_list = [] -%}
{% set single_type_key = 'single-' %}
-{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
+{% if slap_software_type in ("replicate", "default", "RootSoftwareInstance") %}
{% set dns_type = slapparameter_dict.pop('-dns-type', 'single-default') -%}
{% else -%}
{% set dns_type = "%s%s" % (single_type_key, slap_software_type) -%}
diff --git a/software/powerdns/instance.cfg b/software/powerdns/instance.cfg
index 3b7d6d850..37ca21200 100644
--- a/software/powerdns/instance.cfg
+++ b/software/powerdns/instance.cfg
@@ -12,9 +12,6 @@ recipe = slapos.cookbook:switch-softwaretype
default = dynamic-powerdns-replicate:output
single-default = dynamic-template-powerdns:output
-# BBB
-RootSoftwareInstance = $${:default}
-
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
output = $${buildout:directory}/$${:filename}
@@ -44,6 +41,8 @@ filename = instance-powerdns-replicate.cfg
extensions = jinja2.ext.do
extra-context =
# Must match the key id in [switch-softwaretype] which uses this section.
+# Keep RootSoftwareInstance for backward compatibility until we are sure all
+# instances have software_type default
raw software_type RootSoftwareInstance-default
raw template_monitor ${monitor2-template:output}
diff --git a/software/proftpd/buildout.hash.cfg b/software/proftpd/buildout.hash.cfg
index f45aeb595..14d9368c8 100644
--- a/software/proftpd/buildout.hash.cfg
+++ b/software/proftpd/buildout.hash.cfg
@@ -15,7 +15,7 @@
[instance-profile]
filename = instance.cfg.in
-md5sum = 7f9749ab75475bd5d98be27a570c7731
+md5sum = 8713d8a8d3f83bda2b6e825e9a4e5f56
[instance-default]
filename = instance-default.cfg.in
diff --git a/software/proftpd/instance.cfg.in b/software/proftpd/instance.cfg.in
index a3b3c3c01..91cad4112 100644
--- a/software/proftpd/instance.cfg.in
+++ b/software/proftpd/instance.cfg.in
@@ -34,5 +34,3 @@ recipe = slapos.cookbook:switch-softwaretype
# XXX Jerome: what is this override for ?
override = {{ dumps(override_switch_softwaretype |default) }}
default = instance-default:output
-# BBB
-RootSoftwareInstance = ${:default}
diff --git a/software/rapid-cdn/README.rst b/software/rapid-cdn/README.rst
index e0b37499e..c5ecabde5 100644
--- a/software/rapid-cdn/README.rst
+++ b/software/rapid-cdn/README.rst
@@ -239,7 +239,7 @@ redirected and accessible from the proxy::
instance = request(
software_release=rapid_cdn,
- software_type="RootSoftwareInstance",
+ software_type="default",
partition_reference='my frontend',
shared=True,
partition_parameter_kw={
@@ -257,7 +257,7 @@ proxy::
instance = request(
software_release=rapid_cdn,
- software_type="RootSoftwareInstance",
+ software_type="default",
partition_reference='my frontend',
shared=True,
partition_parameter_kw={
@@ -277,7 +277,7 @@ the proxy::
instance = request(
software_release=rapid_cdn,
- software_type="RootSoftwareInstance",
+ software_type="default",
partition_reference='my frontend',
shared=True,
partition_parameter_kw={
@@ -296,7 +296,7 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be::
instance = request(
software_release=rapid_cdn,
- software_type="RootSoftwareInstance",
+ software_type="default",
partition_reference='my frontend',
shared=True,
software_type="custom-personal",
diff --git a/software/rapid-cdn/buildout.hash.cfg b/software/rapid-cdn/buildout.hash.cfg
index 97f5d48b9..9804d2ae8 100644
--- a/software/rapid-cdn/buildout.hash.cfg
+++ b/software/rapid-cdn/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg.in
-md5sum = bbeb179b698975c1a88ea7604df6740e
+md5sum = 1714aa40cffc3b26b672e534ef90894b
[profile-common]
filename = instance-common.cfg.in
@@ -22,11 +22,11 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend]
filename = instance-frontend.cfg.in
-md5sum = af6c2d8dfa36c9012c6ef905689972ff
+md5sum = 081aef1b071585e5f334a93d6d4969d0
[profile-master]
filename = instance-master.cfg.in
-md5sum = 934b7f5e8d470e18bc980942bf467ada
+md5sum = 5ded3544de312750d0ae06fdb3a436c9
[profile-slave-list]
filename = instance-slave-list.cfg.in
diff --git a/software/rapid-cdn/instance-frontend.cfg.in b/software/rapid-cdn/instance-frontend.cfg.in
index e6023949d..1f5c01803 100644
--- a/software/rapid-cdn/instance-frontend.cfg.in
+++ b/software/rapid-cdn/instance-frontend.cfg.in
@@ -185,7 +185,6 @@ slave-introspection-var = ${:var}/slave-introspection
[switch-frontend-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-custom-personal-profile-slave-list:output
-RootSoftwareInstance = ${:default}
single-default = dynamic-custom-personal-profile-slave-list:output
single-custom-personal = dynamic-custom-personal-profile-slave-list:output
diff --git a/software/rapid-cdn/instance-master.cfg.in b/software/rapid-cdn/instance-master.cfg.in
index a0fbecc9b..1efb326bf 100644
--- a/software/rapid-cdn/instance-master.cfg.in
+++ b/software/rapid-cdn/instance-master.cfg.in
@@ -509,7 +509,6 @@ config-url =
[publish-slave-information]
recipe = slapos.cookbook:switch-softwaretype
default = instance-publish-slave-information:output
-RootSoftwareInstance = ${:default}
replicate = instance-publish-slave-information:output
custom-personal = instance-publish-slave-information:output
custom-group = instance-publish-slave-information:output
diff --git a/software/rapid-cdn/instance.cfg.in b/software/rapid-cdn/instance.cfg.in
index 4c2b20897..9d89b95ad 100644
--- a/software/rapid-cdn/instance.cfg.in
+++ b/software/rapid-cdn/instance.cfg.in
@@ -26,7 +26,6 @@ import-list =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-profile-master:output
-RootSoftwareInstance = ${:default}
custom-personal = dynamic-profile-master:output
single-default = dynamic-profile-frontend:output
single-custom-personal = dynamic-profile-frontend:output
@@ -58,6 +57,8 @@ extra-context =
import validators validators
import software software
# Must match the key id in [switch-softwaretype] which uses this section.
+# Keep RootSoftwareInstance for backward compatibility until all instances have
+# changed their software_type to default
raw software_type RootSoftwareInstance-default-custom-personal-replicate
[dynamic-profile-kedifa]
diff --git a/software/rapid-cdn/test/test.py b/software/rapid-cdn/test/test.py
index 8ff704ab0..81e453e45 100644
--- a/software/rapid-cdn/test/test.py
+++ b/software/rapid-cdn/test/test.py
@@ -6940,7 +6940,7 @@ class TestPassedRequestParameter(HttpFrontendTestCase):
'slap_computer_id': 'local',
'slap_computer_partition_id': 'T-0',
'slap_software_release_url': base_software_url,
- 'slap_software_type': 'RootSoftwareInstance',
+ 'slap_software_type': 'default',
'slave_instance_list': []
}
}
diff --git a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt
index 5e42b9bd7..6190b52bd 100644
--- a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt
@@ -11,28 +11,28 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-default",
"slave_title": "_enable-http2-default"
},
{
"enable-http2": "false",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-false",
"slave_title": "_enable-http2-false"
},
{
"enable-http2": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-true",
"slave_title": "_enable-http2-true"
},
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_dummy-cached",
"slave_title": "_dummy-cached",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt
index 1a50a6538..fb7babdff 100644
--- a/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt
@@ -13,56 +13,56 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_Url",
"slave_title": "_Url",
"url": " http://@@_ipv4_address@@:@@_server_http_port@@//?a=b&c= "
},
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend",
"slave_title": "_auth-to-backend",
"url": "https://@@_ipv4_address@@:@@_server_https_auth_port@@/"
},
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend-backend-ignore",
"slave_title": "_auth-to-backend-backend-ignore",
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend-not-configured",
"slave_title": "_auth-to-backend-not-configured",
"url": "https://@@_ipv4_address@@:@@_server_https_auth_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_bad-backend",
"slave_title": "_bad-backend",
"url": "http://bad.backend/"
},
{
"ciphers": "RSA-3DES-EDE-CBC-SHA RSA-AES128-CBC-SHA",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ciphers",
"slave_title": "_ciphers"
},
{
"ciphers": "ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256 ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-AES256-CBC-SHA ECDHE-RSA-AES128-CBC-SHA ECDHE-ECDSA-AES256-CBC-SHA ECDHE-ECDSA-AES128-CBC-SHA RSA-AES256-CBC-SHA RSA-AES128-CBC-SHA ECDHE-RSA-3DES-EDE-CBC-SHA RSA-3DES-EDE-CBC-SHA",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ciphers-translation-all",
"slave_title": "_ciphers-translation-all"
},
{
"custom_domain": "mycustomdomain.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain",
"slave_title": "_custom_domain",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -70,94 +70,94 @@
{
"custom_domain": "mycustomdomainserveralias.example.com",
"server-alias": "mycustomdomainserveralias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_server_alias",
"slave_title": "_custom_domain_server_alias",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "customdomainsslcrtsslkey.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key",
"slave_title": "_custom_domain_ssl_crt_ssl_key",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "customdomainsslcrtsslkeysslcacrt.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"slave_title": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "*.customdomain.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_wildcard",
"slave_title": "_custom_domain_wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"disabled-cookie-list": "Coconut Chocolate Vanilia",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_disabled-cookie-list",
"slave_title": "_disabled-cookie-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"disabled-cookie-list": "Chocolate",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_disabled-cookie-list-simple",
"slave_title": "_disabled-cookie-list-simple",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_empty",
"slave_title": "_empty"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-default",
"slave_title": "_enable-http2-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-false",
"slave_title": "_enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-true",
"slave_title": "_enable-http2-true",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-default",
"slave_title": "_enable-http3-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-default-enable-http2-false",
"slave_title": "_enable-http3-default-enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http3": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-false",
"slave_title": "_enable-http3-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http3": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-true",
"slave_title": "_enable-http3-true",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -165,14 +165,14 @@
{
"enable-http2": false,
"enable-http3": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-true-enable-http2-false",
"slave_title": "_enable-http3-true-enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache",
"slave_title": "_enable_cache",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -180,7 +180,7 @@
{
"disable-no-cache-request": true,
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-disable-no-cache-request",
"slave_title": "_enable_cache-disable-no-cache-request",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -188,7 +188,7 @@
{
"disable-via-header": true,
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-disable-via-header",
"slave_title": "_enable_cache-disable-via-header",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -196,7 +196,7 @@
{
"enable_cache": true,
"https-only": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-https-only-false",
"slave_title": "_enable_cache-https-only-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -204,7 +204,7 @@
{
"custom_domain": "customdomainenablecache.example.com",
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache_custom_domain",
"slave_title": "_enable_cache_custom_domain",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -212,14 +212,14 @@
{
"enable_cache": true,
"server-alias": "enablecacheserveralias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache_server_alias",
"slave_title": "_enable_cache_server_alias",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"https-only": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_https-only",
"slave_title": "_https-only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -227,14 +227,14 @@
{
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https",
"https-url-netloc-list": "@@_ipv4_address@@:@@_server_netloc_a_http_port@@ @@_ipv4_address@@:@@_server_netloc_b_http_port@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_https-url-netloc-list",
"slave_title": "_https-url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/http"
},
{
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_prefer-gzip-encoding-to-backend",
"slave_title": "_prefer-gzip-encoding-to-backend",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -242,14 +242,14 @@
{
"https-only": "false",
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_prefer-gzip-encoding-to-backend-https-only",
"slave_title": "_prefer-gzip-encoding-to-backend-https-only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"server-alias": "alias1.example.com alias2.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias",
"slave_title": "_server-alias",
"strict-transport-security": "200",
@@ -257,14 +257,14 @@
},
{
"server-alias": "alias3.example.com alias3.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-duplicated",
"slave_title": "_server-alias-duplicated",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"server-alias": "",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-empty",
"slave_title": "_server-alias-empty",
"strict-transport-security": "200",
@@ -273,7 +273,7 @@
},
{
"server-alias": "*.alias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-wildcard",
"slave_title": "_server-alias-wildcard",
"strict-transport-security": "200",
@@ -283,20 +283,20 @@
{
"custom_domain": "alias4.example.com",
"server-alias": "alias4.example.com alias4.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias_custom_domain-duplicated",
"slave_title": "_server-alias_custom_domain-duplicated",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify-unverified",
"slave_title": "_ssl-proxy-verify-unverified",
"ssl-proxy-verify": true,
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify_ssl_proxy_ca_crt",
"slave_title": "_ssl-proxy-verify_ssl_proxy_ca_crt",
"ssl-proxy-verify": true,
@@ -304,7 +304,7 @@
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify_ssl_proxy_ca_crt-unverified",
"slave_title": "_ssl-proxy-verify_ssl_proxy_ca_crt-unverified",
"ssl-proxy-verify": true,
@@ -312,25 +312,25 @@
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_does_not_match",
"slave_title": "_ssl_ca_crt_does_not_match",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_garbage",
"slave_title": "_ssl_ca_crt_garbage",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_only",
"slave_title": "_ssl_ca_crt_only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook",
"slave_title": "_type-notebook",
"type": "notebook",
@@ -339,7 +339,7 @@
{
"https-only": false,
"https-url": "https://@@_ipv4_address@@:@@_server_https_port@@/",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect",
"slave_title": "_type-redirect",
"type": "redirect",
@@ -347,7 +347,7 @@
},
{
"custom_domain": "customdomaintyperedirect.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect-custom_domain",
"slave_title": "_type-redirect-custom_domain",
"type": "redirect",
@@ -356,21 +356,21 @@
{
"https-only": false,
"https-url": "https://example.com/",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect-to-standard-port",
"slave_title": "_type-redirect-to-standard-port",
"type": "redirect",
"url": "http://example.com/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket",
"slave_title": "_type-websocket",
"type": "websocket",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list",
"slave_title": "_type-websocket-websocket-path-list",
"type": "websocket",
@@ -378,7 +378,7 @@
"websocket-path-list": "////ws//// /with%20space/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-empty",
"slave_title": "_type-websocket-websocket-path-list-empty",
"type": "websocket",
@@ -386,7 +386,7 @@
"websocket-path-list": ""
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-none",
"slave_title": "_type-websocket-websocket-path-list-none",
"type": "websocket",
@@ -394,7 +394,7 @@
"websocket-path-list": null
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-websocket-transparent-false",
"slave_title": "_type-websocket-websocket-path-list-websocket-transparent-false",
"type": "websocket",
@@ -403,7 +403,7 @@
"websocket-transparent": "false"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-transparent-false",
"slave_title": "_type-websocket-websocket-transparent-false",
"type": "websocket",
@@ -411,7 +411,7 @@
"websocket-transparent": "false"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope",
"slave_title": "_type-zope",
"type": "zope",
@@ -419,7 +419,7 @@
},
{
"default-path": "///default-path/to/some/resource///",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-default-path",
"slave_title": "_type-zope-default-path",
"type": "zope",
@@ -427,7 +427,7 @@
},
{
"path": "///path/to/some/resource///",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-path",
"slave_title": "_type-zope-path",
"type": "zope",
@@ -435,7 +435,7 @@
},
{
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-prefer-gzip-encoding-to-backend",
"slave_title": "_type-zope-prefer-gzip-encoding-to-backend",
"type": "zope",
@@ -444,7 +444,7 @@
{
"https-only": "false",
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-prefer-gzip-encoding-to-backend-https-only",
"slave_title": "_type-zope-prefer-gzip-encoding-to-backend-https-only",
"type": "zope",
@@ -452,7 +452,7 @@
},
{
"https-only": "false",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-virtualhostroot-http-port",
"slave_title": "_type-zope-virtualhostroot-http-port",
"type": "zope",
@@ -460,7 +460,7 @@
"virtualhostroot-http-port": "12345"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-virtualhostroot-https-port",
"slave_title": "_type-zope-virtualhostroot-https-port",
"type": "zope",
@@ -468,20 +468,20 @@
"virtualhostroot-https-port": "12345"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-netloc-list",
"slave_title": "_url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/",
"url-netloc-list": "@@_ipv4_address@@:@@_server_netloc_a_http_port@@ @@_ipv4_address@@:@@_server_netloc_b_http_port@@"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-trailing-slash-absent",
"slave_title": "_url-trailing-slash-absent",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/index.html"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-trailing-slash-present",
"slave_title": "_url-trailing-slash-present",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/index.html/"
@@ -491,7 +491,7 @@
"backend-connect-timeout": 10,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https",
"request-timeout": 15,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url_https-url",
"slave_title": "_url_https-url",
"strict-transport-security": "200",
diff --git a/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt
index 30cc49f3b..adeba1d1b 100644
--- a/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt
@@ -12,7 +12,7 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [],
"timestamp": "@@TIMESTAMP@@"
},
diff --git a/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt
index 51f7a0af8..7ce74c346 100644
--- a/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt
@@ -10,7 +10,7 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [],
"timestamp": "@@TIMESTAMP@@"
},
diff --git a/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt
index bd9fd5e8e..6f4098497 100644
--- a/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt
@@ -11,7 +11,7 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [],
"timestamp": "@@TIMESTAMP@@"
},
diff --git a/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt
index 88865be4d..5804d5f4d 100644
--- a/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt
@@ -12,11 +12,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_default",
"slave_title": "_default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt
index fbe90ad49..2080ae903 100644
--- a/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt
@@ -15,11 +15,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_replicate",
"slave_title": "_replicate",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/rapid-cdn/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt
index efd664060..d5db1b7e1 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt
@@ -12,56 +12,56 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_Url",
"slave_title": "_Url",
"url": " http://@@_ipv4_address@@:@@_server_http_port@@//?a=b&c= "
},
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend",
"slave_title": "_auth-to-backend",
"url": "https://@@_ipv4_address@@:@@_server_https_auth_port@@/"
},
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend-backend-ignore",
"slave_title": "_auth-to-backend-backend-ignore",
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend-not-configured",
"slave_title": "_auth-to-backend-not-configured",
"url": "https://@@_ipv4_address@@:@@_server_https_auth_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_bad-backend",
"slave_title": "_bad-backend",
"url": "http://bad.backend/"
},
{
"ciphers": "RSA-3DES-EDE-CBC-SHA RSA-AES128-CBC-SHA",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ciphers",
"slave_title": "_ciphers"
},
{
"ciphers": "ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256 ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-AES256-CBC-SHA ECDHE-RSA-AES128-CBC-SHA ECDHE-ECDSA-AES256-CBC-SHA ECDHE-ECDSA-AES128-CBC-SHA RSA-AES256-CBC-SHA RSA-AES128-CBC-SHA ECDHE-RSA-3DES-EDE-CBC-SHA RSA-3DES-EDE-CBC-SHA",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ciphers-translation-all",
"slave_title": "_ciphers-translation-all"
},
{
"custom_domain": "mycustomdomain.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain",
"slave_title": "_custom_domain",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -69,94 +69,94 @@
{
"custom_domain": "mycustomdomainserveralias.example.com",
"server-alias": "mycustomdomainserveralias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_server_alias",
"slave_title": "_custom_domain_server_alias",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "customdomainsslcrtsslkey.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key",
"slave_title": "_custom_domain_ssl_crt_ssl_key",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "customdomainsslcrtsslkeysslcacrt.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"slave_title": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "*.customdomain.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_wildcard",
"slave_title": "_custom_domain_wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"disabled-cookie-list": "Coconut Chocolate Vanilia",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_disabled-cookie-list",
"slave_title": "_disabled-cookie-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"disabled-cookie-list": "Chocolate",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_disabled-cookie-list-simple",
"slave_title": "_disabled-cookie-list-simple",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_empty",
"slave_title": "_empty"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-default",
"slave_title": "_enable-http2-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-false",
"slave_title": "_enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-true",
"slave_title": "_enable-http2-true",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-default",
"slave_title": "_enable-http3-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-default-enable-http2-false",
"slave_title": "_enable-http3-default-enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http3": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-false",
"slave_title": "_enable-http3-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http3": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-true",
"slave_title": "_enable-http3-true",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -164,14 +164,14 @@
{
"enable-http2": false,
"enable-http3": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-true-enable-http2-false",
"slave_title": "_enable-http3-true-enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache",
"slave_title": "_enable_cache",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -179,7 +179,7 @@
{
"disable-no-cache-request": true,
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-disable-no-cache-request",
"slave_title": "_enable_cache-disable-no-cache-request",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -187,7 +187,7 @@
{
"disable-via-header": true,
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-disable-via-header",
"slave_title": "_enable_cache-disable-via-header",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -195,7 +195,7 @@
{
"enable_cache": true,
"https-only": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-https-only-false",
"slave_title": "_enable_cache-https-only-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -203,7 +203,7 @@
{
"custom_domain": "customdomainenablecache.example.com",
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache_custom_domain",
"slave_title": "_enable_cache_custom_domain",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -211,14 +211,14 @@
{
"enable_cache": true,
"server-alias": "enablecacheserveralias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache_server_alias",
"slave_title": "_enable_cache_server_alias",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"https-only": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_https-only",
"slave_title": "_https-only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -226,14 +226,14 @@
{
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https",
"https-url-netloc-list": "@@_ipv4_address@@:@@_server_netloc_a_http_port@@ @@_ipv4_address@@:@@_server_netloc_b_http_port@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_https-url-netloc-list",
"slave_title": "_https-url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/http"
},
{
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_prefer-gzip-encoding-to-backend",
"slave_title": "_prefer-gzip-encoding-to-backend",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -241,14 +241,14 @@
{
"https-only": "false",
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_prefer-gzip-encoding-to-backend-https-only",
"slave_title": "_prefer-gzip-encoding-to-backend-https-only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"server-alias": "alias1.example.com alias2.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias",
"slave_title": "_server-alias",
"strict-transport-security": "200",
@@ -256,14 +256,14 @@
},
{
"server-alias": "alias3.example.com alias3.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-duplicated",
"slave_title": "_server-alias-duplicated",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"server-alias": "",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-empty",
"slave_title": "_server-alias-empty",
"strict-transport-security": "200",
@@ -272,7 +272,7 @@
},
{
"server-alias": "*.alias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-wildcard",
"slave_title": "_server-alias-wildcard",
"strict-transport-security": "200",
@@ -282,20 +282,20 @@
{
"custom_domain": "alias4.example.com",
"server-alias": "alias4.example.com alias4.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias_custom_domain-duplicated",
"slave_title": "_server-alias_custom_domain-duplicated",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify-unverified",
"slave_title": "_ssl-proxy-verify-unverified",
"ssl-proxy-verify": true,
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify_ssl_proxy_ca_crt",
"slave_title": "_ssl-proxy-verify_ssl_proxy_ca_crt",
"ssl-proxy-verify": true,
@@ -303,7 +303,7 @@
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify_ssl_proxy_ca_crt-unverified",
"slave_title": "_ssl-proxy-verify_ssl_proxy_ca_crt-unverified",
"ssl-proxy-verify": true,
@@ -311,25 +311,25 @@
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_does_not_match",
"slave_title": "_ssl_ca_crt_does_not_match",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_garbage",
"slave_title": "_ssl_ca_crt_garbage",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_only",
"slave_title": "_ssl_ca_crt_only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook",
"slave_title": "_type-notebook",
"type": "notebook",
@@ -338,7 +338,7 @@
{
"https-only": false,
"https-url": "https://@@_ipv4_address@@:@@_server_https_port@@/",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect",
"slave_title": "_type-redirect",
"type": "redirect",
@@ -346,7 +346,7 @@
},
{
"custom_domain": "customdomaintyperedirect.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect-custom_domain",
"slave_title": "_type-redirect-custom_domain",
"type": "redirect",
@@ -355,21 +355,21 @@
{
"https-only": false,
"https-url": "https://example.com/",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect-to-standard-port",
"slave_title": "_type-redirect-to-standard-port",
"type": "redirect",
"url": "http://example.com/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket",
"slave_title": "_type-websocket",
"type": "websocket",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list",
"slave_title": "_type-websocket-websocket-path-list",
"type": "websocket",
@@ -377,7 +377,7 @@
"websocket-path-list": "////ws//// /with%20space/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-empty",
"slave_title": "_type-websocket-websocket-path-list-empty",
"type": "websocket",
@@ -385,7 +385,7 @@
"websocket-path-list": ""
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-none",
"slave_title": "_type-websocket-websocket-path-list-none",
"type": "websocket",
@@ -393,7 +393,7 @@
"websocket-path-list": null
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-websocket-transparent-false",
"slave_title": "_type-websocket-websocket-path-list-websocket-transparent-false",
"type": "websocket",
@@ -402,7 +402,7 @@
"websocket-transparent": "false"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-transparent-false",
"slave_title": "_type-websocket-websocket-transparent-false",
"type": "websocket",
@@ -410,7 +410,7 @@
"websocket-transparent": "false"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope",
"slave_title": "_type-zope",
"type": "zope",
@@ -418,7 +418,7 @@
},
{
"default-path": "///default-path/to/some/resource///",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-default-path",
"slave_title": "_type-zope-default-path",
"type": "zope",
@@ -426,7 +426,7 @@
},
{
"path": "///path/to/some/resource///",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-path",
"slave_title": "_type-zope-path",
"type": "zope",
@@ -434,7 +434,7 @@
},
{
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-prefer-gzip-encoding-to-backend",
"slave_title": "_type-zope-prefer-gzip-encoding-to-backend",
"type": "zope",
@@ -443,7 +443,7 @@
{
"https-only": "false",
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-prefer-gzip-encoding-to-backend-https-only",
"slave_title": "_type-zope-prefer-gzip-encoding-to-backend-https-only",
"type": "zope",
@@ -451,7 +451,7 @@
},
{
"https-only": "false",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-virtualhostroot-http-port",
"slave_title": "_type-zope-virtualhostroot-http-port",
"type": "zope",
@@ -459,7 +459,7 @@
"virtualhostroot-http-port": "12345"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-virtualhostroot-https-port",
"slave_title": "_type-zope-virtualhostroot-https-port",
"type": "zope",
@@ -467,20 +467,20 @@
"virtualhostroot-https-port": "12345"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-netloc-list",
"slave_title": "_url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/",
"url-netloc-list": "@@_ipv4_address@@:@@_server_netloc_a_http_port@@ @@_ipv4_address@@:@@_server_netloc_b_http_port@@"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-trailing-slash-absent",
"slave_title": "_url-trailing-slash-absent",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/index.html"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-trailing-slash-present",
"slave_title": "_url-trailing-slash-present",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/index.html/"
@@ -490,7 +490,7 @@
"backend-connect-timeout": 10,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https",
"request-timeout": 15,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url_https-url",
"slave_title": "_url_https-url",
"strict-transport-security": "200",
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt
index 9bfc2b7f2..ed5c273f9 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt
@@ -12,11 +12,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_default_ciphers",
"slave_title": "_default_ciphers",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -24,7 +24,7 @@
{
"ciphers": "ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256",
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_own_ciphers",
"slave_title": "_own_ciphers",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt
index 29d8e6d4e..ab42a1e5d 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt
@@ -12,12 +12,12 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"health-check": true,
"health-check-http-method": "CONNECT",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-connect",
"slave_title": "_health-check-connect",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -31,20 +31,20 @@
"health-check-interval": "15",
"health-check-rise": "3",
"health-check-timeout": "7",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-custom",
"slave_title": "_health-check-custom",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"health-check": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-default",
"slave_title": "_health-check-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-disabled",
"slave_title": "_health-check-disabled",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -59,7 +59,7 @@
"health-check-timeout": 1,
"https-only": false,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https-url",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-failover-url",
"slave_title": "_health-check-failover-url",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/url"
@@ -74,7 +74,7 @@
"health-check-timeout": 1,
"https-only": false,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https-url",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-failover-url-auth-to-backend",
"slave_title": "_health-check-failover-url-auth-to-backend",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/url"
@@ -89,7 +89,7 @@
"health-check-timeout": 1,
"https-only": false,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https-url",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-failover-url-netloc-list",
"slave_title": "_health-check-failover-url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/url"
@@ -102,7 +102,7 @@
"health-check-http-path": "/health-check-failover-url-ssl-proxy-verified",
"health-check-interval": 1,
"health-check-timeout": 1,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-failover-url-ssl-proxy-verified",
"slave_title": "_health-check-failover-url-ssl-proxy-verified",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -114,7 +114,7 @@
"health-check-http-path": "/health-check-failover-url-ssl-proxy-verify-missing",
"health-check-interval": 1,
"health-check-timeout": 1,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-failover-url-ssl-proxy-verify-missing",
"slave_title": "_health-check-failover-url-ssl-proxy-verify-missing",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -127,7 +127,7 @@
"health-check-http-path": "/health-check-failover-url-ssl-proxy-verify-unverified",
"health-check-interval": 1,
"health-check-timeout": 1,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_health-check-failover-url-ssl-proxy-verify-unverified",
"slave_title": "_health-check-failover-url-ssl-proxy-verify-unverified",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt
index 4152dc40c..16c123d3a 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt
@@ -12,12 +12,12 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"custom_domain": "*.example.com",
"server-alias": "example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_01wildcard",
"slave_title": "_01wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/01wildcard"
@@ -25,21 +25,21 @@
{
"custom_domain": "*.alias1.example.com",
"server-alias": "alias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_02wildcard",
"slave_title": "_02wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/02wildcard"
},
{
"custom_domain": "zspecific.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_03zspecific",
"slave_title": "_03zspecific",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/03zspecific"
},
{
"custom_domain": "zspecific.alias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_04zspecific",
"slave_title": "_04zspecific",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/04zspecific"
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00cluster_request_instance_parameter_dict.txt
index 21952541f..aca607b6c 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00cluster_request_instance_parameter_dict.txt
@@ -14,56 +14,56 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_Url",
"slave_title": "_Url",
"url": " http://@@_ipv4_address@@:@@_server_http_port@@//?a=b&c= "
},
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend",
"slave_title": "_auth-to-backend",
"url": "https://@@_ipv4_address@@:@@_server_https_auth_port@@/"
},
{
"authenticate-to-backend": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend-backend-ignore",
"slave_title": "_auth-to-backend-backend-ignore",
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_auth-to-backend-not-configured",
"slave_title": "_auth-to-backend-not-configured",
"url": "https://@@_ipv4_address@@:@@_server_https_auth_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_bad-backend",
"slave_title": "_bad-backend",
"url": "http://bad.backend/"
},
{
"ciphers": "RSA-3DES-EDE-CBC-SHA RSA-AES128-CBC-SHA",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ciphers",
"slave_title": "_ciphers"
},
{
"ciphers": "ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256 ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-AES256-CBC-SHA ECDHE-RSA-AES128-CBC-SHA ECDHE-ECDSA-AES256-CBC-SHA ECDHE-ECDSA-AES128-CBC-SHA RSA-AES256-CBC-SHA RSA-AES128-CBC-SHA ECDHE-RSA-3DES-EDE-CBC-SHA RSA-3DES-EDE-CBC-SHA",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ciphers-translation-all",
"slave_title": "_ciphers-translation-all"
},
{
"custom_domain": "mycustomdomain.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain",
"slave_title": "_custom_domain",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -71,94 +71,94 @@
{
"custom_domain": "mycustomdomainserveralias.example.com",
"server-alias": "mycustomdomainserveralias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_server_alias",
"slave_title": "_custom_domain_server_alias",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "customdomainsslcrtsslkey.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key",
"slave_title": "_custom_domain_ssl_crt_ssl_key",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "customdomainsslcrtsslkeysslcacrt.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"slave_title": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"custom_domain": "*.customdomain.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_wildcard",
"slave_title": "_custom_domain_wildcard",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"disabled-cookie-list": "Coconut Chocolate Vanilia",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_disabled-cookie-list",
"slave_title": "_disabled-cookie-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"disabled-cookie-list": "Chocolate",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_disabled-cookie-list-simple",
"slave_title": "_disabled-cookie-list-simple",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_empty",
"slave_title": "_empty"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-default",
"slave_title": "_enable-http2-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-false",
"slave_title": "_enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http2-true",
"slave_title": "_enable-http2-true",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-default",
"slave_title": "_enable-http3-default",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http2": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-default-enable-http2-false",
"slave_title": "_enable-http3-default-enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http3": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-false",
"slave_title": "_enable-http3-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable-http3": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-true",
"slave_title": "_enable-http3-true",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -166,14 +166,14 @@
{
"enable-http2": false,
"enable-http3": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable-http3-true-enable-http2-false",
"slave_title": "_enable-http3-true-enable-http2-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache",
"slave_title": "_enable_cache",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -181,7 +181,7 @@
{
"disable-no-cache-request": true,
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-disable-no-cache-request",
"slave_title": "_enable_cache-disable-no-cache-request",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -189,7 +189,7 @@
{
"disable-via-header": true,
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-disable-via-header",
"slave_title": "_enable_cache-disable-via-header",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -197,7 +197,7 @@
{
"enable_cache": true,
"https-only": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache-https-only-false",
"slave_title": "_enable_cache-https-only-false",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -205,7 +205,7 @@
{
"custom_domain": "customdomainenablecache.example.com",
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache_custom_domain",
"slave_title": "_enable_cache_custom_domain",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -213,14 +213,14 @@
{
"enable_cache": true,
"server-alias": "enablecacheserveralias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_enable_cache_server_alias",
"slave_title": "_enable_cache_server_alias",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"https-only": false,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_https-only",
"slave_title": "_https-only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -228,14 +228,14 @@
{
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https",
"https-url-netloc-list": "@@_ipv4_address@@:@@_server_netloc_a_http_port@@ @@_ipv4_address@@:@@_server_netloc_b_http_port@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_https-url-netloc-list",
"slave_title": "_https-url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/http"
},
{
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_prefer-gzip-encoding-to-backend",
"slave_title": "_prefer-gzip-encoding-to-backend",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
@@ -243,14 +243,14 @@
{
"https-only": "false",
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_prefer-gzip-encoding-to-backend-https-only",
"slave_title": "_prefer-gzip-encoding-to-backend-https-only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"server-alias": "alias1.example.com alias2.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias",
"slave_title": "_server-alias",
"strict-transport-security": "200",
@@ -258,14 +258,14 @@
},
{
"server-alias": "alias3.example.com alias3.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-duplicated",
"slave_title": "_server-alias-duplicated",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
"server-alias": "",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-empty",
"slave_title": "_server-alias-empty",
"strict-transport-security": "200",
@@ -274,7 +274,7 @@
},
{
"server-alias": "*.alias1.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias-wildcard",
"slave_title": "_server-alias-wildcard",
"strict-transport-security": "200",
@@ -284,20 +284,20 @@
{
"custom_domain": "alias4.example.com",
"server-alias": "alias4.example.com alias4.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_server-alias_custom_domain-duplicated",
"slave_title": "_server-alias_custom_domain-duplicated",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify-unverified",
"slave_title": "_ssl-proxy-verify-unverified",
"ssl-proxy-verify": true,
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify_ssl_proxy_ca_crt",
"slave_title": "_ssl-proxy-verify_ssl_proxy_ca_crt",
"ssl-proxy-verify": true,
@@ -305,7 +305,7 @@
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl-proxy-verify_ssl_proxy_ca_crt-unverified",
"slave_title": "_ssl-proxy-verify_ssl_proxy_ca_crt-unverified",
"ssl-proxy-verify": true,
@@ -313,25 +313,25 @@
"url": "https://@@_ipv4_address@@:@@_server_https_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_does_not_match",
"slave_title": "_ssl_ca_crt_does_not_match",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_garbage",
"slave_title": "_ssl_ca_crt_garbage",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_only",
"slave_title": "_ssl_ca_crt_only",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook",
"slave_title": "_type-notebook",
"type": "notebook",
@@ -340,7 +340,7 @@
{
"https-only": false,
"https-url": "https://@@_ipv4_address@@:@@_server_https_port@@/",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect",
"slave_title": "_type-redirect",
"type": "redirect",
@@ -348,7 +348,7 @@
},
{
"custom_domain": "customdomaintyperedirect.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect-custom_domain",
"slave_title": "_type-redirect-custom_domain",
"type": "redirect",
@@ -357,21 +357,21 @@
{
"https-only": false,
"https-url": "https://example.com/",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-redirect-to-standard-port",
"slave_title": "_type-redirect-to-standard-port",
"type": "redirect",
"url": "http://example.com/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket",
"slave_title": "_type-websocket",
"type": "websocket",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list",
"slave_title": "_type-websocket-websocket-path-list",
"type": "websocket",
@@ -379,7 +379,7 @@
"websocket-path-list": "////ws//// /with%20space/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-empty",
"slave_title": "_type-websocket-websocket-path-list-empty",
"type": "websocket",
@@ -387,7 +387,7 @@
"websocket-path-list": ""
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-none",
"slave_title": "_type-websocket-websocket-path-list-none",
"type": "websocket",
@@ -395,7 +395,7 @@
"websocket-path-list": null
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-path-list-websocket-transparent-false",
"slave_title": "_type-websocket-websocket-path-list-websocket-transparent-false",
"type": "websocket",
@@ -404,7 +404,7 @@
"websocket-transparent": "false"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-websocket-websocket-transparent-false",
"slave_title": "_type-websocket-websocket-transparent-false",
"type": "websocket",
@@ -412,7 +412,7 @@
"websocket-transparent": "false"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope",
"slave_title": "_type-zope",
"type": "zope",
@@ -420,7 +420,7 @@
},
{
"default-path": "///default-path/to/some/resource///",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-default-path",
"slave_title": "_type-zope-default-path",
"type": "zope",
@@ -428,7 +428,7 @@
},
{
"path": "///path/to/some/resource///",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-path",
"slave_title": "_type-zope-path",
"type": "zope",
@@ -436,7 +436,7 @@
},
{
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-prefer-gzip-encoding-to-backend",
"slave_title": "_type-zope-prefer-gzip-encoding-to-backend",
"type": "zope",
@@ -445,7 +445,7 @@
{
"https-only": "false",
"prefer-gzip-encoding-to-backend": "true",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-prefer-gzip-encoding-to-backend-https-only",
"slave_title": "_type-zope-prefer-gzip-encoding-to-backend-https-only",
"type": "zope",
@@ -453,7 +453,7 @@
},
{
"https-only": "false",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-virtualhostroot-http-port",
"slave_title": "_type-zope-virtualhostroot-http-port",
"type": "zope",
@@ -461,7 +461,7 @@
"virtualhostroot-http-port": "12345"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-zope-virtualhostroot-https-port",
"slave_title": "_type-zope-virtualhostroot-https-port",
"type": "zope",
@@ -469,20 +469,20 @@
"virtualhostroot-https-port": "12345"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-netloc-list",
"slave_title": "_url-netloc-list",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/",
"url-netloc-list": "@@_ipv4_address@@:@@_server_netloc_a_http_port@@ @@_ipv4_address@@:@@_server_netloc_b_http_port@@"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-trailing-slash-absent",
"slave_title": "_url-trailing-slash-absent",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/index.html"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url-trailing-slash-present",
"slave_title": "_url-trailing-slash-present",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/index.html/"
@@ -492,7 +492,7 @@
"backend-connect-timeout": 10,
"https-url": "http://@@_ipv4_address@@:@@_server_http_port@@/https",
"request-timeout": 15,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_url_https-url",
"slave_title": "_url_https-url",
"strict-transport-security": "200",
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt
index 75be61eba..eece693c7 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt
@@ -13,11 +13,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"custom_domain": "customdomainsslcrtsslkey.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key",
"slave_title": "_custom_domain_ssl_crt_ssl_key",
"ssl_crt": "@@customdomain_certificate_pem@@",
@@ -26,7 +26,7 @@
},
{
"custom_domain": "customdomainsslcrtsslkeysslcacrt.example.com",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"slave_title": "_custom_domain_ssl_crt_ssl_key_ssl_ca_crt",
"ssl_ca_crt": "@@ca.certificate_pem@@",
@@ -35,7 +35,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_does_not_match",
"slave_title": "_ssl_ca_crt_does_not_match",
"ssl_ca_crt": "@@ca.certificate_pem@@",
@@ -44,7 +44,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_ca_crt_garbage",
"slave_title": "_ssl_ca_crt_garbage",
"ssl_ca_crt": "some garbage",
@@ -54,19 +54,19 @@
},
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_from_master",
"slave_title": "_ssl_from_master",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_from_master_kedifa_overrides",
"slave_title": "_ssl_from_master_kedifa_overrides",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_from_slave",
"slave_title": "_ssl_from_slave",
"ssl_crt": "@@ssl_from_slave_certificate_pem@@",
@@ -74,7 +74,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_from_slave_kedifa_overrides",
"slave_title": "_ssl_from_slave_kedifa_overrides",
"ssl_crt": "@@ssl_from_slave_kedifa_overrides_certificate_pem@@",
@@ -82,21 +82,21 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_master",
"slave_title": "_type-notebook-ssl_from_master",
"type": "notebook",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_master_kedifa_overrides",
"slave_title": "_type-notebook-ssl_from_master_kedifa_overrides",
"type": "notebook",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_slave",
"slave_title": "_type-notebook-ssl_from_slave",
"ssl_crt": "@@type_notebook_ssl_from_slave_certificate_pem@@",
@@ -105,7 +105,7 @@
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
},
{
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_type-notebook-ssl_from_slave_kedifa_overrides",
"slave_title": "_type-notebook-ssl_from_slave_kedifa_overrides",
"ssl_crt": "@@type_notebook_ssl_from_slave_kedifa_overrides_certificate_pem@@",
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt
index dbe141390..ac68b0832 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt
@@ -13,11 +13,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_from_master_kedifa_overrides_master_certificate",
"slave_title": "_ssl_from_master_kedifa_overrides_master_certificate",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt
index 8994bfd04..ca0da71e0 100644
--- a/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt
+++ b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt
@@ -13,11 +13,11 @@
"slap_computer_id": "local",
"slap_computer_partition_id": "T-0",
"slap_software_release_url": "@@00getSoftwareURL@@",
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_instance_list": [
{
"enable_cache": true,
- "slap_software_type": "RootSoftwareInstance",
+ "slap_software_type": "default",
"slave_reference": "_ssl_from_master",
"slave_title": "_ssl_from_master",
"url": "http://@@_ipv4_address@@:@@_server_http_port@@/"
diff --git a/software/re6stnet/buildout.hash.cfg b/software/re6stnet/buildout.hash.cfg
index 149a28d24..41a7ad7db 100644
--- a/software/re6stnet/buildout.hash.cfg
+++ b/software/re6stnet/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg.in
-md5sum = 7be0c21751f8385ef876c3d7192d4057
+md5sum = 57ddaa585f4755f8e8d1613e5321eefc
[template-re6stnet]
filename = instance-re6stnet.cfg.in
diff --git a/software/re6stnet/instance.cfg.in b/software/re6stnet/instance.cfg.in
index 824b546aa..42a5a2475 100644
--- a/software/re6stnet/instance.cfg.in
+++ b/software/re6stnet/instance.cfg.in
@@ -47,5 +47,3 @@ recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-re6stnet:output
registry = ${:default}
-# BBB
-RootSoftwareInstance = ${:default}
diff --git a/software/repman/buildout.hash.cfg b/software/repman/buildout.hash.cfg
index 72ad76f35..849a4482c 100644
--- a/software/repman/buildout.hash.cfg
+++ b/software/repman/buildout.hash.cfg
@@ -14,11 +14,11 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
-md5sum = 55c7fd4dd6a39b31878889fbfb00f995
+md5sum = 8daeb8d8743ca1b22e2c29e994e69df2
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = c5a7a519270c7829bb4c987391fbfc39
+md5sum = 51d53f5fff8c9918984578de0a7bca77
[config-toml.in]
_update_hash_filename_ = templates/config.toml.in
diff --git a/software/repman/instance-repman.cfg.jinja2.in b/software/repman/instance-repman.cfg.jinja2.in
index fb804df3f..f823a35fa 100644
--- a/software/repman/instance-repman.cfg.jinja2.in
+++ b/software/repman/instance-repman.cfg.jinja2.in
@@ -327,7 +327,6 @@ config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }}
[{{ name}}-publish-slave-information]
recipe = slapos.cookbook:switch-softwaretype
default = {{ 'dynamic-' ~name ~ '-publish-slave-information:output' }}
-RootSoftwareInstance = ${:default}
[dynamic-{{ name}}-publish-slave-information]
recipe = slapos.recipe.template:jinja2
diff --git a/software/repman/instance.cfg.in b/software/repman/instance.cfg.in
index cc2f89368..b8f80bd82 100644
--- a/software/repman/instance.cfg.in
+++ b/software/repman/instance.cfg.in
@@ -9,7 +9,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = template-instance-repman.cfg:output
-RootSoftwareInstance = ${:default}
mariadb = template-instance-mariadb.cfg:output
diff --git a/software/seleniumserver/buildout.hash.cfg b/software/seleniumserver/buildout.hash.cfg
index 5bd6d8df9..7fe4b6da7 100644
--- a/software/seleniumserver/buildout.hash.cfg
+++ b/software/seleniumserver/buildout.hash.cfg
@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
-md5sum = 10e19df182c692b71ea552da183a0bcf
+md5sum = b443da6792bdde1218076a3a1ce50b11
[template-selenium]
filename = instance-selenium.cfg.in
diff --git a/software/seleniumserver/instance.cfg.in b/software/seleniumserver/instance.cfg.in
index 7cac0993e..698eb4087 100644
--- a/software/seleniumserver/instance.cfg.in
+++ b/software/seleniumserver/instance.cfg.in
@@ -16,7 +16,6 @@ context =
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:default}
default = dynamic-template-selenium:output
[slap-configuration]
diff --git a/software/slapos-master/buildout.hash.cfg b/software/slapos-master/buildout.hash.cfg
index 8ce19d6d4..685588f06 100644
--- a/software/slapos-master/buildout.hash.cfg
+++ b/software/slapos-master/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template-erp5]
filename = instance-erp5.cfg.in
-md5sum = d0009cd600d341935679a7fb193f34d1
+md5sum = cf5fbee0b5e104015eb9eac53ba2d241
[template-balancer]
filename = instance-balancer.cfg.in
diff --git a/software/slapos-master/instance-erp5.cfg.in b/software/slapos-master/instance-erp5.cfg.in
index 0009443f7..550fabffa 100644
--- a/software/slapos-master/instance-erp5.cfg.in
+++ b/software/slapos-master/instance-erp5.cfg.in
@@ -471,7 +471,7 @@ config-apachedex-configuration = {{
<= request-common
recipe = slapos.cookbook:request
software-url = {{ dumps(frontend_dict['software-url']) }}
-software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
+software-type = {{ dumps(frontend_dict.get('software-type', 'default')) }}
{{ root_common.sla('frontend', True) }}
shared = true
{% set config_dict = {
diff --git a/software/theia/buildout.hash.cfg b/software/theia/buildout.hash.cfg
index 7ea048fa3..d8549e9e5 100644
--- a/software/theia/buildout.hash.cfg
+++ b/software/theia/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = 23b498618bce83a6eb8df0470417f59e
[instance]
_update_hash_filename_ = instance.cfg.in
-md5sum = 9658a11340c018de816d0de40683706a
+md5sum = 5aab12790cdb1981cb0caf00d389a227
[instance-import]
_update_hash_filename_ = instance-import.cfg.jinja.in
diff --git a/software/theia/instance-input-schema.json b/software/theia/instance-input-schema.json
index 50a89dab2..ae9198521 100644
--- a/software/theia/instance-input-schema.json
+++ b/software/theia/instance-input-schema.json
@@ -52,7 +52,7 @@
"title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
},
"additional-frontend-guid": {
"title": "Additional Frontend Instance ID",
@@ -70,7 +70,7 @@
"title": "Additional Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".",
"type": "string",
- "default": "RootSoftwareInstance"
+ "default": "default"
}
}
}
diff --git a/software/theia/instance.cfg.in b/software/theia/instance.cfg.in
index 5bfc91e45..0610e0ee3 100644
--- a/software/theia/instance.cfg.in
+++ b/software/theia/instance.cfg.in
@@ -18,7 +18,6 @@ cert = $${slap-connection:cert-file}
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:default}
default = $${:theia}
theia = theia:output
export = export:output
@@ -50,11 +49,11 @@ default-parameters =
"forward-slapos-frontend-requests": "enabled",
"frontend-name": "Theia Frontend",
"frontend-sr": "$${:frontend-sr}",
- "frontend-sr-type": "RootSoftwareInstance",
+ "frontend-sr-type": "default",
"frontend-guid": null,
"additional-frontend-name":"Theia Additional Frontend",
"additional-frontend-sr": "$${:frontend-sr}",
- "additional-frontend-sr-type": "RootSoftwareInstance",
+ "additional-frontend-sr-type": "default",
"additional-frontend-guid": null,
"monitor-httpd-port": 8386
}
diff --git a/software/tsn-demo/buildout.hash.cfg b/software/tsn-demo/buildout.hash.cfg
index 55ff45a50..91d7a447d 100644
--- a/software/tsn-demo/buildout.hash.cfg
+++ b/software/tsn-demo/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
-md5sum = e70978c8b5d7ad6a98b5a12185236733
+md5sum = 4d59e9687dd4261913e5b81d3c9a9871
[template-tsn-client]
filename = instance-tsn-client.cfg
diff --git a/software/tsn-demo/instance.cfg b/software/tsn-demo/instance.cfg
index f5839c435..7d0b0cb0a 100644
--- a/software/tsn-demo/instance.cfg
+++ b/software/tsn-demo/instance.cfg
@@ -10,7 +10,6 @@ offline = true
recipe = slapos.cookbook:switch-softwaretype
default = tsn-client-dynamic-template:output
tsn-server = tsn-server-dynamic-template:output
-RootSoftwareInstance = $${:default}
[dynamic-template-base]
recipe = slapos.recipe.template:jinja2
diff --git a/software/turnserver/buildout.hash.cfg b/software/turnserver/buildout.hash.cfg
index 5d486bfd5..1f7430a52 100644
--- a/software/turnserver/buildout.hash.cfg
+++ b/software/turnserver/buildout.hash.cfg
@@ -15,7 +15,7 @@
[instance-cfg]
filename = instance.cfg.in
-md5sum = f47adc5131a3096e916dbf9ef0061f50
+md5sum = 31a25dff2777fe206bba92593dd725d6
[template-turnserver]
filename = instance-turnserver.cfg.jinja2.in
diff --git a/software/turnserver/instance.cfg.in b/software/turnserver/instance.cfg.in
index e5bf45225..819102d9c 100644
--- a/software/turnserver/instance.cfg.in
+++ b/software/turnserver/instance.cfg.in
@@ -8,7 +8,6 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
-RootSoftwareInstance = $${:default}
default = dynamic-template-turnserver:output
insecure = dynamic-template-insecure-turnserver:output
diff --git a/stack/erp5-zope2/buildout.hash.cfg b/stack/erp5-zope2/buildout.hash.cfg
index 063f2685d..00a1dff0d 100644
--- a/stack/erp5-zope2/buildout.hash.cfg
+++ b/stack/erp5-zope2/buildout.hash.cfg
@@ -70,11 +70,11 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
[template]
filename = instance.cfg.in
-md5sum = 3f7b28085ceff321a3cb785db60f7c3e
+md5sum = 1a81908e9716dedba4f397f37264b015
[template-erp5]
filename = instance-erp5.cfg.in
-md5sum = b056ec4fec956c2a07befd2fec116f04
+md5sum = 6b10ab0c54278156caf058ebb7246645
[template-zeo]
filename = instance-zeo.cfg.in
diff --git a/stack/erp5-zope2/instance-erp5.cfg.in b/stack/erp5-zope2/instance-erp5.cfg.in
index a8bd35c44..68758dd63 100644
--- a/stack/erp5-zope2/instance-erp5.cfg.in
+++ b/stack/erp5-zope2/instance-erp5.cfg.in
@@ -436,7 +436,7 @@ config-url = ${request-jupyter:connection-url}
<= request-common
recipe = slapos.cookbook:request
software-url = {{ dumps(frontend_dict['software-url']) }}
-software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
+software-type = {{ dumps(frontend_dict.get('software-type', 'default')) }}
{{ root_common.sla('frontend', True) }}
shared = true
{% set config_dict = {
diff --git a/stack/erp5-zope2/instance.cfg.in b/stack/erp5-zope2/instance.cfg.in
index 8d78a192e..0af546d73 100644
--- a/stack/erp5-zope2/instance.cfg.in
+++ b/stack/erp5-zope2/instance.cfg.in
@@ -229,8 +229,6 @@ override = {{ dumps(override_switch_softwaretype |default) }}
# Public software types
default = dynamic-template-erp5:output
-# BBB
-RootSoftwareInstance = ${:default}
# Internal software types
kumofs = dynamic-template-kumofs:output
caucase = dynamic-template-caucase:output
diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg
index 03232f49e..80cb6b1f5 100644
--- a/stack/erp5/buildout.hash.cfg
+++ b/stack/erp5/buildout.hash.cfg
@@ -70,7 +70,7 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
[template]
filename = instance.cfg.in
-md5sum = b15425c6e37314c499ad4c0dd52a8212
+md5sum = 39e391372cc616ea5d1d6559621e6747
[template-erp5]
filename = instance-erp5.cfg.in
diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in
index 93fcff7de..f3ac32ef3 100644
--- a/stack/erp5/instance.cfg.in
+++ b/stack/erp5/instance.cfg.in
@@ -233,8 +233,6 @@ override = {{ dumps(override_switch_softwaretype |default) }}
# Public software types
default = dynamic-template-erp5:output
-# BBB
-RootSoftwareInstance = ${:default}
# Internal software types
kumofs = dynamic-template-kumofs:output
caucase = dynamic-template-caucase:output
diff --git a/stack/lamp/buildout.hash.cfg b/stack/lamp/buildout.hash.cfg
index f097f7668..88e46b09a 100644
--- a/stack/lamp/buildout.hash.cfg
+++ b/stack/lamp/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[lamp-instance]
filename = instance.cfg.in
-md5sum = 6395a5d69e2fee494a7d00fd2ac563cb
+md5sum = f34548ba607becf3acd5c5e3d8e70551
[instance-apache-php]
filename = instance-apache-php.cfg.in
diff --git a/stack/lamp/instance.cfg.in b/stack/lamp/instance.cfg.in
index a1303f18d..6e7a703b8 100644
--- a/stack/lamp/instance.cfg.in
+++ b/stack/lamp/instance.cfg.in
@@ -10,7 +10,6 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:switch-softwaretype
default = dynamic-template-lamp:output
-RootSoftwareInstance = ${:default}
mariadb = dynamic-template-mariadb:output
apache = dynamic-template-apache-php:output
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 88de8fac6..782140e61 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -353,8 +353,8 @@ sgmllib3k = 1.0.0
simplegeneric = 0.8.1
singledispatch = 3.4.0.3
six = 1.16.0
-slapos.cookbook = 1.0.365
-slapos.core = 1.12.0
+slapos.cookbook = 1.0.367
+slapos.core = 1.13.0
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.7
--
2.30.9