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
isaak yansane-sisk
slapos
Commits
1b6277c5
Commit
1b6277c5
authored
Aug 01, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: add default values for parameter in replicate
parent
f27a5a23
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
software/apache-frontend/instance-apache-replicate.cfg.in
software/apache-frontend/instance-apache-replicate.cfg.in
+4
-0
software/apache-frontend/templates/apache-custom-slave-list.cfg.in
...apache-frontend/templates/apache-custom-slave-list.cfg.in
+1
-2
No files found.
software/apache-frontend/instance-apache-replicate.cfg.in
View file @
1b6277c5
...
@@ -112,5 +112,9 @@ software_release_url = ${slap-connection:software-release-url}
...
@@ -112,5 +112,9 @@ software_release_url = ${slap-connection:software-release-url}
key_file = ${slap-connection:key-file}
key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file}
cert_file = ${slap-connection:cert-file}
[slap-parameter]
slave_instance_list =
-frontend-quantity = 2
-frontend-type = default
{%- endif %}
{%- endif %}
software/apache-frontend/templates/apache-custom-slave-list.cfg.in
View file @
1b6277c5
...
@@ -80,7 +80,7 @@ recipe = slapos.cookbook:publish
...
@@ -80,7 +80,7 @@ recipe = slapos.cookbook:publish
public-ipv4 = {{ public_ipv4 }}
public-ipv4 = {{ public_ipv4 }}
slave-reference = {{ slave_instance.get('slave_reference') }}
slave-reference = {{ slave_instance.get('slave_reference') }}
{% else -%}
{% else -%}
{% do slave_instance_information_list.append({'slave-reference':slave_instance.get('slave_reference'), 'public-ipv4':public_ipv4
, 'domain':slave_instance.get('domain'), 'url':"http://%s" % slave_instance.get('domain'), 'site_url':"http://%s" % slave_instance.get('domain')
}) -%}
{% do slave_instance_information_list.append({'slave-reference':slave_instance.get('slave_reference'), 'public-ipv4':public_ipv4}) -%}
{% endif -%}
{% endif -%}
{% endfor -%}
{% endfor -%}
...
@@ -91,7 +91,6 @@ slave-reference = {{ slave_instance.get('slave_reference') }}
...
@@ -91,7 +91,6 @@ slave-reference = {{ slave_instance.get('slave_reference') }}
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
public-ipv4 = {{ public_ipv4 }}
public-ipv4 = {{ public_ipv4 }}
private-ipv4 = {{ local_ipv4 }}
private-ipv4 = {{ local_ipv4 }}
domain = {{ domain }}
{% if extra_slave_instance_list -%}
{% if extra_slave_instance_list -%}
slave-instance-information-list = {{ json_module.dumps(slave_instance_information_list) }}
slave-instance-information-list = {{ json_module.dumps(slave_instance_information_list) }}
{% 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