Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SlapOS Develop
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
Eric Zheng
SlapOS Develop
Commits
55036ec3
Commit
55036ec3
authored
Dec 03, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-master: Minor fix on the dict.get
direct access fail on the new buildout.
parent
4c125ca1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/slapos-master/buildout.hash.cfg
software/slapos-master/buildout.hash.cfg
+1
-1
software/slapos-master/instance-balancer.cfg.in
software/slapos-master/instance-balancer.cfg.in
+2
-2
No files found.
software/slapos-master/buildout.hash.cfg
View file @
55036ec3
...
@@ -18,7 +18,7 @@ md5sum = a617197b7be3cc40d97a97c75f923a48
...
@@ -18,7 +18,7 @@ md5sum = a617197b7be3cc40d97a97c75f923a48
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
e7c4ba2beafc3a976254e7da22825c9e
md5sum =
0f0ff00eca0b2ba1f1626b6415acb719
[template-apache-backend-conf]
[template-apache-backend-conf]
filename = apache-backend.conf.in
filename = apache-backend.conf.in
...
...
software/slapos-master/instance-balancer.cfg.in
View file @
55036ec3
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
{% set caucase_url = slapparameter_dict.get('caucase-url', '') -%}
{% set caucase_url = slapparameter_dict.get('caucase-url', '') -%}
{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
{% set shared_ca_path = slapparameter_dict
['shared-certificate-authority-path']
-%}
{% set shared_ca_path = slapparameter_dict
.get('shared-certificate-authority-path')
-%}
{#
{#
XXX: This template only supports exactly one IPv4 and (if ipv6 is used) one IPv6
XXX: This template only supports exactly one IPv4 and (if ipv6 is used) one IPv6
per partition. No more (undefined result), no less (IndexError).
per partition. No more (undefined result), no less (IndexError).
...
@@ -104,6 +104,7 @@ ipv4 = {{ ipv4 }}
...
@@ -104,6 +104,7 @@ ipv4 = {{ ipv4 }}
{% for family_name, parameter_id_list in sorted(
{% for family_name, parameter_id_list in sorted(
slapparameter_dict['zope-family-dict'].iteritems()) -%}
slapparameter_dict['zope-family-dict'].iteritems()) -%}
{% set zope_family_address_list = [] -%}
{% set zope_family_address_list = [] -%}
{% set ssl_authentication = slapparameter_dict['ssl-authentication-dict'].get(family_name, False) -%}
{% set has_webdav = [] -%}
{% set has_webdav = [] -%}
{% for parameter_id in parameter_id_list -%}
{% for parameter_id in parameter_id_list -%}
{% set zope_address_list = slapparameter_dict[parameter_id] -%}
{% set zope_address_list = slapparameter_dict[parameter_id] -%}
...
@@ -162,7 +163,6 @@ ipv6 = {{ zope_address.split(']:')[0][1:] }}
...
@@ -162,7 +163,6 @@ ipv6 = {{ zope_address.split(']:')[0][1:] }}
{% set internal_scheme = 'http' -%}
{% set internal_scheme = 'http' -%}
{% set external_scheme = 'https' -%}
{% set external_scheme = 'https' -%}
{% endif -%}
{% endif -%}
{% set ssl_authentication = slapparameter_dict['ssl-authentication-dict'].get(family_name, False) -%}
{% do apache_dict.__setitem__(family_name, (next_port(), external_scheme, internal_scheme ~ '://' ~ ipv4 ~ ':' ~ haproxy_port ~ backend_path, ssl_authentication)) -%}
{% do apache_dict.__setitem__(family_name, (next_port(), external_scheme, internal_scheme ~ '://' ~ ipv4 ~ ':' ~ haproxy_port ~ backend_path, ssl_authentication)) -%}
{% endfor -%}
{% endfor -%}
...
...
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