Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
4b107259
Commit
4b107259
authored
Dec 07, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Fix frontend information per slave
Publish only for active slaves.
parent
96744bb4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-master-publish-slave-information.cfg.in
...frontend/instance-master-publish-slave-information.cfg.in
+6
-3
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
4b107259
...
@@ -34,7 +34,7 @@ md5sum = aba91817a1b58377597500f676603d23
...
@@ -34,7 +34,7 @@ md5sum = aba91817a1b58377597500f676603d23
[profile-master-publish-slave-information]
[profile-master-publish-slave-information]
filename = instance-master-publish-slave-information.cfg.in
filename = instance-master-publish-slave-information.cfg.in
md5sum =
b3422f3624054f57b78d0e50a0de399a
md5sum =
e03eef8feee481256928a0e9249642c5
[template-caddy-frontend-configuration]
[template-caddy-frontend-configuration]
_update_hash_filename_ = templates/Caddyfile.in
_update_hash_filename_ = templates/Caddyfile.in
...
...
software/caddy-frontend/instance-master-publish-slave-information.cfg.in
View file @
4b107259
...
@@ -52,6 +52,11 @@
...
@@ -52,6 +52,11 @@
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
[common-frontend-information]
{% for frontend_key, frontend_value in frontend_information.items() %}
{{ frontend_key }} = {{ frontend_value }}
{% endfor %}
# Publish information for each slave
# Publish information for each slave
{% set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %}
{% set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %}
{% for slave_reference, slave_information in slave_information_dict.items() %}
{% for slave_reference, slave_information in slave_information_dict.items() %}
...
@@ -61,6 +66,7 @@
...
@@ -61,6 +66,7 @@
{% set publish_section_title = 'publish-%s' % slave_reference %}
{% set publish_section_title = 'publish-%s' % slave_reference %}
{% do part_list.append(publish_section_title) %}
{% do part_list.append(publish_section_title) %}
[{{ publish_section_title }}]
[{{ publish_section_title }}]
<= common-frontend-information
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
-slave-reference = {{ slave_reference }}
-slave-reference = {{ slave_reference }}
{% set log_access_url = slave_information.pop('log-access-urls', None) %}
{% set log_access_url = slave_information.pop('log-access-urls', None) %}
...
@@ -72,9 +78,6 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }}
...
@@ -72,9 +78,6 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }}
{{ key }} = {{ dumps(value) }}
{{ key }} = {{ dumps(value) }}
{% endfor %}
{% endfor %}
{% endif %}
{% endif %}
{% for frontend_key, frontend_value in frontend_information.items() %}
{{ frontend_key }} = {{ frontend_value }}
{% endfor %}
{% endfor %}
{% endfor %}
[buildout]
[buildout]
...
...
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