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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Thomas Gambier
slapos
Commits
446b8e84
Commit
446b8e84
authored
Oct 09, 2020
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Drop another duplicated parameter
parent
4146eef0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
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
+3
-3
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 @
446b8e84
...
...
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg.in
md5sum =
9c8ef6434cd36617c51b4245f6968593
md5sum =
011889ce0d72c5986eddf27760446331
[profile-common]
filename = instance-common.cfg.in
...
...
@@ -26,7 +26,7 @@ md5sum = 48d549d1327859cac83536806de8ee99
[profile-caddy-replicate]
filename = instance-apache-replicate.cfg.in
md5sum =
04feda2f6b2f50615384c773843d895e
md5sum =
9baf4802354309b99d58e45028c90d0f
[profile-slave-list]
_update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
446b8e84
...
...
@@ -92,7 +92,7 @@ context =
{% set rejected_slave_title_dict = {} %}
{% set warning_slave_dict = {} %}
{% set used_host_list = [] %}
{% for slave in sorted(
slave_instance_list
) %}
{% for slave in sorted(
instance_parameter_dict['slave-instance-list']
) %}
{% set slave_error_list = [] %}
{% set slave_warning_list = [] %}
{% set slave_server_alias_unclashed = [] %}
...
...
@@ -260,7 +260,7 @@ sla-{{ parameter }} = {{ value }}
<= monitor-publish
recipe = slapos.cookbook:publish
domain = {{ slapparameter_dict.get('domain') }}
slave-amount = {{
slave_instance_list
| length }}
slave-amount = {{
instance_parameter_dict['slave-instance-list']
| length }}
accepted-slave-amount = {{ authorized_slave_list | length }}
rejected-slave-amount = {{ rejected_slave_dict | length }}
backend-client-caucase-url = {{ caucase_url }}
...
...
@@ -365,7 +365,7 @@ sla-{{ key[sla_kedifa_key_length:] }} = {{ slapparameter_dict.pop(key) }}
[active-slave-instance]
{% set active_slave_instance_list = [] %}
{% for slave_instance in
slave_instance_list
%}
{% for slave_instance in
instance_parameter_dict['slave-instance-list']
%}
{# Provide a list of slave titles send by master, in order to filter out already destroyed slaves #}
{# Note: This functionality is not yet covered by tests, please modify with care #}
{% do active_slave_instance_list.append(slave_instance['slave_reference']) %}
...
...
software/caddy-frontend/instance.cfg.in
View file @
446b8e84
...
...
@@ -15,7 +15,6 @@ extra-context =
context =
import json_module json
key slapparameter_dict instance-parameter:configuration
key slave_instance_list instance-parameter:slave-instance-list
section instance_parameter_dict instance-parameter
section software_parameter_dict software-parameter-section
${:extra-context}
...
...
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