Commit 6d123f21 authored by Jérome Perrin's avatar Jérome Perrin

Fix softwares installing same paths more than once

Since `buildout 2.7.1+slapos002`, we `Check that sections don't installed the same path`, so we need to adjust some profiles which were not respecting this rule.

This fixes the regression introduced by nexedi/slapos@bbd70f7d

See merge request !726
parents 37fc43c3 854057ce
Pipeline #8797 failed with stage
...@@ -30,7 +30,7 @@ md5sum = 087bd9404cd120bd7602a9fbfcddc064 ...@@ -30,7 +30,7 @@ md5sum = 087bd9404cd120bd7602a9fbfcddc064
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = 46e0ccb54c2406b8a44cdada73c061a6 md5sum = 29a61267959cc9ba7cdcd96fef41641a
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
......
...@@ -16,6 +16,7 @@ extends = ...@@ -16,6 +16,7 @@ extends =
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
parts += parts +=
caucase-eggs
template template
template-caddy-frontend template-caddy-frontend
template-caddy-replicate template-caddy-replicate
...@@ -78,7 +79,6 @@ eggs = ...@@ -78,7 +79,6 @@ eggs =
eggs += eggs +=
websockify websockify
erp5.util erp5.util
${caucase-eggs:eggs}
collective.recipe.shelloutput collective.recipe.shelloutput
[template-common] [template-common]
......
...@@ -154,7 +154,7 @@ create = true ...@@ -154,7 +154,7 @@ create = true
<= logrotate-entry-base <= logrotate-entry-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}} log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
backup = {{ slave_log_folder }} backup = {{ slave_log_folder }}
{% if enable_cache %} {% if enable_cache %}
[{{slave_logrotate_cache_direct_section}}] [{{slave_logrotate_cache_direct_section}}]
<= logrotate-entry-base <= logrotate-entry-base
...@@ -352,15 +352,6 @@ recipe = slapos.cookbook:mkdirectory ...@@ -352,15 +352,6 @@ recipe = slapos.cookbook:mkdirectory
{% do part_list.append('slave-log-cache-direct-directories') %} {% do part_list.append('slave-log-cache-direct-directories') %}
[caddy-log-access]
< = jinja2-template-base
template = {{frontend_configuration.get('template-log-access')}}
rendered = {{frontend_configuration.get('log-access-configuration')}}
extra-context =
section slave_log_directory slave-log-directory-dict
section slave_password slave-password
section parameter_dict caddy-log-access-parameters
{% do part_list.append('caddy-log-access') %} {% do part_list.append('caddy-log-access') %}
############################################### ###############################################
...@@ -474,26 +465,28 @@ template = inline: ...@@ -474,26 +465,28 @@ template = inline:
rendered = ${:file} rendered = ${:file}
[caddy-log-access-header] [caddy-log-access-empty]
# Caddy refuse to start if an `import`ed file is empty, so we prepend a header # Caddy refuse to start if an `import`ed file is empty, so we prepend a header
# so that the file is never empty. # so that the file is never empty.
< = jinja2-template-base < = jinja2-template-base
template = inline: # This file contain directives to serve directories with log files template = inline: # This file contain directives to serve directories with log files for shared instances, but no shared instances are defined yet.
rendered = {{frontend_configuration.get('log-access-configuration')}} rendered = {{frontend_configuration.get('log-access-configuration')}}
[buildout] [buildout]
extends = extends =
{{ common_profile }} {{ common_profile }}
{{ logrotate_base_instance }} {{ logrotate_base_instance }}
{{ monitor_template }} {{ monitor_template }}
parts += parts +=
kedifa-updater kedifa-updater
kedifa-updater-run kedifa-updater-run
caddy-log-access-header
{% for part in part_list %} {% for part in part_list %}
{{ ' %s' % part }} {{ ' %s' % part }}
{% endfor %} {% endfor %}
{% if 'caddy-log-access' not in part_list %}
caddy-log-access-empty
{% endif %}
publish-caddy-information publish-caddy-information
tunnel-6to4-base-http_port tunnel-6to4-base-http_port
tunnel-6to4-base-https_port tunnel-6to4-base-https_port
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = e1c7d1c21a942064e2f3f40463b10177 md5sum = 84bc2cf29e34b48c51116d93e2be7636
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
......
...@@ -165,8 +165,8 @@ port = ${monitor-instance-parameter:monitor-httpd-port} ...@@ -165,8 +165,8 @@ port = ${monitor-instance-parameter:monitor-httpd-port}
pid-file = ${directory:run}/monitor-httpd.pid pid-file = ${directory:run}/monitor-httpd.pid
access-log = ${directory:log}/monitor-httpd-access.log access-log = ${directory:log}/monitor-httpd-access.log
error-log = ${directory:log}/monitor-httpd-error.log error-log = ${directory:log}/monitor-httpd-error.log
cert-file = ${ca-directory:certs}/httpd.crt cert-file = ${ca-directory:certs}/monitor-httpd.crt
key-file = ${ca-directory:certs}/httpd.key key-file = ${ca-directory:certs}/monitor-httpd.key
htpasswd-file = ${httpd-monitor-htpasswd:htpasswd-path} htpasswd-file = ${httpd-monitor-htpasswd:htpasswd-path}
url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port} url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
httpd-cors-config-file = ${monitor-httpd-cors:rendered} httpd-cors-config-file = ${monitor-httpd-cors:rendered}
...@@ -194,8 +194,8 @@ recipe = slapos.cookbook:wrapper ...@@ -194,8 +194,8 @@ recipe = slapos.cookbook:wrapper
command-line = {{ apache_location }}/bin/httpd -f ${monitor-httpd-conf:rendered} -DFOREGROUND command-line = {{ apache_location }}/bin/httpd -f ${monitor-httpd-conf:rendered} -DFOREGROUND
wrapper-path = ${directory:bin}/monitor-httpd wrapper-path = ${directory:bin}/monitor-httpd
wait-for-files = wait-for-files =
${ca-directory:certs}/httpd.key ${monitor-httpd-conf-parameter:key-file}
${ca-directory:certs}/httpd.crt ${monitor-httpd-conf-parameter:cert-file}
${monitor-httpd-graceful-wrapper:rendered} ${monitor-httpd-graceful-wrapper:rendered}
[monitor-httpd-graceful-wrapper] [monitor-httpd-graceful-wrapper]
......
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