Commit 76f2de1e authored by Tristan Cavelier's avatar Tristan Cavelier

erp5: add monitor to zope to access to the logs

parent efe26765
...@@ -251,7 +251,7 @@ md5sum = ba1b23177e101b5b9f03e1c5009c81fc ...@@ -251,7 +251,7 @@ md5sum = ba1b23177e101b5b9f03e1c5009c81fc
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = f73cce70701c9dd67fe5881f2799d467 md5sum = c11d617e7b829f9a5844a7eebc4edb0e
extra-context = extra-context =
key mariadb_link_binary template-mariadb:link-binary key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary key zope_link_binary template-zope:link-binary
...@@ -306,6 +306,7 @@ extra-context = ...@@ -306,6 +306,7 @@ extra-context =
key template_logrotate_base template-logrotate-base:rendered key template_logrotate_base template-logrotate-base:rendered
key template_mariadb template-mariadb:target key template_mariadb template-mariadb:target
key template_mariadb_initial_setup template-mariadb-initial-setup:target key template_mariadb_initial_setup template-mariadb-initial-setup:target
key template_monitor monitor-template:output
key template_my_cnf template-my-cnf:target key template_my_cnf template-my-cnf:target
key template_neo template-neo:target key template_neo template-neo:target
key template_zeo template-zeo:target key template_zeo template-zeo:target
...@@ -332,7 +333,7 @@ md5sum = 7bbb690cb2ea38cd2aa84c8a79c50399 ...@@ -332,7 +333,7 @@ md5sum = 7bbb690cb2ea38cd2aa84c8a79c50399
[template-zope] [template-zope]
< = download-base < = download-base
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 19e0e41fa4b2674a67f2cfb2562524c8 md5sum = 7274bf350c1df30bc3c5faea114dbe06
link-binary = link-binary =
${aspell:location}/bin/aspell ${aspell:location}/bin/aspell
${coreutils:location}/bin/basename ${coreutils:location}/bin/basename
......
...@@ -78,6 +78,7 @@ ca-private = ${:ca-dir}/private ...@@ -78,6 +78,7 @@ ca-private = ${:ca-dir}/private
ca-certs = ${:ca-dir}/certs ca-certs = ${:ca-dir}/certs
ca-newcerts = ${:ca-dir}/newcerts ca-newcerts = ${:ca-dir}/newcerts
ca-crl = ${:ca-dir}/crl ca-crl = ${:ca-dir}/crl
logrotate-backup = ${:var}/logrotate
[binary-link] [binary-link]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
...@@ -98,6 +99,25 @@ recipe = slapos.cookbook:certificate_authority ...@@ -98,6 +99,25 @@ recipe = slapos.cookbook:certificate_authority
openssl-binary = ${binary-link:target-directory}/openssl openssl-binary = ${binary-link:target-directory}/openssl
wrapper = ${directory:services}/ca wrapper = ${directory:services}/ca
[{{ section('monitor-current-log-access') }}]
< = monitor-directory-access
source = ${directory:log}
[{{ section('monitor-backup-log-access') }}]
< = monitor-directory-access
source = ${directory:logrotate-backup}
[monitor-parameters]
port = {{ slapparameter_dict['port-base'] + 5000 }}
[public]
recipe = slapos.cookbook:zero-knowledge.write
filename = knowledge0.cfg
[zero-parameters]
recipe = slapos.cookbook:zero-knowledge.read
filename = $${public:filename}
{% if use_ipv6 -%} {% if use_ipv6 -%}
{% set ipv6 = (ipv6_set | list)[0] -%} {% set ipv6 = (ipv6_set | list)[0] -%}
[zeo-tunnel-base] [zeo-tunnel-base]
...@@ -287,6 +307,7 @@ post = {{ bin_directory }}/killpidfromfile {{ '${' ~ conf_parameter_name ~ ':pid ...@@ -287,6 +307,7 @@ post = {{ bin_directory }}/killpidfromfile {{ '${' ~ conf_parameter_name ~ ':pid
[publish-zope] [publish-zope]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
zope-address-list = {{ dumps(publish_list) }} zope-address-list = {{ dumps(publish_list) }}
monitor-url = ${publish-connection-informations:monitor_url}
[erp5-promise] [erp5-promise]
recipe = slapos.cookbook:erp5.promise recipe = slapos.cookbook:erp5.promise
...@@ -303,8 +324,24 @@ eggs-directory = {{ eggs_directory }} ...@@ -303,8 +324,24 @@ eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
extends = extends =
{{ parameter_dict['instance-logrotate-cfg'] }} {{ parameter_dict['instance-logrotate-cfg'] }}
{{ parameter_dict['template-monitor'] }}
parts += parts +=
erp5-promise erp5-promise
certificate-authority
cron-entry-monitor
cron-entry-rss
deploy-index
# deploy-settings-cgi
# deploy-status-cgi
# deploy-status-history-cgi
setup-static-files
certificate-authority
zero-parameters
public-symlink
cgi-httpd-wrapper
cgi-httpd-graceful-wrapper
monitor-promise
monitor-instance-log-access
{{ part_list | join('\n ') }} {{ part_list | join('\n ') }}
publish-zope publish-zope
versions = versions versions = versions
......
...@@ -141,6 +141,7 @@ buildout-bin-directory = {{ buildout_bin_directory }} ...@@ -141,6 +141,7 @@ buildout-bin-directory = {{ buildout_bin_directory }}
dash = {{ dash_location }} dash = {{ dash_location }}
jsl = {{ jsl_location }} jsl = {{ jsl_location }}
link-binary = {{ dumps(zope_link_binary) }} link-binary = {{ dumps(zope_link_binary) }}
template-monitor = {{ template_monitor }}
[dynamic-template-zope] [dynamic-template-zope]
< = jinja2-template-base < = jinja2-template-base
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment