Commit 2412f59b authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Reuse instance_parameter_dict more

parent 446b8e84
master 1.0 adapt_tests_for_slapproxy_upgrade cythonplus dev/buildout-3 dev/buildout-bootstrap-3 dev/theia-new-slapos-master-additional-frontend egg_testing_check_free_disk_space erp5-component erp5_fix_export erp5_fix_mariadb_init feat/enable_monitoring_password_promise feat/end-to-end-testing feat/erp5-no-httpd2 feat/ipv6_range feat/mariadb-replication feat/mariadb-replication-on-1.0.364 feat/theia-netrc-resiliency feat/theia-use-slap-connection-shared-parts feat/upgrade_numpy feat/upgrade_numpy_python3 fix/buildout-testing-reproductibility fix/erp5-mariadb-ipv6-as-host fix/jupyter-python3.8 fix/slapos.cookbook-tests-after-buildout3 fix/sr_tests_after_ipv6_range fix/theia-do-not-start-embedded-services-on-standalone-start fix/theia-resiliency-unique-frontend-clones fix/theia-resilient-clone-favicon fix_theia_caddy_gopls fix_theia_embedded_paths fix_theia_favicon fix_theia_libsecret fix_theia_logo fix_theia_resilience hateoas_config_webrunner html5as-match-tutorial html5as-tutorial html5as_with_custom_promise in_place_promises jm jupyter_cythonplus jupyter_fix_parameters jupyter_frontend lu_request_script matomo-tutorial monitor_promise_runner node-monitoring-sr node-monitoring-sr-with-custom-promises ors-tests pin_cleanup plugin_recipe_extra_paths promise_plugin_recipe_improvement rebase/1.0.354/mariadb-replication rebootstrap-tests scalability_crash_mariadb socket_promise_update sr_testing_parameters test/build-fixes testing/cookbook testnode_shorter_paths tests theia-project-tests theia-tests theia-upgrade-tests theia_cron theia_easy_supervisorctl theia_embedded_parameters theia_embedded_software_script theia_fix_authentication_promise theia_fix_embedded_sr theia_fix_erp5_resiliency theia_fix_erp5_resiliency_test theia_fix_instance_parameters theia_fix_keytar_rpath theia_fix_shell_path theia_fix_supervisor_slapos_env theia_fix_vscode_plugins theia_frontend_custom theia_frontend_in_json_schema theia_increase_node_memory theia_node_auto theia_open_websocket theia_publish_monitor theia_python3 theia_recursive theia_resilience theia_resilient theia_simplify_embedded_sr theia_simplify_more_embedded_sr theia_slapos_compilation_toolchain theia_solve_embedded_instance theia_upgrade_to_1.13.0 theia_upgrade_to_1.14.0 theia_upgrade_v1.17.0 theia_upgrade_websocket_fix theia_with_sr update_promise_plugin_recipe upgrade-setuptools vup/buildout-3.0.1+slapos008 1.0.377-mariadb-replication 1.0.354-mariadb-replication-efc8bfe3c 1.0.354-mariadb-replication-ddf5c6961 1.0.354-mariadb-replication-249eef586 1.0.354-mariadb-replication-8b12a75b5 1.0.196 1.0.195 1.0.194 1.0.193 1.0.192 1.0.191 1.0.190 1.0.189 1.0.188 1.0.187 1.0.186 1.0.185 1.0.184 1.0.183 1.0.182 1.0.181 1.0.180 1.0.179 1.0.178 1.0.177 1.0.176 1.0.175 1.0.174 1.0.173 1.0.172 1.0.171 1.0.170 1.0.169 1.0.168 1.0.167 1.0.166
No related merge requests found
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 011889ce0d72c5986eddf27760446331 md5sum = 28bf0c4c75c028bed79fc38786831b3e
[profile-common] [profile-common]
filename = instance-common.cfg.in filename = instance-common.cfg.in
...@@ -26,7 +26,7 @@ md5sum = 48d549d1327859cac83536806de8ee99 ...@@ -26,7 +26,7 @@ md5sum = 48d549d1327859cac83536806de8ee99
[profile-caddy-replicate] [profile-caddy-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
md5sum = 9baf4802354309b99d58e45028c90d0f md5sum = 4d4ace1bdad5adcf64d8dbf11d2fa21d
[profile-slave-list] [profile-slave-list]
_update_hash_filename_ = templates/apache-custom-slave-list.cfg.in _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
......
...@@ -230,7 +230,7 @@ config-slave-kedifa-information = ${request-kedifa:connection-slave-kedifa-infor ...@@ -230,7 +230,7 @@ config-slave-kedifa-information = ${request-kedifa:connection-slave-kedifa-infor
config-kedifa-caucase-url = ${request-kedifa:connection-caucase-url} config-kedifa-caucase-url = ${request-kedifa:connection-caucase-url}
config-backend-client-caucase-url = {{ caucase_url }} config-backend-client-caucase-url = {{ caucase_url }}
config-master-key-download-url = ${request-kedifa:connection-master-key-download-url} config-master-key-download-url = ${request-kedifa:connection-master-key-download-url}
config-cluster-identification = {{ cluster_identification }} config-cluster-identification = {{ instance_parameter_dict['root-instance-title'] }}
{# Do not send additional parameters for destroyed nodes #} {# Do not send additional parameters for destroyed nodes #}
{% if state != 'destroyed' %} {% if state != 'destroyed' %}
{% set slave_configuration_dict = slapparameter_dict %} {% set slave_configuration_dict = slapparameter_dict %}
...@@ -327,7 +327,7 @@ config-{{ key }} = {{ dumps(slapparameter_dict[key]) }} ...@@ -327,7 +327,7 @@ config-{{ key }} = {{ dumps(slapparameter_dict[key]) }}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
config-slave-list = {{ dumps(authorized_slave_list) }} config-slave-list = {{ dumps(authorized_slave_list) }}
config-cluster-identification = {{ cluster_identification }} config-cluster-identification = {{ instance_parameter_dict['root-instance-title'] }}
{% set software_url_key = "-kedifa-software-release-url" %} {% set software_url_key = "-kedifa-software-release-url" %}
{% if slapparameter_dict.has_key(software_url_key) %} {% if slapparameter_dict.has_key(software_url_key) %}
...@@ -418,7 +418,7 @@ csr_id = ${directory:aikc}/csr_id ...@@ -418,7 +418,7 @@ csr_id = ${directory:aikc}/csr_id
[aikc-user-csr] [aikc-user-csr]
recipe = plone.recipe.command recipe = plone.recipe.command
organization = {{ cluster_identification }} organization = {{ instance_parameter_dict['root-instance-title'] }}
organizational_unit = Automatic Internal Kedifa Caucase CSR organizational_unit = Automatic Internal Kedifa Caucase CSR
command = command =
if [ ! -f ${:csr} ] && [ ! -f ${:key} ] ; then if [ ! -f ${:csr} ] && [ ! -f ${:key} ] ; then
...@@ -550,7 +550,7 @@ csr_id = ${directory:aibcc}/csr_id ...@@ -550,7 +550,7 @@ csr_id = ${directory:aibcc}/csr_id
[aibcc-user-csr] [aibcc-user-csr]
recipe = plone.recipe.command recipe = plone.recipe.command
organization = {{ cluster_identification }} organization = {{ instance_parameter_dict['root-instance-title'] }}
organizational_unit = Automatic Sign Backend Client Caucase CSR organizational_unit = Automatic Sign Backend Client Caucase CSR
command = command =
if [ ! -f ${:csr} ] && [ ! -f ${:key} ] ; then if [ ! -f ${:csr} ] && [ ! -f ${:key} ] ; then
......
...@@ -54,7 +54,6 @@ extra-context = ...@@ -54,7 +54,6 @@ extra-context =
import subprocess_module subprocess import subprocess_module subprocess
import functools_module functools import functools_module functools
import validators validators import validators validators
key cluster_identification instance-parameter:root-instance-title
# Must match the key id in [switch-softwaretype] which uses this section. # Must match the key id in [switch-softwaretype] which uses this section.
raw software_type RootSoftwareInstance-default-custom-personal-replicate raw software_type RootSoftwareInstance-default-custom-personal-replicate
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment