Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
2412f59b
Commit
2412f59b
authored
Oct 09, 2020
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Reuse instance_parameter_dict more
parent
446b8e84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+2
-2
software/caddy-frontend/instance-apache-replicate.cfg.in
software/caddy-frontend/instance-apache-replicate.cfg.in
+4
-4
software/caddy-frontend/instance.cfg.in
software/caddy-frontend/instance.cfg.in
+0
-1
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
2412f59b
...
@@ -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
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
2412f59b
...
@@ -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
...
...
software/caddy-frontend/instance.cfg.in
View file @
2412f59b
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment