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
Valentin Benozillo
slapos
Commits
01d5ebd9
Commit
01d5ebd9
authored
Oct 05, 2015
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: make erp5 stack monitor friendly
parent
706801f2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
58 additions
and
17 deletions
+58
-17
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+6
-6
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+8
-1
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+10
-3
stack/erp5/instance-kumofs.cfg.in
stack/erp5/instance-kumofs.cfg.in
+10
-3
stack/erp5/instance-zeo.cfg.in
stack/erp5/instance-zeo.cfg.in
+9
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+10
-3
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+5
-0
No files found.
stack/erp5/buildout.cfg
View file @
01d5ebd9
...
...
@@ -160,12 +160,12 @@ link-binary =
[template-kumofs]
<= download-base
filename = instance-kumofs.cfg.in
md5sum = 7
d9760fe65f454700342eeffec14c884
md5sum = 7
63db0c4a94649296e74fe1f53c03940
[template-cloudooo]
<= download-base
filename = instance-cloudoo.cfg.in
md5sum =
8468648aa91712f0349baa1ad0c8ccdf
md5sum =
1b515056c5892a86d4ece252ad114a97
[template-zope-conf]
<= download-base
...
...
@@ -222,7 +222,7 @@ recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe
rendered = ${buildout:directory}/template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
708a721558f9bbe8856482e60891b4c7
md5sum =
540956c635acc9707045510c11f80016
mode = 640
context =
key mariadb_link_binary template-mariadb:link-binary
...
...
@@ -321,12 +321,12 @@ md5sum = 78c2db733e72c4197a90e8be1ff15098
[template-zeo]
<= download-base
filename = instance-zeo.cfg.in
md5sum = 9
670cf63099e2c520017a23defff51a4
md5sum = 9
85c0010db6b553a89dbdb31353c56f5
[template-zope]
<= download-base
filename = instance-zope.cfg.in
md5sum =
f11c877cf2fd9b03aa2687cec017a87b
md5sum =
0cd033da89a79c5b26dc0342ea57d5f7
link-binary =
${aspell:location}/bin/aspell
${dmtx-utils:location}/bin/dmtxwrite
...
...
@@ -350,7 +350,7 @@ link-binary =
[template-balancer]
<= download-base
filename = instance-balancer.cfg.in
md5sum =
3628f0ba358e7ee96a8d0185c4775911
md5sum =
28c04f599cdbdfa97f2a67156f4f6b67
[template-apache-conf]
<= download-base
...
...
stack/erp5/instance-balancer.cfg.in
View file @
01d5ebd9
...
...
@@ -206,8 +206,15 @@ certs = ${:ca-dir}/certs
newcerts = ${:ca-dir}/newcerts
crl = ${:ca-dir}/crl
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port }}
monitor-title = Balancer monitor
[buildout]
extends = {{ logrotate_cfg }}
extends =
{{ logrotate_cfg }}
{{ parameter_dict['template-monitor'] }}
parts +=
publish
logrotate-apache
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
01d5ebd9
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
[buildout]
parts =
publish-cloudooo-connection-information
extends =
{{ parameter_dict['template-monitor'] }}
parts +=
publish
cloudooo-instance
resiliency-exclude-file
promise
promise-openoffice
{% if use_ipv6 %}promise-tunnel{% endif %}
[publish
-cloudooo-connection-information
]
[publish]
recipe = slapos.cookbook:publish.serialised
{% if use_ipv6 -%}
url = cloudooo://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
...
...
@@ -99,3 +101,8 @@ service = ${:etc}/run
promise = ${:etc}/promise
cloudooo-data = ${:srv}/cloudooo
font = ${:srv}/font
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ tcpv4_port + 2 }}
monitor-title = Cloudooo monitor
stack/erp5/instance-kumofs.cfg.in
View file @
01d5ebd9
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
[buildout]
extends = {{ logrotate_cfg }}
extends =
{{ logrotate_cfg }}
{{ parameter_dict['template-monitor'] }}
parts +=
publish
-kumofs-connection-information
publish
kumofs-instance
logrotate-entry-kumofs
resiliency-exclude-file
...
...
@@ -11,7 +13,7 @@ parts +=
promise-kumofs-gateway
promise-kumofs-manager
[publish
-kumofs-connection-information
]
[publish]
recipe = slapos.cookbook:publish.serialised
{% if use_ipv6 -%}
url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
...
...
@@ -106,3 +108,8 @@ port = ${kumofs-instance:gateway-port}
<= promise-template
path = ${directory:promise}/kumofs-manager
port = ${kumofs-instance:manager-port}
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ tcpv4_port + 4 }}
monitor-title = Kumofs monitor
stack/erp5/instance-zeo.cfg.in
View file @
01d5ebd9
...
...
@@ -185,8 +185,16 @@ backup-zodb = {{ default_backup_path }}
zodb = {{ default_zodb_path }}
tidstorage = {{ tidstorage_repozo_path }}
{% set next_port = next_port + 1 -%}
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port }}
monitor-title = ZODB monitor
[buildout]
extends = {{ logrotate_cfg }}
extends =
{{ logrotate_cfg }}
{{ parameter_dict['template-monitor'] }}
parts +=
{{ part_list | join('\n ') }}
publish
stack/erp5/instance-zope.cfg.in
View file @
01d5ebd9
...
...
@@ -353,7 +353,7 @@ post = {{ bin_directory }}/slapos-kill --pidfile {{ '${' ~ conf_parameter_name ~
{% set next_port = next_port + 1 -%}
{% endfor -%}
[publish
-zope
]
[publish]
recipe = slapos.cookbook:publish.serialised
zope-address-list = {{ dumps(publish_list) }}
{#
...
...
@@ -375,12 +375,19 @@ smtp-url = {{ dumps(slapparameter_dict['smtp-url']) }}
bt5 = {{ dumps(slapparameter_dict['bt5']) }}
bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-port = {{ next_port }}
monitor-title = Zope monitor
[buildout]
extends = {{ logrotate_cfg }}
extends =
{{ logrotate_cfg }}
{{ parameter_dict['template-monitor'] }}
parts +=
erp5-promise
{{ part_list | join('\n ') }}
publish
-zope
publish
versions = versions
[versions]
...
...
stack/erp5/instance.cfg.in
View file @
01d5ebd9
...
...
@@ -36,6 +36,7 @@ fonts = {{ fonts_location }}
buildout-bin-directory = {{ buildout_bin_directory }}
6tunnel = {{ sixtunnel_location }}
dash = {{ dash_location }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-cloudooo]
<= jinja2-template-base
...
...
@@ -84,6 +85,7 @@ bin-directory = {{ bin_directory }}
dash = {{ dash_location }}
template-haproxy-cfg = {{ template_haproxy_cfg }}
template-apache-conf = {{ template_apache_conf }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-balancer]
<= jinja2-template-base
...
...
@@ -94,6 +96,7 @@ extra-context =
[dynamic-template-zeo-parameters]
buildout-bin-directory = {{ buildout_bin_directory }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-zeo]
<= jinja2-template-base
...
...
@@ -115,6 +118,7 @@ jsl = {{ jsl_location }}
link-binary = {{ dumps(zope_link_binary) }}
userhosts = {{ userhosts_location }}
runzope-userhosts-preloaded-template = {{ template_runzope_userhosts_preloaded }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-zope]
<= jinja2-template-base
...
...
@@ -131,6 +135,7 @@ dcron-location = {{ dcron_location }}
gzip-location = {{ gzip_location }}
kumo-location = {{ kumo_location }}
logrotate-location = {{ logrotate_location }}
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-kumofs]
<= jinja2-template-base
...
...
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