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
a4f06b9c
Commit
a4f06b9c
authored
Sep 04, 2013
by
Vincent Pelletier
Committed by
Julien Muchembled
Sep 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Drop haproxy-maxconn root instance parameter.
It is superseded by per-zope value, published by Zope partitions.
parent
dfa557e7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+0
-2
No files found.
stack/erp5/buildout.cfg
View file @
a4f06b9c
...
@@ -270,7 +270,7 @@ extra-context =
...
@@ -270,7 +270,7 @@ extra-context =
[template-erp5]
[template-erp5]
< = download-base
< = download-base
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
65e0f7c9e33b9803c24b102136a10f4c
md5sum =
5b11875e6beba48db7d45c5d462a6d2d
[template-neo]
[template-neo]
< = download-base
< = download-base
...
...
stack/erp5/instance-erp5.cfg.in
View file @
a4f06b9c
...
@@ -141,7 +141,6 @@ software-type = balancer
...
@@ -141,7 +141,6 @@ software-type = balancer
sla-computer_guid = {{ slapparameter_dict.get('balancer-computer-guid', computer_id) }}
sla-computer_guid = {{ slapparameter_dict.get('balancer-computer-guid', computer_id) }}
extra-config =
extra-config =
tcpv4-port
tcpv4-port
haproxy-maxconn
haproxy-server-check-path
haproxy-server-check-path
apache-access-control-string
apache-access-control-string
apache-ssl-authentication
apache-ssl-authentication
...
@@ -160,7 +159,6 @@ config-tcpv4-port = {{ dumps(slapparameter_dict.get('', 2150)) }}
...
@@ -160,7 +159,6 @@ config-tcpv4-port = {{ dumps(slapparameter_dict.get('', 2150)) }}
config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}' }}
config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}' }}
{% endfor -%}
{% endfor -%}
# XXX: should those really be same for all families ?
# XXX: should those really be same for all families ?
config-haproxy-maxconn = {{ slapparameter_dict.get('haproxy-maxconn', 1) }}
config-haproxy-server-check-path = {{ slapparameter_dict.get('haproxy-server-check-path', '/%(site-id)s/getId') % {'site-id': site_id} }}
config-haproxy-server-check-path = {{ slapparameter_dict.get('haproxy-server-check-path', '/%(site-id)s/getId') % {'site-id': site_id} }}
config-apache-access-control-string = {{ slapparameter_dict.get('apache-access-control-string', 'all') }}
config-apache-access-control-string = {{ slapparameter_dict.get('apache-access-control-string', 'all') }}
config-apache-ssl-authentication = {{ slapparameter_dict.get('apache-ssl-authentication', '0') }}
config-apache-ssl-authentication = {{ slapparameter_dict.get('apache-ssl-authentication', '0') }}
...
...
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