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
Aurel
slapos
Commits
5ac66a4c
Commit
5ac66a4c
authored
Oct 09, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Run only on proper software type
parent
33397e5d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+2
-0
software/caddy-frontend/instance.cfg.in
software/caddy-frontend/instance.cfg.in
+1
-0
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
5ac66a4c
...
@@ -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 =
bce721468b4c16294404cac8b88356c0
md5sum =
d43a1631bcd0f4307507268a06f0fac2
[template-common]
[template-common]
filename = instance-common.cfg.in
filename = instance-common.cfg.in
...
...
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
5ac66a4c
{%- if slap_software_type == software_type -%}
{%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%}
{%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%}
[buildout]
[buildout]
extends =
extends =
...
@@ -755,3 +756,4 @@ extra-context =
...
@@ -755,3 +756,4 @@ extra-context =
{{ key.replace('configuration.', '') }} = {{ dumps(value) }}
{{ key.replace('configuration.', '') }} = {{ dumps(value) }}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endfor -%}
{%- endif -%} {# if slap_software_type == software_type #}
software/caddy-frontend/instance.cfg.in
View file @
5ac66a4c
...
@@ -41,6 +41,7 @@ filename = instance-caddy-frontend.cfg
...
@@ -41,6 +41,7 @@ filename = instance-caddy-frontend.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
extra-context =
extra-context =
section parameter_dict dynamic-template-caddy-frontend-parameters
section parameter_dict dynamic-template-caddy-frontend-parameters
raw software_type single-custom-personal
[dynamic-template-caddy-replicate]
[dynamic-template-caddy-replicate]
< = jinja2-template-base
< = jinja2-template-base
...
...
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