Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
485a875b
Commit
485a875b
authored
Apr 06, 2017
by
Hardik Juneja
Committed by
Rafael Monnerat
Jun 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/erp5: Add monitor stack to erp5 software release
parent
04c27ca1
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
74 additions
and
14 deletions
+74
-14
software/erp5/README.rst
software/erp5/README.rst
+1
-0
software/erp5/software.cfg
software/erp5/software.cfg
+3
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-0
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+8
-8
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+2
-0
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+2
-0
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+46
-6
stack/erp5/instance-kumofs.cfg.in
stack/erp5/instance-kumofs.cfg.in
+2
-0
stack/erp5/instance-mariadb.cfg.in
stack/erp5/instance-mariadb.cfg.in
+3
-0
stack/erp5/instance-zeo.cfg.in
stack/erp5/instance-zeo.cfg.in
+2
-0
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+2
-0
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-0
No files found.
software/erp5/README.rst
View file @
485a875b
...
@@ -95,6 +95,7 @@ This software release assigns the following port ranges by default:
...
@@ -95,6 +95,7 @@ This software release assigns the following port ranges by default:
zeo 2100-2149
zeo 2100-2149
balancer 2150-2199
balancer 2150-2199
zope 2200-*
zope 2200-*
monitor 8386
jupyter 8888
jupyter 8888
==================== ==========
==================== ==========
...
...
software/erp5/software.cfg
View file @
485a875b
[buildout]
[buildout]
extends =
extends =
../../stack/erp5/buildout.cfg
../../stack/erp5/buildout.cfg
[monitor-template]
rendered = ${monitor2-template:rendered}
stack/erp5/buildout.cfg
View file @
485a875b
...
@@ -60,6 +60,7 @@ extends =
...
@@ -60,6 +60,7 @@ extends =
../../component/findutils/buildout.cfg
../../component/findutils/buildout.cfg
../../component/userhosts/buildout.cfg
../../component/userhosts/buildout.cfg
../../component/postfix/buildout.cfg
../../component/postfix/buildout.cfg
../monitor/buildout.cfg
../../software/ipython_notebook/software.cfg
../../software/ipython_notebook/software.cfg
../../software/neoppod/software-common.cfg
../../software/neoppod/software-common.cfg
# keep neoppod extends last
# keep neoppod extends last
...
...
stack/erp5/buildout.hash.cfg
View file @
485a875b
...
@@ -19,15 +19,15 @@ md5sum = 844d62cd6f9d6e3d1d78d52de2b72a49
...
@@ -19,15 +19,15 @@ md5sum = 844d62cd6f9d6e3d1d78d52de2b72a49
[template-mariadb]
[template-mariadb]
filename = instance-mariadb.cfg.in
filename = instance-mariadb.cfg.in
md5sum =
806c31145f1f30bfbb11aef625541f15
md5sum =
354095bdd9851f6fb7eeaf3006b1fe94
[template-kumofs]
[template-kumofs]
filename = instance-kumofs.cfg.in
filename = instance-kumofs.cfg.in
md5sum =
579bfcc29802bbead021a1a79ed569b1
md5sum =
253027f37c4e5bd908e6af551848f03a
[template-cloudooo]
[template-cloudooo]
filename = instance-cloudoo.cfg.in
filename = instance-cloudoo.cfg.in
md5sum =
b9197d7fa0cd5ce0656032b55d3b185b
md5sum =
43253cbfd5d361047ba6a99b116b2370
[template-zope-conf]
[template-zope-conf]
filename = zope.conf.in
filename = zope.conf.in
...
@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
...
@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
8ab417cf1ca98d2840c80a266f0e2be7
md5sum =
3b283bce73339e38ae81d18d257cf0b4
[monitor-template-dummy]
[monitor-template-dummy]
filename = dummy.cfg
filename = dummy.cfg
...
@@ -79,19 +79,19 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
...
@@ -79,19 +79,19 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
14ec590eaaebc90113f1c589ea8dd444
md5sum =
bbb6ae266bf906690513c9996bc17fbc
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
md5sum =
dba1a42bfcc8a9a2cc4e8ac503200e63
md5sum =
2248d249cfc53c73e7c65665d4d53be0
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
b7e92234825f9d72ccb9b6c4745b6ce7
md5sum =
6a64d1615c3ef9f6311c863d5aa0c58f
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
d71c49f91b3455e6866f4b2db59100
9f
md5sum =
3fc9735df6c76bbe1f8505b0be3d5d
9f
[template-haproxy-cfg]
[template-haproxy-cfg]
filename = haproxy.cfg.in
filename = haproxy.cfg.in
...
...
stack/erp5/instance-balancer.cfg.in
View file @
485a875b
...
@@ -159,6 +159,7 @@ recipe = slapos.cookbook:publish.serialised
...
@@ -159,6 +159,7 @@ recipe = slapos.cookbook:publish.serialised
{{ family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ apache_port }}{% endif %}
{{ family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ apache_port }}{% endif %}
{{ family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }}
{{ family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }}
{% endfor -%}
{% endfor -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[apache-ssl]
[apache-ssl]
{% if ssl_parameter_dict.get('key') -%}
{% if ssl_parameter_dict.get('key') -%}
...
@@ -211,6 +212,7 @@ crl = ${:ca-dir}/crl
...
@@ -211,6 +212,7 @@ crl = ${:ca-dir}/crl
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port() }}
monitor-httpd-port = {{ next_port() }}
monitor-title = Balancer monitor
monitor-title = Balancer monitor
password = {{ slapparameter_dict['monitor-passwd'] }}
[buildout]
[buildout]
extends =
extends =
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
485a875b
...
@@ -20,6 +20,7 @@ url = http://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
...
@@ -20,6 +20,7 @@ url = http://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
{% else -%}
{% else -%}
url = http://${cloudooo-instance:ip}:${cloudooo-instance:port}/
url = http://${cloudooo-instance:ip}:${cloudooo-instance:port}/
{% endif -%}
{% endif -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[cloudooo-instance]
[cloudooo-instance]
recipe = slapos.cookbook:generic.cloudooo
recipe = slapos.cookbook:generic.cloudooo
...
@@ -111,6 +112,7 @@ framebuffer = ${:srv}/framebuffer
...
@@ -111,6 +112,7 @@ framebuffer = ${:srv}/framebuffer
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ tcpv4_port + 2 }}
monitor-httpd-port = {{ tcpv4_port + 2 }}
monitor-title = Cloudooo monitor
monitor-title = Cloudooo monitor
password = {{ slapparameter_dict['monitor-passwd'] }}
[binary-link]
[binary-link]
recipe = slapos.cookbook:symbolic.link
recipe = slapos.cookbook:symbolic.link
...
...
stack/erp5/instance-erp5.cfg.in
View file @
485a875b
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
{% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
{% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%}
{% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
{% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
{% set monitor_base_url_list = [] -%}
[request-common]
[request-common]
<= request-common-base
<= request-common-base
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
...
@@ -22,7 +23,10 @@ software-type = {{ software_type }}
...
@@ -22,7 +23,10 @@ software-type = {{ software_type }}
return = {{ ' '.join(ret) }}
return = {{ ' '.join(ret) }}
{% for ret, publish in ret.iteritems() -%}
{% for ret, publish in ret.iteritems() -%}
{% if publish -%}
{% if publish -%}
{% do publish_dict.__setitem__(name ~ '-' ~ ret, '${' ~ section ~ ':connection-' ~ ret ~ '}')%}
{% do publish_dict.__setitem__(name ~ '-' ~ ret, '${' ~ section ~ ':connection-' ~ ret ~ '}') %}
{% endif -%}
{% if ret == "monitor-base-url" -%}
{% do monitor_base_url_list.append('${' ~ section ~ ':connection-' ~ ret ~ '}') -%}
{% endif -%}
{% endif -%}
{% endfor -%}
{% endfor -%}
{{ root_common.sla(name) }}
{{ root_common.sla(name) }}
...
@@ -34,10 +38,10 @@ config-{{ k }} = {{ '${' ~ v ~ '}' }}
...
@@ -34,10 +38,10 @@ config-{{ k }} = {{ '${' ~ v ~ '}' }}
{% endfor -%}
{% endfor -%}
{% endmacro -%}
{% endmacro -%}
{{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}) }}
{{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}
, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}
) }}
{{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}) }}
{{ request('memcached-volatile', 'kumofs', 'memcached', {'tcpv4-port': 2010, 'ram-storage-size': 64}
, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}
) }}
{{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}) }}
{{ request('cloudooo', 'cloudooo', 'cloudooo', {'tcpv4-port': 2020}
, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}
) }}
{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099}, {'database-list': True, 'test-database-list': True}) }}
{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099}, {'database-list': True, 'test-database-list': True
, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'
}) }}
{% if has_posftix -%}
{% if has_posftix -%}
{{ request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'}) }}
{{ request('smtp', 'postfix', 'smtp', {'tcpv4-port': 2025, 'smtpd-sasl-user': 'erp5@nowhere'}, key_config={'smtpd-sasl-password': 'publish-early:smtpd-sasl-password'}) }}
{%- else %}
{%- else %}
...
@@ -74,7 +78,7 @@ connection-url = smtp://127.0.0.2:0/
...
@@ -74,7 +78,7 @@ connection-url = smtp://127.0.0.2:0/
{% else -%}
{% else -%}
{{ assert(server_type == 'zeo', server_type) -}}
{{ assert(server_type == 'zeo', server_type) -}}
{# BBB: for compatibility, keep 'zodb' as partition_reference for ZEO -#}
{# BBB: for compatibility, keep 'zodb' as partition_reference for ZEO -#}
{{ request('zodb', 'zodb-' ~ server_type, 'zodb-' ~ server_type, {'tcpv4-port': 2100, 'zodb-dict': server_dict}, dict.fromkeys(('storage-dict', 'tidstorage-ip', 'tidstorage-port'
))
) }}
{{ request('zodb', 'zodb-' ~ server_type, 'zodb-' ~ server_type, {'tcpv4-port': 2100, 'zodb-dict': server_dict}, dict.fromkeys(('storage-dict', 'tidstorage-ip', 'tidstorage-port'
, 'monitor-base-url')), key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}
) }}
{% endif -%}
{% endif -%}
{% endfor -%}
{% endfor -%}
...
@@ -126,6 +130,7 @@ name = neo-${gen-neo-cluster-base:passwd}
...
@@ -126,6 +130,7 @@ name = neo-${gen-neo-cluster-base:passwd}
return =
return =
zope-address-list
zope-address-list
hosts-dict
hosts-dict
monitor-base-url
{% set bt5_default_list = 'erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc' -%}
{% set bt5_default_list = 'erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc' -%}
{% if has_jupyter -%}
{% if has_jupyter -%}
{% set bt5_default_list = bt5_default_list + ' erp5_data_notebook' -%}
{% set bt5_default_list = bt5_default_list + ' erp5_data_notebook' -%}
...
@@ -141,6 +146,7 @@ config-inituser-login = {{ dumps(inituser_login) }}
...
@@ -141,6 +146,7 @@ config-inituser-login = {{ dumps(inituser_login) }}
config-inituser-password = ${publish-early:inituser-password}
config-inituser-password = ${publish-early:inituser-password}
config-kumofs-url = ${request-memcached-persistent:connection-url}
config-kumofs-url = ${request-memcached-persistent:connection-url}
config-memcached-url = ${request-memcached-volatile:connection-url}
config-memcached-url = ${request-memcached-volatile:connection-url}
config-monitor-passwd = ${monitor-htpasswd:passwd}
config-mysql-test-url-list = ${request-mariadb:connection-test-database-list}
config-mysql-test-url-list = ${request-mariadb:connection-test-database-list}
config-mysql-url-list = ${request-mariadb:connection-database-list}
config-mysql-url-list = ${request-mariadb:connection-database-list}
config-site-id = {{ dumps(site_id) }}
config-site-id = {{ dumps(site_id) }}
...
@@ -176,6 +182,7 @@ software-type = zope
...
@@ -176,6 +182,7 @@ software-type = zope
[{{ section_name }}]
[{{ section_name }}]
<= request-zope-base
<= request-zope-base
name = {{ partition_name }}
name = {{ partition_name }}
{% do monitor_base_url_list.append('${' ~ section_name ~ ':connection-monitor-base-url}') -%}
{{ root_common.sla(partition_name) }}
{{ root_common.sla(partition_name) }}
config-name = {{ dumps(custom_name) }}
config-name = {{ dumps(custom_name) }}
config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
...
@@ -235,10 +242,13 @@ name = balancer
...
@@ -235,10 +242,13 @@ name = balancer
software-type = balancer
software-type = balancer
{{ root_common.sla('balancer') }}
{{ root_common.sla('balancer') }}
return =
return =
monitor-base-url
{%- for family in zope_family_dict %}
{%- for family in zope_family_dict %}
{{ family }}
{{ family }}
{{ family }}-v6
{{ family }}-v6
{% endfor -%}
{% endfor -%}
{% do monitor_base_url_list.append('${' ~ 'request-balancer' ~ ':connection-monitor-base-url}') -%}
config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }}
config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }}
config-tcpv4-port = {{ dumps(balancer_dict.get('tcpv4-port', 2150)) }}
config-tcpv4-port = {{ dumps(balancer_dict.get('tcpv4-port', 2150)) }}
{% for zope_section_id, name in zope_address_list_id_dict.items() -%}
{% for zope_section_id, name in zope_address_list_id_dict.items() -%}
...
@@ -248,6 +258,8 @@ config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}
...
@@ -248,6 +258,8 @@ config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}
config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
config-backend-path = {{ dumps(balancer_dict.get('apache-backend-path', '/') % {'site-id': site_id}) }}
config-backend-path = {{ dumps(balancer_dict.get('apache-backend-path', '/') % {'site-id': site_id}) }}
config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
config-monitor-passwd = ${monitor-htpasswd:passwd}
[request-frontend-base]
[request-frontend-base]
{% if has_frontend -%}
{% if has_frontend -%}
...
@@ -288,4 +300,32 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-
...
@@ -288,4 +300,32 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-
{{ name }} = {{ value }}
{{ name }} = {{ value }}
{% endfor -%}
{% endfor -%}
[buildout]
extends = {{ monitor_template }}
parts +=
monitor-base
[monitor-instance-parameter]
monitor-httpd-port = 8386
{{ root_common.common_section() }}
{{ root_common.common_section() }}
[buildout]
extends =
{{ template_monitor }}
parts +=
monitor-base
[publish-connection-information]
<= monitor-publish
[monitor-conf-parameters]
monitor-title = ERP5 monitor
password = ${monitor-htpasswd:passwd}
[monitor-base-url-dict]
{% for key, value in monitor_base_url_dict.items() -%}
{{ key }} = {{ value }}
{% endfor %}
stack/erp5/instance-kumofs.cfg.in
View file @
485a875b
...
@@ -20,6 +20,7 @@ url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
...
@@ -20,6 +20,7 @@ url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
{% else -%}
{% else -%}
url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
{% endif -%}
{% endif -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[kumofs-instance]
[kumofs-instance]
recipe = slapos.cookbook:generic.kumofs
recipe = slapos.cookbook:generic.kumofs
...
@@ -112,3 +113,4 @@ port = ${kumofs-instance:manager-port}
...
@@ -112,3 +113,4 @@ port = ${kumofs-instance:manager-port}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ tcpv4_port + 4 }}
monitor-httpd-port = {{ tcpv4_port + 4 }}
monitor-title = Kumofs monitor
monitor-title = Kumofs monitor
password = {{ slapparameter_dict['monitor-passwd'] }}
stack/erp5/instance-mariadb.cfg.in
View file @
485a875b
...
@@ -34,6 +34,7 @@ recipe = slapos.cookbook:publish.serialised
...
@@ -34,6 +34,7 @@ recipe = slapos.cookbook:publish.serialised
{% endmacro -%}
{% endmacro -%}
database-list = {{ render_database_list(database_list) }}
database-list = {{ render_database_list(database_list) }}
test-database-list = {{ render_database_list(test_database_list) }}
test-database-list = {{ render_database_list(test_database_list) }}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[publish-early]
[publish-early]
recipe = slapos.cookbook:publish-early
recipe = slapos.cookbook:publish-early
...
@@ -277,10 +278,12 @@ command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened"
...
@@ -277,10 +278,12 @@ command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened"
wrapper-path = ${directory:promise}/mariadb
wrapper-path = ${directory:promise}/mariadb
parameters-extra = true
parameters-extra = true
{% set monitor_passwd = slapparameter_dict['monitor-passwd'] -%}
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ port + 1 }}
monitor-httpd-port = {{ port + 1 }}
monitor-title = Mariadb monitor
monitor-title = Mariadb monitor
password = {{monitor_passwd}}
[buildout]
[buildout]
extends =
extends =
...
...
stack/erp5/instance-zeo.cfg.in
View file @
485a875b
...
@@ -113,6 +113,7 @@ tidstorage-port = ${tidstorage:port}
...
@@ -113,6 +113,7 @@ tidstorage-port = ${tidstorage:port}
tidstorage-ip =
tidstorage-ip =
tidstorage-port =
tidstorage-port =
{% endif -%}
{% endif -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
# Used for ERP5 resiliency or (more probably)
# Used for ERP5 resiliency or (more probably)
# webrunner resiliency with erp5 inside.
# webrunner resiliency with erp5 inside.
...
@@ -185,6 +186,7 @@ tidstorage = {{ tidstorage_repozo_path }}
...
@@ -185,6 +186,7 @@ tidstorage = {{ tidstorage_repozo_path }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port() }}
monitor-httpd-port = {{ next_port() }}
monitor-title = ZODB monitor
monitor-title = ZODB monitor
password = {{ slapparameter_dict['monitor-passwd'] }}
[buildout]
[buildout]
extends =
extends =
...
...
stack/erp5/instance-zope.cfg.in
View file @
485a875b
...
@@ -379,6 +379,7 @@ dict toward erp5 partition, violating the DRY principle and making the intent
...
@@ -379,6 +379,7 @@ dict toward erp5 partition, violating the DRY principle and making the intent
hard to guess.
hard to guess.
-#}
-#}
hosts-dict = {{ dumps(hosts_dict) }}
hosts-dict = {{ dumps(hosts_dict) }}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[erp5-promise]
[erp5-promise]
recipe = slapos.cookbook:erp5.promise
recipe = slapos.cookbook:erp5.promise
...
@@ -394,6 +395,7 @@ bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
...
@@ -394,6 +395,7 @@ bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port() }}
monitor-httpd-port = {{ next_port() }}
monitor-title = Zope monitor
monitor-title = Zope monitor
password = {{ slapparameter_dict['monitor-passwd'] }}
[buildout]
[buildout]
extends =
extends =
...
...
stack/erp5/instance.cfg.in
View file @
485a875b
...
@@ -72,6 +72,7 @@ extra-context =
...
@@ -72,6 +72,7 @@ extra-context =
[dynamic-template-erp5-parameters]
[dynamic-template-erp5-parameters]
jupyter-enable-default = {{ jupyter_enable_default }}
jupyter-enable-default = {{ jupyter_enable_default }}
local-bt5-repository = {{ local_bt5_repository }}
local-bt5-repository = {{ local_bt5_repository }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-erp5]
[dynamic-template-erp5]
<= jinja2-template-base
<= jinja2-template-base
...
@@ -80,6 +81,7 @@ filename = instance-erp5.cfg
...
@@ -80,6 +81,7 @@ filename = instance-erp5.cfg
extra-context =
extra-context =
key jupyter_enable_default dynamic-template-erp5-parameters:jupyter-enable-default
key jupyter_enable_default dynamic-template-erp5-parameters:jupyter-enable-default
key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
key template_monitor dynamic-template-erp5-parameters:template-monitor
key openssl_location :openssl-location
key openssl_location :openssl-location
import urlparse urlparse
import urlparse urlparse
import-list =
import-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