diff --git a/software/slapos-master/buildout.hash.cfg b/software/slapos-master/buildout.hash.cfg index deeafb6e0fc83e67de4198fe6c7a350cf1aa7c2a..d46efba15ca8a4dc1176e35c449cc10a9d994fa2 100644 --- a/software/slapos-master/buildout.hash.cfg +++ b/software/slapos-master/buildout.hash.cfg @@ -14,7 +14,7 @@ # not need these here). [template-erp5] filename = instance-erp5.cfg.in -md5sum = edf81a602137858cd5835c050ac6e08c +md5sum = c4941a1c862474b71fd7255feb830299 [template-balancer] filename = instance-balancer.cfg.in diff --git a/software/slapos-master/instance-erp5.cfg.in b/software/slapos-master/instance-erp5.cfg.in index 87b10818d51e4edfc6f0be7af31c109433c6daf3..12ef5be5cf9ff276cdf3af520c80d95d7cae6477 100644 --- a/software/slapos-master/instance-erp5.cfg.in +++ b/software/slapos-master/instance-erp5.cfg.in @@ -96,7 +96,7 @@ backup-caucased = ${:srv}/backup/caucased {{ 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('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099, 'max-slowqueries-threshold': monitor_dict.get('max-slowqueries-threshold', 1000), 'slowest-query-threshold': monitor_dict.get('slowest-query-threshold', ''), 'test-database-amount': test_runner_total_database_count}, {'database-list': True, 'test-database-list': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }} {% 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', 'monitor-passwd': 'monitor-htpasswd:passwd'}) }} {%- else %} [request-smtp] # Placeholder smtp service URL @@ -135,7 +135,7 @@ connection-url = smtp://127.0.0.2:0/ {% endif -%} {% endfor -%} -{% set zope_partition_dict = slapparameter_dict.get('zope-partition-dict', {'1': {}}) -%} + {% set zope_partition_dict = slapparameter_dict.get('zope-partition-dict', {'1': {}}) -%} {% set zope_address_list_id_dict = {} -%} {% if zope_partition_dict -%}