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
011857f5
Commit
011857f5
authored
9 years ago
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix undefinedError for monitor port
parent
8f47ccd0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+3
-1
software/slapos-master/software.cfg
software/slapos-master/software.cfg
+1
-1
No files found.
software/slapos-master/instance-erp5.cfg.in
View file @
011857f5
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
{% set monitor_port = monitor_dict.get('port-base', 2600) %}
{% set monitor_port = monitor_dict.get('port-base', 2600) %}
{% if mariadb_dict.get('monitor', False) -%}
{% if mariadb_dict.get('monitor', False) -%}
{% do mariadb_request_dict.__setitem__('monitor-port', mariadb_dict.get('monitor-port', monitor_port)) -%}
{% do mariadb_request_dict.__setitem__('monitor-port', mariadb_dict.get('monitor-port', monitor_port)) -%}
{% set monitor_port_balancer = monitor_port + 1 -%}
{% endif -%}
{% endif -%}
{% set monitor_port_balancer = monitor_port + 1 -%}
{% set port_count = 2 -%}
{% set port_count = 2 -%}
[request-common]
[request-common]
...
@@ -178,7 +178,9 @@ config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-ch
...
@@ -178,7 +178,9 @@ config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-ch
config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
config-certificate-authority-path = ${directory:ca-dir}
config-certificate-authority-path = ${directory:ca-dir}
config-monitor = {{ dumps(slapparameter_dict.get('monitoring', True)) }}
config-monitor = {{ dumps(slapparameter_dict.get('monitoring', True)) }}
{% if slapparameter_dict.get('monitoring', True) -%}
config-monitor-port = {{ monitor_port_balancer }}
config-monitor-port = {{ monitor_port_balancer }}
{% endif -%}
[request-frontend-base]
[request-frontend-base]
{% if has_frontend -%}
{% if has_frontend -%}
...
...
This diff is collapsed.
Click to expand it.
software/slapos-master/software.cfg
View file @
011857f5
...
@@ -72,7 +72,7 @@ mode = 644
...
@@ -72,7 +72,7 @@ mode = 644
[template-erp5]
[template-erp5]
< = download-base-part
< = download-base-part
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
cf1fc493af0513e02ab106bc864b5d28
md5sum =
5051f8989f37965b1dd974d115feab3d
[template-balancer]
[template-balancer]
< = download-base-part
< = download-base-part
...
...
This diff is collapsed.
Click to expand it.
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