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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos
Commits
f01b2aa4
Commit
f01b2aa4
authored
Jan 17, 2024
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XXX recursively set defaults
parent
95b08d34
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
software/rapid-cdn/buildout.hash.cfg
software/rapid-cdn/buildout.hash.cfg
+2
-2
software/rapid-cdn/instance-frontend.cfg.in
software/rapid-cdn/instance-frontend.cfg.in
+0
-1
software/rapid-cdn/instance.cfg.in
software/rapid-cdn/instance.cfg.in
+4
-6
No files found.
software/rapid-cdn/buildout.hash.cfg
View file @
f01b2aa4
...
@@ -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 =
cc5235722643381092f54e610947caed
md5sum =
ea2edd5496ccc65a729a00a8f792ab28
[profile-common]
[profile-common]
filename = instance-common.cfg.in
filename = instance-common.cfg.in
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
...
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend]
[profile-frontend]
filename = instance-frontend.cfg.in
filename = instance-frontend.cfg.in
md5sum =
00b7120eb652e6e4d04046591b156e31
md5sum =
d9083426d271c51edb0ddaf3b335b4f5
[profile-master]
[profile-master]
filename = instance-master.cfg.in
filename = instance-master.cfg.in
...
...
software/rapid-cdn/instance-frontend.cfg.in
View file @
f01b2aa4
{% import "caucase" as caucase with context %}
{% import "caucase" as caucase with context %}
{%- do instance_parameter_dict['configuration'].setdefault('user', {}) %}
{%- do instance_parameter_dict['configuration'].setdefault('user', {}) %}
{%- do instance_parameter_dict['configuration']['user'].update(FRONTEND_USER_DEFAULTS) %}
{%- do instance_parameter_dict['configuration']['user'].update(FRONTEND_USER_DEFAULTS) %}
{%- do instance_parameter_dict['configuration']['user']['global'].update(FRONTEND_GLOBAL_DEFAULTS) %}
{%- set HTTP3_PORT = instance_parameter_dict['configuration']['user']['global']['expert']['advertised-http3-port'] %}
{%- set HTTP3_PORT = instance_parameter_dict['configuration']['user']['global']['expert']['advertised-http3-port'] %}
{%- set FRONTEND_HTTP3 = instance_parameter_dict['configuration']['user']['global']['enable-http3'] %}
{%- set FRONTEND_HTTP3 = instance_parameter_dict['configuration']['user']['global']['enable-http3'] %}
{%- if FRONTEND_HTTP3 %}
{%- if FRONTEND_HTTP3 %}
...
...
software/rapid-cdn/instance.cfg.in
View file @
f01b2aa4
...
@@ -80,14 +80,14 @@ input = {{ software_parameter_dict['instance_slave_input_schema'] }}
...
@@ -80,14 +80,14 @@ input = {{ software_parameter_dict['instance_slave_input_schema'] }}
[instance-frontend-user-default]
[instance-frontend-user-default]
<= schema-json-to-default
<= schema-json-to-default
input = {{ software_parameter_dict['instance_frontend_user_input_schema'] }}
input = {{ software_parameter_dict['instance_frontend_user_input_schema'] }}
input-mapping =
[instance-frontend-global-default]
./instance-frontend-global-input-schema.json {{ software_parameter_dict['instance_frontend_global_input_schema'] }}
<= schema-json-to-default
input = {{ software_parameter_dict['instance_frontend_global_input_schema'] }}
[instance-default]
[instance-default]
<= schema-json-to-default
<= schema-json-to-default
input = {{ software_parameter_dict['instance_input_schema'] }}
input = {{ software_parameter_dict['instance_input_schema'] }}
input-mapping =
./instance-frontend-global-input-schema.json {{ software_parameter_dict['instance_frontend_global_input_schema'] }}
[dynamic-profile-frontend]
[dynamic-profile-frontend]
< = jinja2-template-base
< = jinja2-template-base
...
@@ -98,7 +98,6 @@ extra-context =
...
@@ -98,7 +98,6 @@ extra-context =
raw software_type single-custom-personal
raw software_type single-custom-personal
key SLAVE_DEFAULTS instance-slave-default:defaults
key SLAVE_DEFAULTS instance-slave-default:defaults
key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults
key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults
key FRONTEND_GLOBAL_DEFAULTS instance-frontend-global-default:defaults
[dynamic-profile-master]
[dynamic-profile-master]
< = jinja2-template-base
< = jinja2-template-base
...
@@ -113,7 +112,6 @@ extra-context =
...
@@ -113,7 +112,6 @@ extra-context =
import software_module software
import software_module software
key CLUSTER_DEFAULTS instance-default:defaults
key CLUSTER_DEFAULTS instance-default:defaults
key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults
key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults
key FRONTEND_GLOBAL_DEFAULTS instance-frontend-global-default:defaults
key SLAVE_DEFAULTS instance-slave-default:defaults
key SLAVE_DEFAULTS instance-slave-default:defaults
[dynamic-profile-kedifa]
[dynamic-profile-kedifa]
...
...
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