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
2bf872bf
Commit
2bf872bf
authored
Sep 20, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Generalize internal parameter name
parent
e5a5101e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-master.cfg.in
software/caddy-frontend/instance-master.cfg.in
+3
-3
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
2bf872bf
...
@@ -26,7 +26,7 @@ md5sum = 204ea7abf93694cf3b0f1a08dcd57256
...
@@ -26,7 +26,7 @@ md5sum = 204ea7abf93694cf3b0f1a08dcd57256
[profile-master]
[profile-master]
filename = instance-master.cfg.in
filename = instance-master.cfg.in
md5sum =
895d940da4dd9247a4ca2cbf216375e3
md5sum =
69f38298337aff987eb9b46fc22ec3d4
[profile-slave-list]
[profile-slave-list]
filename = instance-slave-list.cfg.in
filename = instance-slave-list.cfg.in
...
...
software/caddy-frontend/instance-master.cfg.in
View file @
2bf872bf
...
@@ -112,9 +112,9 @@ context =
...
@@ -112,9 +112,9 @@ context =
{% set frontend_section_list = [] %}
{% set frontend_section_list = [] %}
{% set request_dict = {} %}
{% set request_dict = {} %}
# XXX Dirty hack, not possible to define default value before
# XXX Dirty hack, not possible to define default value before
{% set sla_computer_
caddy_
1_key = '-sla-1-computer_guid' %}
{% set sla_computer_1_key = '-sla-1-computer_guid' %}
{% if not sla_computer_
caddy_
1_key in slapparameter_dict %}
{% if not sla_computer_1_key in slapparameter_dict %}
{% do slapparameter_dict.__setitem__(sla_computer_
caddy_
1_key, '${slap-connection:computer-id}') %}
{% do slapparameter_dict.__setitem__(sla_computer_1_key, '${slap-connection:computer-id}') %}
{% endif %}
{% endif %}
{% set sla_computer_kedifa_key = '-sla-kedifa-computer_guid' %}
{% set sla_computer_kedifa_key = '-sla-kedifa-computer_guid' %}
{% if not sla_computer_kedifa_key in slapparameter_dict %}
{% if not sla_computer_kedifa_key in slapparameter_dict %}
...
...
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