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
103
Merge Requests
103
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
5e720d5b
Commit
5e720d5b
authored
Oct 08, 2020
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Share parameter_dict
parent
f5b350b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance.cfg.in
software/caddy-frontend/instance.cfg.in
+1
-3
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
5e720d5b
...
@@ -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 =
9540d96bf8fe36091b44b9d6a515b45d
md5sum =
759be07fcebb20f855caf40750fbb59a
[profile-common]
[profile-common]
filename = instance-common.cfg.in
filename = instance-common.cfg.in
...
...
software/caddy-frontend/instance.cfg.in
View file @
5e720d5b
...
@@ -17,6 +17,7 @@ context =
...
@@ -17,6 +17,7 @@ context =
key slapparameter_dict instance-parameter:configuration
key slapparameter_dict instance-parameter:configuration
key slave_instance_list instance-parameter:slave-instance-list
key slave_instance_list instance-parameter:slave-instance-list
section instance_parameter instance-parameter
section instance_parameter instance-parameter
section parameter_dict dynamic-parameter-section
${:extra-context}
${:extra-context}
[switch-softwaretype]
[switch-softwaretype]
...
@@ -41,7 +42,6 @@ filename = instance-caddy-frontend.cfg
...
@@ -41,7 +42,6 @@ filename = instance-caddy-frontend.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
extra-context =
extra-context =
import furl_module furl
import furl_module furl
section parameter_dict dynamic-parameter-section
raw software_type single-custom-personal
raw software_type single-custom-personal
caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
import-list =
import-list =
...
@@ -64,7 +64,6 @@ extra-context =
...
@@ -64,7 +64,6 @@ extra-context =
raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw profile_monitor2 {{ template_frontend_parameter_dict['profile_monitor2'] }}
raw profile_monitor2 {{ template_frontend_parameter_dict['profile_monitor2'] }}
raw profile_common {{ template_frontend_parameter_dict['profile_common'] }}
raw profile_common {{ template_frontend_parameter_dict['profile_common'] }}
section parameter_dict dynamic-parameter-section
caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
import-list =
import-list =
file caucase :caucase-jinja2-library
file caucase :caucase-jinja2-library
...
@@ -75,7 +74,6 @@ template = {{ template_frontend_parameter_dict['profile_kedifa'] }}
...
@@ -75,7 +74,6 @@ template = {{ template_frontend_parameter_dict['profile_kedifa'] }}
filename = instance-kedifa.cfg
filename = instance-kedifa.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
extra-context =
extra-context =
section parameter_dict dynamic-parameter-section
raw software_type kedifa
raw software_type kedifa
caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
caucase-jinja2-library = {{ template_frontend_parameter_dict['caucase_jinja2_library'] }}
import-list =
import-list =
...
...
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