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
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
Tatuya Kamada
slapos
Commits
8a6c47bc
Commit
8a6c47bc
authored
Aug 30, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: support RootSoftwareInstance type
parent
06cb3507
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
software/apache-frontend/instance-apache-frontend.cfg
software/apache-frontend/instance-apache-frontend.cfg
+2
-1
software/apache-frontend/templates/apache-default-slave-list.cfg.in
...pache-frontend/templates/apache-default-slave-list.cfg.in
+1
-1
No files found.
software/apache-frontend/instance-apache-frontend.cfg
View file @
8a6c47bc
...
...
@@ -175,7 +175,8 @@ extra-context =
raw template_slave_configuration ${template-default-slave-virtualhost:target}
raw empty_template ${template-empty:target}
raw template_rewrite_cached ${template-rewrite-cached:target}
raw software_type default
raw software_type1 default
raw software_type2 RootSoftwareInstance
[dynamic-virtualhost-template-slave]
<= jinja2-template-base
...
...
software/apache-frontend/templates/apache-default-slave-list.cfg.in
View file @
8a6c47bc
{% if s
oftware_type == slap_software_type
-%}
{% if s
lap_software_type in (software_type1, software_type2)
-%}
{% set cached_server_dict = {} -%}
{% set part_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