Skip to content

slapos
slapos
Commit 2d969c07 authored by Titouan Soulard's avatar Titouan Soulard
Browse files
Options

slapos-master: delete custom instance-erp5.cfg.in 

Historically, a custom `instance-erp5.cfg.in` was required for SlapOS Master in order to install
the SlapOS configurator. This required changing the default business templates, which can, since
49a7f256, be done using a custom build section.

This commit updates the `software.cfg` file accordingly, and deletes the legacy
`instance-erp5.cfg.in` file, which is not needed anymore, to instead use the file provided in
`stack/erp5`.

/cc @rafael
parent de5e381d
Pipeline #33422 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 5 additions and 587 deletions
    software/slapos-master/buildout.hash.cfg
    View file @ 2d969c07
    ...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
    # Substitution (${...:...}), extension ([buildout] extends = ...) and # Substitution (${...:...}), extension ([buildout] extends = ...) and
    # section inheritance (< = ...) are NOT supported (but you should really # section inheritance (< = ...) are NOT supported (but you should really
    # not need these here). # not need these here).
    [template-erp5]
    filename = instance-erp5.cfg.in
    md5sum = 620912069597ea748d55cb68790fa270
    [template-balancer] [template-balancer]
    filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
    md5sum = 88e15a803df4aa35285e59ae9186438a md5sum = 88e15a803df4aa35285e59ae9186438a
    ......
    software/slapos-master/instance-erp5.cfg.in deleted 100644 → 0
    View file @ de5e381d
    {% import "root_common" as root_common with context -%}
    {% import "caucase" as caucase with context %}
    {% set frontend_dict = slapparameter_dict.get('frontend', {}) -%}
    {% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
    {% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
    {% set inituser_login = slapparameter_dict.get('inituser-login', 'zope') -%}
    {% set publish_dict = {'site-id': site_id, 'inituser-login': inituser_login} -%}
    {% set has_posftix = slapparameter_dict.get('smtp', {}).get('postmaster') -%}
    {% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
    {% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%}
    {% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
    {% set wcfs_dict = slapparameter_dict.get('wcfs', {}) -%}
    {% set wcfs_enable = wcfs_dict.get('enable', wcfs_enable_default.lower() in ('true', 'yes')) -%}
    {% set test_runner_enabled = slapparameter_dict.get('test-runner', {}).get('enabled', True) -%}
    {% set test_runner_node_count = slapparameter_dict.get('test-runner', {}).get('node-count', 3) -%}
    {% set test_runner_extra_database_count = slapparameter_dict.get('test-runner', {}).get('extra-database-count', 3) -%}
    {% set test_runner_total_database_count = test_runner_node_count * (1 + test_runner_extra_database_count) -%}
    {# Backward compatibility for mariadb.test-database-amount #}
    {% set mariadb_test_database_amount = slapparameter_dict.get('mariadb', {}).get('test-database-amount') -%}
    {% if mariadb_test_database_amount is not none -%}
    {% set test_runner_total_database_count = mariadb_test_database_amount %}
    {% set test_runner_enabled = mariadb_test_database_amount > 0 %}
    {% endif -%}
    {# Backward compatibility for cloudooo-url #}
    {% if slapparameter_dict.get('cloudooo-url') -%}
    {% do slapparameter_dict.setdefault('cloudooo-url-list', slapparameter_dict['cloudooo-url'].split(',')) %}
    {% endif -%}
    {% set test_runner_random_activity_priority = slapparameter_dict.get('test-runner', {}).get('random-activity-priority') -%}
    {% set monitor_base_url_dict = {} -%}
    {% set monitor_dict = slapparameter_dict.get('monitor', {}) %}
    {% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
    {% set partition_thread_count_list = [] -%}
    {% set zope_partition_dict = slapparameter_dict.get('zope-partition-dict', {'1': {}}) -%}
    {% set zope_family_override_dict = slapparameter_dict.get('family-override', {}) -%}
    {% for zope_parameter_dict in zope_partition_dict.values() -%}
    {# Apply some zope_parameter_dict default values, to avoid duplication. -#}
    {% do zope_parameter_dict.setdefault('thread-amount', 4) -%}
    {% do zope_parameter_dict.setdefault('instance-count', 1) -%}
    {% do partition_thread_count_list.append(zope_parameter_dict['thread-amount'] * zope_parameter_dict['instance-count']) -%}
    {% endfor -%}
    [request-common]
    <= request-common-base
    config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
    config-computer-memory-percent-threshold = {{ dumps(monitor_dict.get('computer-memory-percent-threshold', 80)) }}
    {% set caucase_dict = slapparameter_dict.get('caucase', {}) -%}
    {% set caucase_url = caucase_dict.get('url', '') -%}
    {% macro request(name, software_type, config_key, config, ret={'url': True}, key_config={}) -%}
    {% do config.update(slapparameter_dict.get(config_key, {})) -%}
    {% set section = 'request-' ~ name -%}
    [{{ section }}]
    <= request-common
    name = {{ name }}
    software-type = {{ software_type }}
    return = {{ ' '.join(ret) }}
    {% for ret, publish in ret.iteritems() -%}
    {% if publish -%}
    {% do publish_dict.__setitem__(name ~ '-' ~ ret, '${' ~ section ~ ':connection-' ~ ret ~ '}') %}
    {% endif -%}
    {% if ret == "monitor-base-url" -%}
    {% do monitor_base_url_dict.__setitem__(section, '${' ~ section ~ ':connection-' ~ ret ~ '}') -%}
    {% endif -%}
    {% endfor -%}
    {{ root_common.sla(name) }}
    {% for k, v in config.iteritems() -%}
    config-{{ k }} = {{ dumps(v) }}
    {% endfor -%}
    {% for k, v in key_config.iteritems() -%}
    config-{{ k }} = {{ '${' ~ v ~ '}' }}
    {% endfor -%}
    config-name = {{ name }}
    {% endmacro -%}
    [directory]
    recipe = slapos.cookbook:mkdirectory
    bin = ${buildout:directory}/bin
    service-on-watch = ${buildout:directory}/etc/service
    srv = ${buildout:directory}/srv
    backup-caucased = ${:srv}/backup/caucased
    {% if not caucase_url -%}
    {% if use_ipv6 -%}
    {% set caucase_host = '[' ~ (ipv6_set | list)[0] ~ ']' %}
    {%- else -%}
    {% set caucase_host = (ipv4_set | list)[0] %}
    {%- endif %}
    {% set caucase_port = caucase_dict.get('base-port', 8890) -%}
    {% set caucase_netloc = caucase_host ~ ':' ~ caucase_port -%}
    {% set caucase_url = 'http://' ~ caucase_netloc -%}
    {{ caucase.caucased(
    prefix='caucased',
    buildout_bin_directory=bin_directory,
    caucased_path='${directory:service-on-watch}/caucased',
    backup_dir='${directory:backup-caucased}',
    data_dir='${directory:srv}/caucased',
    netloc=caucase_netloc,
    tmp='${directory:tmp}',
    service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
    user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
    key_len=caucase_dict.get('key-length', 2048),
    )}}
    {% do root_common.section('caucased') -%}
    {% do root_common.section('caucased-promise') -%}
    {% endif -%}
    {% do publish_dict.__setitem__('caucase-http-url', caucase_url) -%}
    {% set balancer_dict = slapparameter_dict.setdefault('balancer', {}) -%}
    {% do balancer_dict.setdefault('ssl', {}).setdefault('caucase-url', caucase_url) -%}
    {% do balancer_dict.setdefault('tcpv4-port', 2150) -%}
    {% do balancer_dict.__setitem__('haproxy-server-check-path', balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) -%}
    {% set routing_path_template_field_dict = {"site-id": site_id} -%}
    {% macro expandRoutingPath(output, input) -%}
    {% for outer_prefix, inner_prefix in input -%}
    {% do output.append((outer_prefix, inner_prefix % routing_path_template_field_dict)) -%}
    {% endfor -%}
    {% endmacro -%}
    {% set path_routing_list = [] -%}
    {% do expandRoutingPath(
    path_routing_list,
    balancer_dict.get(
    'path-routing-list',
    (('/', '/'), ),
    ),
    ) -%}
    {% do balancer_dict.__setitem__('path-routing-list', path_routing_list) -%}
    {% set family_path_routing_dict = {} -%}
    {% for name, family_path_routing_list in balancer_dict.get(
    'family-path-routing-dict',
    {},
    ).items() -%}
    {% set path_routing_list = [] -%}
    {% do expandRoutingPath(path_routing_list, family_path_routing_list) -%}
    {% do family_path_routing_dict.__setitem__(name, path_routing_list) -%}
    {% endfor -%}
    {% do balancer_dict.__setitem__('family-path-routing-dict', family_path_routing_dict) -%}
    {{ 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}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
    {# Notes on max-connection-count: On a standard ERP5, each transaction
    can have 4 connections to mariadb: activities, catalog, deferred and
    transactionless. Count 5 to have some headroom. Multiply by the total
    number of zope threads for all processes from all partitions to get the
    expected number of connections. Add 50 for have some more zope-independent
    headroom (automated probes, replication, ...).
    -#}
    {{ 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,
    'max-connection-count': sum(partition_thread_count_list) * 5 + 50,
    },
    {
    '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', 'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
    {%- else %}
    [request-smtp]
    # Placeholder smtp service URL
    connection-url = smtp://127.0.0.2:0/
    {%- endif %}
    {# ZODB -#}
    {% set zodb_dict = {} -%}
    {% set storage_dict = {} -%}
    {% set mountpoints = set() -%}
    {% for zodb in slapparameter_dict.get('zodb') or ({'type': 'zeo', 'server': {}},) -%}
    {% do mountpoints.add(zodb.setdefault('mount-point', '/')) -%}
    {% set name = zodb.pop('name', 'root') -%}
    {% do assert(name not in zodb_dict, name, zodb_dict) -%}
    {% do zodb_dict.__setitem__(name, zodb) -%}
    {% if 'server' in zodb -%}
    {% do storage_dict.setdefault(zodb['type'], {}).__setitem__(name, zodb.pop('server')) -%}
    {% endif -%}
    {% endfor -%}
    {% do assert(len(mountpoints) == len(zodb_dict)) -%}
    {% set neo = [] -%}
    {% for server_type, server_dict in storage_dict.iteritems() -%}
    {% if server_type == 'neo' -%}
    {% set ((name, server_dict),) = server_dict.items() -%}
    {% do neo.append(server_dict.get('cluster')) -%}
    {% do server_dict.update(cluster='${publish-early:neo-cluster}') -%}
    {{ root_common.request_neo(server_dict, 'zodb-neo', 'neo-', monitor_base_url_dict) }}
    {% set client_dict = zodb_dict[name].setdefault('storage-dict', {}) -%}
    {% for k in 'ssl', '_ca', '_cert', '_key' -%}
    {% do k in server_dict and client_dict.setdefault(k, server_dict[k]) -%}
    {% endfor -%}
    {% else -%}
    {{ assert(server_type == 'zeo', server_type) -}}
    {# 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', 'monitor-base-url')), key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
    {% endif -%}
    {% endfor -%}
    [request-zodb-base]
    config-zodb-dict = {{ dumps(zodb_dict) }}
    {% for server_type, server_dict in storage_dict.iteritems() -%}
    {% if server_type == 'neo' -%}
    config-neo-cluster = ${publish-early:neo-cluster}
    config-neo-name = {{ server_dict.keys()[0] }}
    config-neo-masters = ${publish-early:neo-masters}
    {% else -%}
    config-zodb-zeo = ${request-zodb:connection-storage-dict}
    config-tidstorage-ip = ${request-zodb:connection-tidstorage-ip}
    config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
    {% endif -%}
    {% endfor -%}
    {% set zope_address_list_id_dict = {} -%}
    {% if zope_partition_dict -%}
    [request-zope-base]
    <= request-common
    request-zodb-base
    return =
    zope-address-list
    hosts-dict
    monitor-base-url
    software-release-url
    {%- if test_runner_enabled %}
    test-runner-address-list
    {% endif %}
    {% set bt5_default_list = [
    'erp5_full_text_mroonga_catalog',
    'slapos_configurator',
    ] -%}
    {% if has_jupyter -%}
    {% do bt5_default_list.append('erp5_data_notebook') -%}
    {% endif -%}
    config-bt5 = {{ dumps(slapparameter_dict.get('bt5', ' '.join(bt5_default_list))) }}
    config-bt5-repository-url = {{ dumps(slapparameter_dict.get('bt5-repository-url', local_bt5_repository)) }}
    config-cloudooo-url-list = {{ dumps(slapparameter_dict.get('cloudooo-url-list', default_cloudooo_url_list)) }}
    config-caucase-url = {{ dumps(caucase_url) }}
    config-deadlock-debugger-password = ${publish-early:deadlock-debugger-password}
    config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
    config-selenium-server-configuration-dict = {{ dumps(slapparameter_dict.get('selenium-server-configuration-dict', {})) }}
    config-hosts-dict = {{ dumps(slapparameter_dict.get('hosts-dict', {})) }}
    config-computer-hosts-dict = {{ dumps(slapparameter_dict.get('computer-hosts-dict', {})) }}
    config-hostalias-dict = {{ dumps(slapparameter_dict.get('hostalias-dict', {})) }}
    config-id-store-interval = {{ dumps(slapparameter_dict.get('id-store-interval')) }}
    config-zope-longrequest-logger-error-threshold = {{ dumps(monitor_dict.get('zope-longrequest-logger-error-threshold', 20)) }}
    config-zope-longrequest-logger-maximum-delay = {{ dumps(monitor_dict.get('zope-longrequest-logger-maximum-delay', 0)) }}
    config-inituser-login = {{ dumps(inituser_login) }}
    config-inituser-password-hashed = ${publish-early:inituser-password-hashed}
    config-kumofs-url = ${request-memcached-persistent: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-url-list = ${request-mariadb:connection-database-list}
    config-site-id = {{ dumps(site_id) }}
    config-smtp-url = ${request-smtp:connection-url}
    config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
    config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }}
    config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
    config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
    config-test-runner-node-count = {{ dumps(test_runner_node_count) }}
    config-test-runner-random-activity-priority = {{ dumps(test_runner_random_activity_priority) }}
    config-wcfs_enable = {{ dumps(wcfs_enable) }}
    config-test-runner-configuration = {{ dumps(slapparameter_dict.get('test-runner', {})) }}
    software-type = zope
    {% set global_publisher_timeout = slapparameter_dict.get('publisher-timeout') -%}
    {% set global_activity_timeout = slapparameter_dict.get('activity-timeout') -%}
    {% set zope_family_dict = {} -%}
    {% set zope_family_name_list = [] -%}
    {% set zope_backend_path_dict = {} -%}
    {% set ssl_authentication_dict = {} -%}
    {% set jupyter_zope_family_default = [] -%}
    {% for custom_name, zope_parameter_dict in zope_partition_dict.items() -%}
    {% set partition_name = 'zope-' ~ custom_name -%}
    {% set section_name = 'request-' ~ partition_name -%}
    {% set promise_software_url_section_name = 'promise-software-url' ~ partition_name -%}
    {% set zope_family = zope_parameter_dict.get('family', 'default') -%}
    {% do zope_family_name_list.append(zope_family) %}
    {% set backend_path = zope_parameter_dict.get('backend-path', '') % {'site-id': site_id} %}
    {# # default jupyter zope family is first zope family. -#}
    {# # use list.append() to update it, because in jinja2 set changes only local scope. -#}
    {% if not jupyter_zope_family_default -%}
    {% do jupyter_zope_family_default.append(zope_family) -%}
    {% endif -%}
    {% do zope_family_dict.setdefault(zope_family, []).append(section_name) -%}
    {% do zope_backend_path_dict.__setitem__(zope_family, backend_path) -%}
    {% do ssl_authentication_dict.__setitem__(zope_family, zope_parameter_dict.get('ssl-authentication', False)) -%}
    {% set current_zope_family_override_dict = zope_family_override_dict.get(zope_family, {}) -%}
    [{{ section_name }}]
    <= request-zope-base
    name = {{ partition_name }}
    {% do monitor_base_url_dict.__setitem__(section_name, '${' ~ section_name ~ ':connection-monitor-base-url}') -%}
    {{ root_common.sla(partition_name) }}
    config-name = {{ dumps(custom_name) }}
    config-instance-count = {{ dumps(zope_parameter_dict['instance-count']) }}
    config-private-dev-shm = {{ zope_parameter_dict.get('private-dev-shm', '') }}
    config-thread-amount = {{ dumps(zope_parameter_dict['thread-amount']) }}
    config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }}
    config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longrequest-logger-interval', -1)) }}
    config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
    config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
    config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
    config-with-max-rlimit-nofile = {{ dumps(slapparameter_dict.get('with-max-rlimit-nofile', false)) }}
    {# BBB: zope_parameter_dict used to contain 'webdav', so fallback to it -#}
    config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_parameter_dict.get('webdav', False))) }}
    config-publisher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout)) }}
    config-activity-timeout = {{ dumps(current_zope_family_override_dict.get('activity-timeout', global_activity_timeout)) }}
    {% if test_runner_enabled -%}
    config-test-runner-balancer-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
    [{{ promise_software_url_section_name }}]
    # Promise to wait for zope partition to use the expected software URL,
    # used on upgrades.
    recipe = slapos.cookbook:check_parameter
    value = {{ '${' ~ section_name ~ ':connection-software-release-url}' }}
    expected-not-value =
    expected-value = ${slap-connection:software-release-url}
    path = ${directory:bin}/${:_buildout_section_name_}
    {% do root_common.section(promise_software_url_section_name) -%}
    {% endif -%}
    {% endfor -%}
    {# if not explicitly configured, connect jupyter to first zope family, which -#}
    {# will be 'default' if zope families are not configured also -#}
    {% if not jupyter_zope_family and jupyter_zope_family_default -%}
    {% set jupyter_zope_family = jupyter_zope_family_default[0] -%}
    {% endif -%}
    {# We need to concatenate lists that we cannot read as lists, so this gets hairy. -#}
    {% set zope_family_parameter_dict = {} -%}
    {% for family_name, zope_section_id_list in zope_family_dict.items() -%}
    {% for zope_section_id in zope_section_id_list -%}
    {% set parameter_name = 'zope-family-entry-' ~ zope_section_id -%}
    {% do zope_address_list_id_dict.__setitem__(zope_section_id, parameter_name) -%}
    {% do zope_family_parameter_dict.setdefault(family_name, []).append(parameter_name) -%}
    {% endfor -%}
    {% if has_frontend -%}
    {% set frontend_name = 'frontend-' ~ family_name -%}
    {% do publish_dict.__setitem__('family-' ~ family_name, '${' ~ frontend_name ~ ':connection-site_url}' ) -%}
    [{{ frontend_name }}]
    <= request-frontend-base
    name = {{ frontend_name }}
    config-url = ${request-balancer:connection-{{ family_name }}-v6}
    {% else -%}
    {% do publish_dict.__setitem__('family-' ~ family_name, '${request-balancer:connection-' ~ family_name ~ '}' ) -%}
    {% do publish_dict.__setitem__('family-' ~ family_name ~ '-v6', '${request-balancer:connection-' ~ family_name ~ '-v6}' ) -%}
    {% endif -%}
    {% endfor -%}
    {% if has_jupyter -%}
    {# request jupyter connected to balancer of proper zope family -#}
    {{ request('jupyter', 'jupyter', 'jupyter', {}, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family}) }}
    {% if has_frontend -%}
    [frontend-jupyter]
    <= request-frontend-base
    name = frontend-jupyter
    config-url = ${request-jupyter:connection-url}
    {# # override jupyter-url in publish_dict with frontend address -#}
    {% do publish_dict.__setitem__('jupyter-url', '${frontend-jupyter:connection-site_url}') -%}
    {% endif -%}
    {%- endif %}
    {% if wcfs_enable -%}
    {# request WCFS connected to ZODB -#}
    {% do root_common.section('request-wcfs') -%}
    {{ request('wcfs', 'wcfs', 'wcfs', {}, {}) }}
    [request-wcfs]
    <= request-common
    request-zodb-base
    {%- endif %}
    [directory]
    recipe = slapos.cookbook:mkdirectory
    {% if slapparameter_dict.get('shared-certificate-authority-path', '') -%}
    ca-dir = {{ slapparameter_dict.get('shared-certificate-authority-path') }}
    {% else -%}
    ca-dir = ${buildout:directory}/srv/ssl
    {% endif -%}
    bin = ${buildout:directory}/bin
    etc = ${buildout:directory}/etc
    tmp = ${buildout:directory}/tmp
    services = ${:etc}/run
    requests = ${:ca-dir}/requests
    private = ${:ca-dir}/private
    certs = ${:ca-dir}/certs
    newcerts = ${:ca-dir}/newcerts
    crl = ${:ca-dir}/crl
    [{{root_common.section('apache-certificate-authority')}}]
    recipe = slapos.cookbook:certificate_authority
    openssl-binary = {{ openssl_location }}/bin/openssl
    ca-dir = ${directory:ca-dir}
    requests-directory = ${directory:requests}
    wrapper = ${directory:services}/service-ca
    ca-private = ${directory:private}
    ca-certs = ${directory:certs}
    ca-newcerts = ${directory:newcerts}
    ca-crl = ${directory:crl}
    country-code = {{ dumps(slapparameter_dict.get('country-code', 'ZZ')) }}
    email = {{ dumps(slapparameter_dict.get('email', 'nobody@example.com')) }}
    state = {{ dumps(slapparameter_dict.get('state', "('State',)")) }}
    city = {{ dumps(slapparameter_dict.get('city', 'City')) }}
    company = {{ dumps(slapparameter_dict.get('company', 'Compagny')) }}
    # XXX - Big hack: Change access for certificate authority configuration
    # To allow apache to read openssl.cnf in this folder
    [{{root_common.section('fix-ca-folder')}}]
    recipe = plone.recipe.command
    stop-on-error = true
    command =
    chmod 644 ${apache-certificate-authority:ca-dir}/openssl.cnf
    update-command = ${:command}
    [request-balancer]
    <= request-common
    name = balancer
    software-type = balancer
    {{ root_common.sla('balancer') }}
    return =
    monitor-base-url
    {%- for family in zope_family_dict %}
    {{ family }}
    {{ family }}-v6
    {% if test_runner_enabled %}
    {{ family }}-test-runner-url-list
    {% endif %}
    {% endfor -%}
    {% do monitor_base_url_dict.__setitem__('request-balancer', '${' ~ 'request-balancer' ~ ':connection-monitor-base-url}') -%}
    config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }}
    config-frontend-parameter-dict = {{ dumps({}) }}
    config-tcpv4-port = {{ dumps(balancer_dict.get('tcpv4-port', 2150)) }}
    {% for zope_section_id, name in zope_address_list_id_dict.items() -%}
    config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}' }}
    {% if test_runner_enabled -%}
    config-{{ name }}-test-runner-address-list = {{ ' ${' ~ zope_section_id ~ ':connection-test-runner-address-list}' }}
    {% endif -%}
    {% endfor -%}
    # XXX: should those really be same for all families ?
    config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
    config-monitor-passwd = ${monitor-htpasswd:passwd}
    config-ssl = {{ dumps(balancer_dict['ssl']) }}
    config-name = ${:name}
    config-shared-certificate-authority-path = ${directory:ca-dir}
    config-check-crl = {{ dumps(slapparameter_dict.get('check-crl', True)) }}
    config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
    config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
    config-apachedex-promise-threshold = {{ dumps(monitor_dict.get('apachedex-promise-threshold', 70)) }}
    config-apachedex-configuration = {{
    dumps(
    monitor_dict.get(
    'apachedex-configuration',
    [
    '--erp5-base', '+erp5', '.*/VirtualHostRoot/erp5(/|\\?|$)',
    '--base', '+other', '/',
    '--skip-user-agent', 'Zabbix',
    '--error-detail',
    '--js-embed',
    '--quiet'])) }}
    [request-frontend-base]
    {% if has_frontend -%}
    <= request-common
    recipe = slapos.cookbook:request
    software-url = {{ dumps(frontend_dict['software-url']) }}
    software-type = {{ dumps(frontend_dict.get('software-type', 'RootSoftwareInstance')) }}
    {{ root_common.sla('frontend', True) }}
    shared = true
    {% set config_dict = {
    'type': 'zope',
    } -%}
    {% if frontend_dict.get('domain') -%}
    {% do config_dict.__setitem__('custom_domain', frontend_dict['domain']) -%}
    {% endif -%}
    {% if frontend_dict.get('virtualhostroot-http-port') -%}
    {% do config_dict.__setitem__('virtualhostroot-http-port', frontend_dict['virtualhostroot-http-port']) -%}
    {% endif -%}
    {% if frontend_dict.get('virtualhostroot-https-port') -%}
    {% do config_dict.__setitem__('virtualhostroot-https-port', frontend_dict['virtualhostroot-https-port']) -%}
    {% endif -%}
    {% for name, value in config_dict.items() -%}
    config-{{ name }} = {{ value }}
    {% endfor -%}
    return = site_url
    {% endif -%}
    {% endif -%}{# if zope_partition_dict -#}
    [publish]
    <= monitor-publish
    recipe = slapos.cookbook:publish.serialised
    -extends = publish-early
    {% if zope_address_list_id_dict -%}
    {#
    Pick any published hosts-dict, they are expected to be identical - and there is
    no way to check here.
    -#}
    hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-dict}' }}
    {% endif -%}
    {% for name, value in publish_dict.items() -%}
    {{ name }} = {{ value }}
    {% endfor -%}
    {% if test_runner_enabled -%}
    {% for zope_family_name in zope_family_name_list -%}
    {{ zope_family_name }}-test-runner-url-list = ${request-balancer:connection-{{ zope_family_name }}-test-runner-url-list}
    {% endfor -%}
    {% endif -%}
    [publish-early]
    recipe = slapos.cookbook:publish-early
    -init =
    inituser-password gen-password:passwd
    inituser-password-hashed gen-password:passwd-ldap-salted-sha1
    deadlock-debugger-password gen-deadlock-debugger-password:passwd
    {%- if has_posftix %}
    smtpd-sasl-password gen-smtpd-sasl-password:passwd
    {%- endif %}
    {%- if test_runner_enabled %}
    {%- for zope_family_name in zope_family_name_list %}
    {{ zope_family_name }}-test-runner-url-list default-balancer-test-runner-url-list:{{ zope_family_name }}
    {%- endfor %}
    {%- endif %}
    {%- if neo %}
    neo-cluster gen-neo-cluster:name
    neo-admins neo-cluster:admins
    neo-masters neo-cluster:masters
    {%- if neo[0] %}
    neo-cluster = {{ dumps(neo[0]) }}
    {%- endif %}
    {%- endif %}
    {%- set deadlock_debugger_password = slapparameter_dict.get('deadlock-debugger-password') -%}
    {%- if deadlock_debugger_password %}
    deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }}
    {% endif %}
    {%- if test_runner_enabled %}
    [default-balancer-test-runner-url-list]
    recipe =
    {%- for zope_family_name in zope_family_name_list %}
    {{ zope_family_name }} = not-ready
    {%- endfor %}
    {%- endif %}
    [gen-password]
    recipe = slapos.cookbook:generate.password
    storage-path =
    {%- set inituser_password = slapparameter_dict.get('inituser-password') %}
    {%- if inituser_password %}
    passwd = {{ dumps(inituser_password) }}
    {%- endif %}
    [gen-deadlock-debugger-password]
    <= gen-password
    [gen-neo-cluster-base]
    <= gen-password
    [gen-neo-cluster]
    name = neo-${gen-neo-cluster-base:passwd}
    [gen-smtpd-sasl-password]
    < = gen-password
    {{ root_common.common_section() }}
    [monitor-conf-parameters]
    monitor-title = ERP5
    password = ${monitor-htpasswd:passwd}
    [monitor-base-url-dict]
    {% for key, value in monitor_base_url_dict.items() -%}
    {{ key }} = {{ value }}
    {% endfor %}
    software/slapos-master/software.cfg
    View file @ 2d969c07
    ...@@ -17,6 +17,11 @@ repository_id_list += vifib/master ...@@ -17,6 +17,11 @@ repository_id_list += vifib/master
    [erp5] [erp5]
    branch = erp5-vifib branch = erp5-vifib
    [default-bt5]
    list =
    erp5_full_text_mroonga_catalog
    slapos_configurator
    [vifib] [vifib]
    <= erp5 <= erp5
    repository = https://lab.nexedi.com/nexedi/slapos.core.git repository = https://lab.nexedi.com/nexedi/slapos.core.git
    ...@@ -45,10 +50,6 @@ extra-paths += ...@@ -45,10 +50,6 @@ extra-paths +=
    recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
    [template-erp5]
    < = download-base-part
    filename = instance-erp5.cfg.in
    [template-balancer] [template-balancer]
    < = download-base-part < = download-base-part
    filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
    ......
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7