Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
aaefd3fc
Commit
aaefd3fc
authored
Dec 08, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: software-type default goes to custom-personal
parent
678d50bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/instance-apache-replicate.cfg.in
software/apache-frontend/instance-apache-replicate.cfg.in
+3
-1
No files found.
software/apache-frontend/common.cfg
View file @
aaefd3fc
...
@@ -72,7 +72,7 @@ mode = 0644
...
@@ -72,7 +72,7 @@ mode = 0644
[template-apache-replicate]
[template-apache-replicate]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
md5sum =
aafa98333cd51025938b33c2516f0b8d
md5sum =
bf3de2d814110d4af8efb5b7b165665b
mode = 0644
mode = 0644
[template-slave-list]
[template-slave-list]
...
...
software/apache-frontend/instance-apache-replicate.cfg.in
View file @
aaefd3fc
...
@@ -15,7 +15,9 @@ context =
...
@@ -15,7 +15,9 @@ context =
{% set part_list = [] -%}
{% set part_list = [] -%}
{% set single_type_key = 'single-' %}
{% set single_type_key = 'single-' %}
{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
{% set frontend_type = slapparameter_dict.pop('-frontend-type', 'single-default') -%}
{% set frontend_type = slapparameter_dict.pop('-frontend-type', 'custom-personal') -%}
{% elif slap_software_type == 'default' -%}
{% set frontend_type = "%s%s" % (single_type_key, 'custom-personal') -%}
{% else -%}
{% else -%}
{% set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
{% set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
{% endif -%}
{% endif -%}
...
...
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