Skip to content

slapos
slapos
Commit d1334b4b authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Feature/caddy frontend improvement 202010 

See merge request nexedi/slapos!836
parents 7f8cd116 ff9a04e2
Pipeline #11964 failed with stage
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 927 additions and 720 deletions
    software/caddy-frontend/README.caddy_frontend.rst
    View file @ d1334b4b
    ......@@ -448,6 +448,15 @@ This allows backends to:
    Technical notes
    ===============
    Profile development guidelines
    ------------------------------
    Keep the naming in instance profiles:
    * ``software_parameter_dict`` for values coming from software
    * ``instance_parameter_dict`` for **local** values generated by the instance, except ``configuration``
    * ``slapparameter_dict`` for values coming from SlapOS Master
    Instantiated cluster structure
    ------------------------------
    ......
    software/caddy-frontend/buildout.hash.cfg
    View file @ d1334b4b
    ......@@ -14,29 +14,29 @@
    # not need these here).
    [template]
    filename = instance.cfg.in
    md5sum = bfb647325103640c19c38e7b7f6e2833
    md5sum = 28bf0c4c75c028bed79fc38786831b3e
    [template-common]
    [profile-common]
    filename = instance-common.cfg.in
    md5sum = 5784bea3bd608913769ff9a8afcccb68
    [template-apache-frontend]
    [profile-caddy-frontend]
    filename = instance-apache-frontend.cfg.in
    md5sum = 02aac183352a6fd6ddd336d2e3757405
    md5sum = e7d7e1448b6420657e953026573311ca
    [template-caddy-replicate]
    [profile-caddy-replicate]
    filename = instance-apache-replicate.cfg.in
    md5sum = 54c0648c8593699dae0c565bc7dd8629
    md5sum = 59f3a67999f5fb3e595486e2b801af08
    [template-slave-list]
    [profile-slave-list]
    _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
    md5sum = 2690fb2b5b6cefb7de53f35c214bdd52
    md5sum = 64d57678c12f539247fe2532c5b8d6b8
    [template-replicate-publish-slave-information]
    [profile-replicate-publish-slave-information]
    _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
    md5sum = 7e3ee70c447f8203273d78f66ab519c3
    md5sum = de268251dafa5ad83ebf5b20636365d9
    [template-caddy-frontend-configuration]
    [profile-caddy-frontend-configuration]
    _update_hash_filename_ = templates/Caddyfile.in
    md5sum = 2503056e35463e045db3329bb8b6fae8
    ......@@ -54,7 +54,7 @@ md5sum = 266f175dbdfc588af7a86b0b1884fe73
    [template-backend-haproxy-configuration]
    _update_hash_filename_ = templates/backend-haproxy.cfg.in
    md5sum = 80081a7ded0029bb24b4fe2d06b6ae95
    md5sum = bf40f8d0a049a8dd924ccc731956c87e
    [template-log-access]
    _update_hash_filename_ = templates/template-log-access.conf.in
    ......@@ -112,13 +112,13 @@ md5sum = 8e1c6c06c09beb921965b3ce98c67c9e
    filename = caddyprofiledummy.py
    md5sum = 38792c2dceae38ab411592ec36fff6a8
    [template-kedifa]
    [profile-kedifa]
    filename = instance-kedifa.cfg.in
    md5sum = d76fe7bf062410eda7049446ed06a736
    md5sum = 3daebc4b37088fa01183a853920d4143
    [template-backend-haproxy-rsyslogd-conf]
    _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in
    md5sum = be899b04e1aa652ed510f20d4ea523dd
    md5sum = 3ec9e088817f6a0e3b3b71919590e6b3
    [template-slave-introspection-httpd-nginx]
    _update_hash_filename_ = templates/slave-introspection-httpd-nginx.conf.in
    ......
    software/caddy-frontend/common.cfg deleted 100644 → 0
    View file @ 7f8cd116
    [buildout]
    extends =
    buildout.hash.cfg
    ../../stack/slapos.cfg
    ../../component/dash/buildout.cfg
    ../../component/caddy/buildout.cfg
    ../../component/gzip/buildout.cfg
    ../../component/logrotate/buildout.cfg
    ../../component/rdiff-backup/buildout.cfg
    ../../component/trafficserver/buildout.cfg
    ../../component/6tunnel/buildout.cfg
    ../../component/xz-utils/buildout.cfg
    ../../component/rsyslogd/buildout.cfg
    ../../component/haproxy/buildout.cfg
    ../../component/nginx/buildout.cfg
    ../../stack/caucase/buildout.cfg
    # Monitoring stack (keep on bottom)
    ../../stack/monitor/buildout.cfg
    parts +=
    caucase-eggs
    template
    template-caddy-frontend
    template-caddy-replicate
    caddy
    logrotate
    rdiff-backup
    caddyprofiledeps
    kedifa-develop
    kedifa
    [kedifa-repository]
    recipe = slapos.recipe.build:gitclone
    repository = https://lab.nexedi.com/nexedi/kedifa.git
    git-executable = ${git:location}/bin/git
    revision = d6bbd7db215e12871c1536f22a8fbf994227270c
    [kedifa-develop]
    recipe = zc.recipe.egg:develop
    setup = ${kedifa-repository:location}
    [kedifa]
    recipe = zc.recipe.egg
    eggs =
    ${python-cryptography:egg}
    kedifa
    [caddyprofiledeps-setup]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/setup.py
    [caddyprofiledeps-dummy]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/caddyprofiledummy.py
    [caddyprofiledeps-prepare]
    recipe = plone.recipe.command
    stop-on-error = True
    location = ${buildout:parts-directory}/${:_buildout_section_name_}
    update-command = ${:command}
    command =
    rm -fr ${:location} &&
    mkdir -p ${:location} &&
    cp ${caddyprofiledeps-setup:target} ${:location}/ &&
    cp ${caddyprofiledeps-dummy:target} ${:location}/
    [caddyprofiledeps-develop]
    recipe = zc.recipe.egg:develop
    setup = ${caddyprofiledeps-prepare:location}
    [caddyprofiledeps]
    depends = ${caddyprofiledeps-develop:recipe}
    recipe = zc.recipe.egg
    eggs =
    caddyprofiledeps
    websockify
    collective.recipe.shelloutput
    [template-common]
    recipe = slapos.recipe.template:jinja2
    template = ${:_profile_base_location_}/instance-common.cfg.in
    rendered = ${buildout:directory}/instance-common.cfg
    mode = 0644
    context =
    key develop_eggs_directory buildout:develop-eggs-directory
    key eggs_directory buildout:eggs-directory
    [template-frontend-parameter-section]
    common_profile = ${template-common:rendered}
    logrotate_base_instance = ${template-logrotate-base:rendered}
    bin_directory = ${buildout:bin-directory}
    sixtunnel = ${6tunnel:location}
    nginx = ${nginx-output:nginx}
    nginx_mime = ${nginx-output:mime}
    caddy = ${caddy:output}
    caddy_location = ${caddy:location}
    haproxy_executable = ${haproxy:location}/sbin/haproxy
    rsyslogd_executable = ${rsyslogd:location}/sbin/rsyslogd
    curl = ${curl:location}
    dash = ${dash:location}
    gzip = ${gzip:location}
    logrotate = ${logrotate:location}
    openssl = ${openssl:location}/bin/openssl
    openssl_cnf = ${openssl:location}/etc/ssl/openssl.cnf
    trafficserver = ${trafficserver:location}
    sha256sum = ${coreutils:location}/bin/sha256sum
    kedifa = ${:bin_directory}/kedifa
    kedifa-updater = ${:bin_directory}/kedifa-updater
    kedifa-csr = ${:bin_directory}/kedifa-csr
    xz_location = ${xz-utils:location}
    htpasswd = ${:bin_directory}/htpasswd
    monitor_template = ${monitor-template:output}
    template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
    template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
    template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
    template_graceful_script = ${template-graceful-script:target}
    template_validate_script = ${template-validate-script:target}
    template_rotate_script = ${template-rotate-script:target}
    template_configuration_state_script = ${template-configuration-state-script:target}
    template_caddy_lazy_script_call = ${template-caddy-lazy-script-call:target}
    template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
    template_empty = ${template-empty:target}
    template_log_access = ${template-log-access:target}
    template_not_found_html = ${template-not-found-html:target}
    template_slave_list = ${template-slave-list:target}
    template_trafficserver_records_config = ${template-trafficserver-records-config:target}
    template_trafficserver_storage_config = ${template-trafficserver-storage-config:target}
    template_trafficserver_logging_yaml = ${template-trafficserver-logging-yaml:target}
    template_wrapper = ${template-wrapper:output}
    template_slave_introspection_httpd_nginx = ${template-slave-introspection-httpd-nginx:target}
    [template]
    recipe = slapos.recipe.template:jinja2
    template = ${:_profile_base_location_}/instance.cfg.in
    rendered = ${buildout:directory}/template.cfg
    mode = 0644
    context =
    key common_profile template-common:rendered
    key monitor2_template monitor2-template:rendered
    key template_caddy_frontend template-caddy-frontend:target
    key template_caddy_replicate template-caddy-replicate:target
    key template_kedifa template-kedifa:target
    key template_replicate_publish_slave_information template-replicate-publish-slave-information:target
    key caddy_backend_url_validator caddy-backend-url-validator:output
    section template_frontend_parameter_dict template-frontend-parameter-section
    key caucase_jinja2_library caucase-jinja2-library:target
    [template-caddy-frontend]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/instance-apache-frontend.cfg.in
    mode = 0644
    [caddy-backend-url-validator]
    recipe = slapos.recipe.template
    url = ${:_profile_base_location_}/${:filename}
    output = ${buildout:directory}/caddy-backend-url-validator
    mode = 0750
    [template-caddy-replicate]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
    mode = 0644
    [template-kedifa]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/instance-kedifa.cfg.in
    mode = 0644
    [download-template]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_}
    mode = 640
    [template-slave-list]
    <=download-template
    [template-replicate-publish-slave-information]
    <=download-template
    [template-caddy-frontend-configuration]
    <=download-template
    [template-not-found-html]
    <=download-template
    [template-default-slave-virtualhost]
    <=download-template
    [template-backend-haproxy-configuration]
    <=download-template
    [template-log-access]
    <=download-template
    [template-empty]
    <=download-template
    [template-slave-introspection-httpd-nginx]
    <=download-template
    [template-wrapper]
    recipe = slapos.recipe.template
    url = ${:_profile_base_location_}/templates/wrapper.in
    output = ${buildout:directory}/template-wrapper.cfg
    mode = 0644
    [template-trafficserver-records-config]
    <=download-template
    [template-trafficserver-storage-config]
    <=download-template
    [template-trafficserver-logging-yaml]
    <=download-template
    [template-rotate-script]
    <=download-template
    [template-caddy-lazy-script-call]
    <=download-template
    [template-graceful-script]
    <=download-template
    [template-validate-script]
    <=download-template
    [template-configuration-state-script]
    <=download-template
    [template-backend-haproxy-rsyslogd-conf]
    <=download-template
    software/caddy-frontend/development.cfg deleted 100644 → 0
    View file @ 7f8cd116
    # Development profile of caddy-frontend.
    # Exactly the same as software.cfg, but fetch the slapos.cookbook
    # from git repository instead of fetching stable version,
    # allowing to play with bleeding edge environment.
    # You'll need to run buildout twice for this profile.
    [buildout]
    extends =
    # Extend in this order, otherwise "parts" will be taken from git profile
    common.cfg
    parts +=
    slapos.toolbox-dev
    [slapos.toolbox-dev]
    recipe = zc.recipe.egg:develop
    egg = slapos.toolbox
    setup = ${slapos.toolbox-repository:location}
    software/caddy-frontend/instance.cfg.in
    View file @ d1334b4b
    [buildout]
    extends = {{ common_profile }}
    extends = {{ software_parameter_dict['profile_common'] }}
    parts =
    dynamic-template-caddy-replicate
    switch-softwaretype
    [caddyprofiledeps]
    ......@@ -11,76 +10,59 @@ recipe = caddyprofiledeps
    [jinja2-template-base]
    recipe = slapos.recipe.template:jinja2
    rendered = ${buildout:directory}/${:filename}
    extensions = jinja2.ext.do
    extra-context =
    context =
    import json_module json
    key slap_software_type instance-parameter:slap-software-type
    key slapparameter_dict instance-parameter:configuration
    key slave_instance_list instance-parameter:slave-instance-list
    section instance_parameter instance-parameter
    section instance_parameter_dict instance-parameter
    section software_parameter_dict software-parameter-section
    ${:extra-context}
    caucase-jinja2-library = {{ software_parameter_dict['caucase_jinja2_library'] }}
    import-list =
    file caucase :caucase-jinja2-library
    [switch-softwaretype]
    recipe = slapos.cookbook:softwaretype
    default = ${dynamic-template-caddy-replicate:rendered}
    RootSoftwareInstance = ${dynamic-template-caddy-replicate:rendered}
    custom-personal = ${dynamic-template-caddy-replicate:rendered}
    single-default = ${dynamic-template-caddy-frontend:rendered}
    single-custom-personal = ${dynamic-template-caddy-frontend:rendered}
    replicate = ${dynamic-template-caddy-replicate:rendered}
    kedifa = ${dynamic-template-kedifa:rendered}
    default = ${dynamic-profile-caddy-replicate:rendered}
    RootSoftwareInstance = ${dynamic-profile-caddy-replicate:rendered}
    custom-personal = ${dynamic-profile-caddy-replicate:rendered}
    single-default = ${dynamic-profile-caddy-frontend:rendered}
    single-custom-personal = ${dynamic-profile-caddy-frontend:rendered}
    replicate = ${dynamic-profile-caddy-replicate:rendered}
    kedifa = ${dynamic-profile-kedifa:rendered}
    [dynamic-template-caddy-frontend-parameters]
    {% for key,value in template_frontend_parameter_dict.iteritems() %}
    [software-parameter-section]
    {% for key,value in software_parameter_dict.iteritems() %}
    {{ key }} = {{ dumps(value) }}
    {% endfor -%}
    [dynamic-template-caddy-frontend]
    [dynamic-profile-caddy-frontend]
    < = jinja2-template-base
    template = {{ template_caddy_frontend }}
    template = {{ software_parameter_dict['profile_caddy_frontend'] }}
    filename = instance-caddy-frontend.cfg
    extensions = jinja2.ext.do
    extra-context =
    import furl_module furl
    section parameter_dict dynamic-template-caddy-frontend-parameters
    raw software_type single-custom-personal
    caucase-jinja2-library = {{ caucase_jinja2_library }}
    import-list =
    file caucase :caucase-jinja2-library
    [dynamic-template-caddy-replicate]
    [dynamic-profile-caddy-replicate]
    < = jinja2-template-base
    depends = ${caddyprofiledeps:recipe}
    template = {{ template_caddy_replicate }}
    template = {{ software_parameter_dict['profile_caddy_replicate'] }}
    filename = instance-caddy-replicate.cfg
    extensions = jinja2.ext.do
    extra-context =
    import subprocess_module subprocess
    import functools_module functools
    import validators validators
    key cluster_identification instance-parameter:root-instance-title
    raw caddy_backend_url_validator {{ caddy_backend_url_validator }}
    raw template_publish_slave_information {{ template_replicate_publish_slave_information }}
    # Must match the key id in [switch-softwaretype] which uses this section.
    raw software_type RootSoftwareInstance-default-custom-personal-replicate
    raw template_monitor {{ monitor2_template }}
    raw common_profile {{ common_profile }}
    section parameter_dict dynamic-template-caddy-frontend-parameters
    caucase-jinja2-library = {{ caucase_jinja2_library }}
    import-list =
    file caucase :caucase-jinja2-library
    [dynamic-template-kedifa]
    [dynamic-profile-kedifa]
    < = jinja2-template-base
    template = {{ template_kedifa }}
    template = {{ software_parameter_dict['profile_kedifa'] }}
    filename = instance-kedifa.cfg
    extensions = jinja2.ext.do
    extra-context =
    section parameter_dict dynamic-template-caddy-frontend-parameters
    raw software_type kedifa
    caucase-jinja2-library = {{ caucase_jinja2_library }}
    import-list =
    file caucase :caucase-jinja2-library
    [instance-parameter]
    # Fetches parameters defined in SlapOS Master for this instance.
    ......
    software/caddy-frontend/software.cfg
    View file @ d1334b4b
    [buildout]
    extends = common.cfg
    extends =
    buildout.hash.cfg
    ../../stack/slapos.cfg
    ../../component/dash/buildout.cfg
    ../../component/caddy/buildout.cfg
    ../../component/gzip/buildout.cfg
    ../../component/logrotate/buildout.cfg
    ../../component/rdiff-backup/buildout.cfg
    ../../component/trafficserver/buildout.cfg
    ../../component/6tunnel/buildout.cfg
    ../../component/xz-utils/buildout.cfg
    ../../component/rsyslogd/buildout.cfg
    ../../component/haproxy/buildout.cfg
    ../../component/nginx/buildout.cfg
    ../../stack/caucase/buildout.cfg
    # Monitoring stack (keep on bottom)
    ../../stack/monitor/buildout.cfg
    parts +=
    caucase-eggs
    template
    rdiff-backup
    caddyprofiledeps
    kedifa-develop
    kedifa
    [kedifa-repository]
    recipe = slapos.recipe.build:gitclone
    repository = https://lab.nexedi.com/nexedi/kedifa.git
    git-executable = ${git:location}/bin/git
    revision = d6bbd7db215e12871c1536f22a8fbf994227270c
    [kedifa-develop]
    recipe = zc.recipe.egg:develop
    setup = ${kedifa-repository:location}
    [kedifa]
    recipe = zc.recipe.egg
    eggs =
    ${python-cryptography:egg}
    kedifa
    [caddyprofiledeps-setup]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/setup.py
    [caddyprofiledeps-dummy]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/caddyprofiledummy.py
    [caddyprofiledeps-prepare]
    recipe = plone.recipe.command
    stop-on-error = True
    location = ${buildout:parts-directory}/${:_buildout_section_name_}
    update-command = ${:command}
    command =
    rm -fr ${:location} &&
    mkdir -p ${:location} &&
    cp ${caddyprofiledeps-setup:target} ${:location}/ &&
    cp ${caddyprofiledeps-dummy:target} ${:location}/
    [caddyprofiledeps-develop]
    recipe = zc.recipe.egg:develop
    setup = ${caddyprofiledeps-prepare:location}
    [caddyprofiledeps]
    depends = ${caddyprofiledeps-develop:recipe}
    recipe = zc.recipe.egg
    eggs =
    caddyprofiledeps
    websockify
    collective.recipe.shelloutput
    [profile-common]
    recipe = slapos.recipe.template:jinja2
    template = ${:_profile_base_location_}/instance-common.cfg.in
    rendered = ${buildout:directory}/instance-common.cfg
    mode = 0644
    context =
    key develop_eggs_directory buildout:develop-eggs-directory
    key eggs_directory buildout:eggs-directory
    [software-parameter-section]
    # libraries
    caucase_jinja2_library = ${caucase-jinja2-library:target}
    # profiles
    profile_caddy_frontend = ${profile-caddy-frontend:target}
    profile_caddy_replicate = ${profile-caddy-replicate:target}
    profile_common = ${profile-common:rendered}
    profile_kedifa = ${profile-kedifa:target}
    profile_logrotate_base = ${template-logrotate-base:rendered}
    profile_monitor = ${monitor-template:output}
    profile_monitor2 = ${monitor2-template:rendered}
    profile_replicate_publish_slave_information = ${profile-replicate-publish-slave-information:target}
    profile_slave_list = ${profile-slave-list:target}
    # templates
    template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
    template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
    template_caddy_frontend_configuration = ${profile-caddy-frontend-configuration:target}
    template_caddy_lazy_script_call = ${template-caddy-lazy-script-call:target}
    template_configuration_state_script = ${template-configuration-state-script:target}
    template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
    template_empty = ${template-empty:target}
    template_graceful_script = ${template-graceful-script:target}
    template_log_access = ${template-log-access:target}
    template_not_found_html = ${template-not-found-html:target}
    template_rotate_script = ${template-rotate-script:target}
    template_slave_introspection_httpd_nginx = ${template-slave-introspection-httpd-nginx:target}
    template_trafficserver_logging_yaml = ${template-trafficserver-logging-yaml:target}
    template_trafficserver_records_config = ${template-trafficserver-records-config:target}
    template_trafficserver_storage_config = ${template-trafficserver-storage-config:target}
    template_validate_script = ${template-validate-script:target}
    template_wrapper = ${template-wrapper:output}
    caddy_backend_url_validator = ${caddy-backend-url-validator:output}
    # directories
    bin_directory = ${buildout:bin-directory}
    # files
    sixtunnel = ${6tunnel:location}
    nginx = ${nginx-output:nginx}
    nginx_mime = ${nginx-output:mime}
    caddy = ${caddy:output}
    haproxy_executable = ${haproxy:location}/sbin/haproxy
    rsyslogd_executable = ${rsyslogd:location}/sbin/rsyslogd
    curl = ${curl:location}
    dash = ${dash:location}
    gzip = ${gzip:location}
    logrotate = ${logrotate:location}
    openssl = ${openssl:location}/bin/openssl
    openssl_cnf = ${openssl:location}/etc/ssl/openssl.cnf
    trafficserver = ${trafficserver:location}
    sha256sum = ${coreutils:location}/bin/sha256sum
    kedifa = ${:bin_directory}/kedifa
    kedifa-updater = ${:bin_directory}/kedifa-updater
    kedifa-csr = ${:bin_directory}/kedifa-csr
    xz_location = ${xz-utils:location}
    htpasswd = ${:bin_directory}/htpasswd
    [template]
    recipe = slapos.recipe.template:jinja2
    template = ${:_profile_base_location_}/instance.cfg.in
    rendered = ${buildout:directory}/template.cfg
    mode = 0644
    context =
    section software_parameter_dict software-parameter-section
    [profile-caddy-frontend]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/instance-apache-frontend.cfg.in
    mode = 0644
    [caddy-backend-url-validator]
    recipe = slapos.recipe.template
    url = ${:_profile_base_location_}/${:filename}
    output = ${buildout:directory}/caddy-backend-url-validator
    mode = 0750
    [profile-caddy-replicate]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
    mode = 0644
    [profile-kedifa]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/instance-kedifa.cfg.in
    mode = 0644
    [download-template]
    recipe = slapos.recipe.build:download
    url = ${:_profile_base_location_}/${:_update_hash_filename_}
    mode = 640
    [profile-slave-list]
    <=download-template
    [profile-replicate-publish-slave-information]
    <=download-template
    [profile-caddy-frontend-configuration]
    <=download-template
    [template-not-found-html]
    <=download-template
    [template-default-slave-virtualhost]
    <=download-template
    [template-backend-haproxy-configuration]
    <=download-template
    [template-log-access]
    <=download-template
    [template-empty]
    <=download-template
    [template-slave-introspection-httpd-nginx]
    <=download-template
    [template-wrapper]
    recipe = slapos.recipe.template
    url = ${:_profile_base_location_}/templates/wrapper.in
    output = ${buildout:directory}/template-wrapper.cfg
    mode = 0644
    [template-trafficserver-records-config]
    <=download-template
    [template-trafficserver-storage-config]
    <=download-template
    [template-trafficserver-logging-yaml]
    <=download-template
    [template-rotate-script]
    <=download-template
    [template-caddy-lazy-script-call]
    <=download-template
    [template-graceful-script]
    <=download-template
    [template-validate-script]
    <=download-template
    [template-configuration-state-script]
    <=download-template
    [template-backend-haproxy-rsyslogd-conf]
    <=download-template
    [versions]
    # Modern KeDiFa requires zc.lockfile
    ......
    software/caddy-frontend/templates/backend-haproxy-rsyslogd.conf.in
    View file @ d1334b4b
    ......@@ -16,7 +16,7 @@ $Umask 0022
    $WorkDirectory {{ configuration['spool-directory'] }}
    # Setup logging per slave, by extracting the slave name from the log stream
    {%- set regex = ".*-backend (.*)-http.*" %}
    {%- set regex = ".*-backend (.*)-http.{0,1}/" %}
    template(name="extract_slave_name" type="string" string="%msg:R,ERE,1,FIELD:{{ regex }}--end%")
    set $!slave_name = exec_template("extract_slave_name");
    template(name="slave_output" type="string" string="{{ configuration['caddy-log-directory'] }}/%$!slave_name%_backend_log")
    ......
    software/caddy-frontend/templates/backend-haproxy.cfg.in
    View file @ d1334b4b
    ......@@ -14,27 +14,30 @@ defaults
    timeout connect {{ configuration['backend-connect-timeout'] }}s
    retries {{ configuration['backend-connect-retries'] }}
    {%- set SCHEME_PREFIX_MAPPING = { 'http': 'http_backend', 'https': 'https_backend'} %}
    {%- macro frontend_entry(slave_instance, scheme, wildcard) %}
    {#- wildcard switch allows to put dangerous entries in the end, as haproxy parses with first match #}
    {%- set host_list = (slave_instance.get('server-alias') or '').split() %}
    {%- if slave_instance.get('custom_domain') not in host_list %}
    {%- do host_list.append(slave_instance.get('custom_domain')) %}
    {%- endif %}
    {%- set matched = {'count': 0} %}
    {%- for host in host_list %}
    {#- Match up to the end or optional port (starting with ':') #}
    {#- Please note that this matching is quite sensitive to changes and hard to test, so avoid needless changes #}
    {%- if wildcard and host.startswith('*.') %}
    {%- do matched.__setitem__('count', matched['count'] + 1) %}
    {%- if slave_instance[SCHEME_PREFIX_MAPPING[scheme]]['hostname'] and slave_instance[SCHEME_PREFIX_MAPPING[scheme]]['port'] %}
    {%- set host_list = (slave_instance.get('server-alias') or '').split() %}
    {%- if slave_instance.get('custom_domain') not in host_list %}
    {%- do host_list.append(slave_instance.get('custom_domain')) %}
    {%- endif %}
    {%- set matched = {'count': 0} %}
    {%- for host in host_list %}
    {#- Match up to the end or optional port (starting with ':') #}
    {#- Please note that this matching is quite sensitive to changes and hard to test, so avoid needless changes #}
    {%- if wildcard and host.startswith('*.') %}
    {%- do matched.__setitem__('count', matched['count'] + 1) %}
    # match wildcard {{ host }}
    acl is_{{ slave_instance['slave_reference'] }} hdr_reg(host) -i {{ host[2:] }}($|:.*)
    {%- elif not wildcard and not host.startswith('*.') %}
    {%- do matched.__setitem__('count', matched['count'] + 1) %}
    {%- elif not wildcard and not host.startswith('*.') %}
    {%- do matched.__setitem__('count', matched['count'] + 1) %}
    acl is_{{ slave_instance['slave_reference'] }} hdr_reg(host) -i ^{{ host }}($|:.*)
    {%- endif %}
    {%- endfor %}
    {%- if matched['count'] > 0 %}
    {%- endif %}
    {%- endfor %}
    {%- if matched['count'] > 0 %}
    use_backend {{ slave_instance['slave_reference'] }}-{{ scheme }} if is_{{ slave_instance['slave_reference'] }}
    {%- endif %}
    {%- endif %}
    {%- endmacro %}
    ......@@ -49,59 +52,58 @@ frontend statistic
    frontend http-backend
    bind {{ configuration['local-ipv4'] }}:{{ configuration['http-port'] }}
    {%- for slave_instance in backend_slave_list %}
    {%- for slave_instance in backend_slave_list -%}
    {{ frontend_entry(slave_instance, 'http', False) }}
    {%- endfor %}
    {%- for slave_instance in backend_slave_list %}
    {%- for slave_instance in backend_slave_list -%}
    {{ frontend_entry(slave_instance, 'http', True) }}
    {%- endfor %}
    frontend https-backend
    bind {{ configuration['local-ipv4'] }}:{{ configuration['https-port'] }}
    {%- for slave_instance in backend_slave_list %}
    {%- for slave_instance in backend_slave_list -%}
    {{ frontend_entry(slave_instance, 'https', False) }}
    {%- endfor %}
    {%- for slave_instance in backend_slave_list %}
    {%- for slave_instance in backend_slave_list -%}
    {{ frontend_entry(slave_instance, 'https', True) }}
    {%- endfor %}
    {%- for slave_instance in backend_slave_list %}
    {%- for (scheme, prefix) in [('http', 'http_backend'), ('https', 'https_backend')] %}
    {%- for (scheme, prefix) in SCHEME_PREFIX_MAPPING.items() %}
    {%- set info_dict = slave_instance[prefix] %}
    {%- if info_dict['scheme'] == 'https' %}
    {%- set ssl = [] %}
    {%- if slave_instance['authenticate-to-backend'] %}
    {%- set ssl = ['crt %s' % (configuration['certificate'],)] %}
    {%- endif %}
    {%- do ssl.append('ssl verify') %}
    {%- set path_to_ssl_proxy_ca_crt = slave_instance.get('path_to_ssl_proxy_ca_crt') %}
    {%- if slave_instance['ssl_proxy_verify'] %}
    {%- if path_to_ssl_proxy_ca_crt %}
    {%- do ssl.append('required ca-file %s' % (path_to_ssl_proxy_ca_crt,)) %}
    {%- if info_dict['hostname'] and info_dict['port'] %}
    {%- set ssl_list = [] %}
    {%- if info_dict['scheme'] == 'https' %}
    {%- if slave_instance['authenticate-to-backend'] %}
    {%- do ssl_list.append('crt %s' % (configuration['certificate'],)) %}
    {%- endif %}
    {%- do ssl_list.append('ssl verify') %}
    {%- set path_to_ssl_proxy_ca_crt = slave_instance.get('path_to_ssl_proxy_ca_crt') %}
    {%- if slave_instance['ssl_proxy_verify'] %}
    {%- if path_to_ssl_proxy_ca_crt %}
    {%- do ssl_list.append('required ca-file %s' % (path_to_ssl_proxy_ca_crt,)) %}
    {%- else %}
    {#- Backend SSL shall be verified, but not CA provided, disallow connection #}
    {#- Simply dropping hostname from the dict will result with ignoring it... #}
    {%- do info_dict.__setitem__('hostname', '') %}
    {%- endif %}
    {%- else %}
    {#- Backend SSL shall be verified, but not CA provided, disallow connection #}
    {#- Simply dropping hostname from the dict will result with ignoring it... #}
    {%- do info_dict.__setitem__('hostname', '') %}
    {%- do ssl_list.append('none') %}
    {%- endif %}
    {%- else %}
    {%- do ssl.append('none') %}
    {%- endif %}
    {%- set ssl = ' '.join(ssl) %}
    {%- else %}
    {%- set ssl = '' %}
    {%- endif %}
    backend {{ slave_instance['slave_reference'] }}-{{ scheme }}
    {%- set hostname = info_dict['hostname'] %}
    {%- set port = info_dict['port'] %}
    {%- set path = info_dict['path'].rstrip('/') %}
    {%- if hostname and port %}
    {%- set hostname = info_dict['hostname'] %}
    {%- set port = info_dict['port'] %}
    {%- set path = info_dict['path'].rstrip('/') %}
    {%- if hostname and port %}
    timeout server {{ slave_instance['request-timeout'] }}s
    timeout connect {{ slave_instance['backend-connect-timeout'] }}s
    retries {{ slave_instance['backend-connect-retries'] }}
    server backend {{ hostname }}:{{ port }} {{ ssl }}
    {%- if path %}
    server {{ slave_instance['slave_reference'] }}-backend {{ hostname }}:{{ port }} {{ ' '.join(ssl_list) }}
    {%- if path %}
    http-request set-path {{ path }}%[path]
    {%- endif %}
    {%- endif %}
    {%- endif %}
    {%- endfor %}
    ......
    software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in
    View file @ d1334b4b
    ......@@ -75,7 +75,7 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }}
    {% endfor %}
    [buildout]
    extends = {{ common_profile }}
    extends = {{ profile_common }}
    parts =
    {% for part in part_list %}
    {{ ' %s' % part }}
    ......
    software/caddy-frontend/test/test.py
    View file @ d1334b4b
    This diff is collapsed.
    software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt
    View file @ d1334b4b
    ......@@ -13,13 +13,10 @@ T-2/var/log/httpd/_dummy-cached_access_log
    T-2/var/log/httpd/_dummy-cached_backend_log
    T-2/var/log/httpd/_dummy-cached_error_log
    T-2/var/log/httpd/_enable-http2-default_access_log
    T-2/var/log/httpd/_enable-http2-default_backend_log
    T-2/var/log/httpd/_enable-http2-default_error_log
    T-2/var/log/httpd/_enable-http2-false_access_log
    T-2/var/log/httpd/_enable-http2-false_backend_log
    T-2/var/log/httpd/_enable-http2-false_error_log
    T-2/var/log/httpd/_enable-http2-true_access_log
    T-2/var/log/httpd/_enable-http2-true_backend_log
    T-2/var/log/httpd/_enable-http2-true_error_log
    T-2/var/log/monitor-httpd-access.log
    T-2/var/log/monitor-httpd-error.log
    ......
    software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
    View file @ d1334b4b
    ......@@ -13,13 +13,10 @@ T-2/var/log/httpd/_dummy-cached_access_log
    T-2/var/log/httpd/_dummy-cached_backend_log
    T-2/var/log/httpd/_dummy-cached_error_log
    T-2/var/log/httpd/_enable-http2-default_access_log
    T-2/var/log/httpd/_enable-http2-default_backend_log
    T-2/var/log/httpd/_enable-http2-default_error_log
    T-2/var/log/httpd/_enable-http2-false_access_log
    T-2/var/log/httpd/_enable-http2-false_backend_log
    T-2/var/log/httpd/_enable-http2-false_error_log
    T-2/var/log/httpd/_enable-http2-true_access_log
    T-2/var/log/httpd/_enable-http2-true_backend_log
    T-2/var/log/httpd/_enable-http2-true_error_log
    T-2/var/log/monitor-httpd-access.log
    T-2/var/log/monitor-httpd-error.log
    ......
    software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt
    View file @ d1334b4b
    ......@@ -13,13 +13,10 @@ T-2/var/log/httpd/_dummy-cached_access_log
    T-2/var/log/httpd/_dummy-cached_backend_log
    T-2/var/log/httpd/_dummy-cached_error_log
    T-2/var/log/httpd/_enable-http2-default_access_log
    T-2/var/log/httpd/_enable-http2-default_backend_log
    T-2/var/log/httpd/_enable-http2-default_error_log
    T-2/var/log/httpd/_enable-http2-false_access_log
    T-2/var/log/httpd/_enable-http2-false_backend_log
    T-2/var/log/httpd/_enable-http2-false_error_log
    T-2/var/log/httpd/_enable-http2-true_access_log
    T-2/var/log/httpd/_enable-http2-true_backend_log
    T-2/var/log/httpd/_enable-http2-true_error_log
    T-2/var/log/monitor-httpd-access.log
    T-2/var/log/monitor-httpd-error.log
    ......
    software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
    View file @ d1334b4b
    ......@@ -13,13 +13,10 @@ T-2/var/log/httpd/_dummy-cached_access_log
    T-2/var/log/httpd/_dummy-cached_backend_log
    T-2/var/log/httpd/_dummy-cached_error_log
    T-2/var/log/httpd/_enable-http2-default_access_log
    T-2/var/log/httpd/_enable-http2-default_backend_log
    T-2/var/log/httpd/_enable-http2-default_error_log
    T-2/var/log/httpd/_enable-http2-false_access_log
    T-2/var/log/httpd/_enable-http2-false_backend_log
    T-2/var/log/httpd/_enable-http2-false_error_log
    T-2/var/log/httpd/_enable-http2-true_access_log
    T-2/var/log/httpd/_enable-http2-true_backend_log
    T-2/var/log/httpd/_enable-http2-true_error_log
    T-2/var/log/monitor-httpd-access.log
    T-2/var/log/monitor-httpd-error.log
    ......
    software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt
    View file @ d1334b4b
    ......@@ -22,7 +22,6 @@ T-2/var/log/httpd/_auth-to-backend_access_log
    T-2/var/log/httpd/_auth-to-backend_backend_log
    T-2/var/log/httpd/_auth-to-backend_error_log
    T-2/var/log/httpd/_ciphers_access_log
    T-2/var/log/httpd/_ciphers_backend_log
    T-2/var/log/httpd/_ciphers_error_log
    T-2/var/log/httpd/_custom_domain_access_log
    T-2/var/log/httpd/_custom_domain_backend_log
    ......@@ -43,7 +42,6 @@ T-2/var/log/httpd/_disabled-cookie-list_access_log
    T-2/var/log/httpd/_disabled-cookie-list_backend_log
    T-2/var/log/httpd/_disabled-cookie-list_error_log
    T-2/var/log/httpd/_empty_access_log
    T-2/var/log/httpd/_empty_backend_log
    T-2/var/log/httpd/_empty_error_log
    T-2/var/log/httpd/_enable-http2-default_access_log
    T-2/var/log/httpd/_enable-http2-default_backend_log
    ......@@ -79,10 +77,8 @@ T-2/var/log/httpd/_https-only_access_log
    T-2/var/log/httpd/_https-only_backend_log
    T-2/var/log/httpd/_https-only_error_log
    T-2/var/log/httpd/_monitor-ipv4-test_access_log
    T-2/var/log/httpd/_monitor-ipv4-test_backend_log
    T-2/var/log/httpd/_monitor-ipv4-test_error_log
    T-2/var/log/httpd/_monitor-ipv6-test_access_log
    T-2/var/log/httpd/_monitor-ipv6-test_backend_log
    T-2/var/log/httpd/_monitor-ipv6-test_error_log
    T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
    T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log
    ......
    software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt
    View file @ d1334b4b
    ......@@ -22,7 +22,6 @@ T-2/var/log/httpd/_auth-to-backend_access_log
    T-2/var/log/httpd/_auth-to-backend_backend_log
    T-2/var/log/httpd/_auth-to-backend_error_log
    T-2/var/log/httpd/_ciphers_access_log
    T-2/var/log/httpd/_ciphers_backend_log
    T-2/var/log/httpd/_ciphers_error_log
    T-2/var/log/httpd/_custom_domain_access_log
    T-2/var/log/httpd/_custom_domain_backend_log
    ......@@ -43,7 +42,6 @@ T-2/var/log/httpd/_disabled-cookie-list_access_log
    T-2/var/log/httpd/_disabled-cookie-list_backend_log
    T-2/var/log/httpd/_disabled-cookie-list_error_log
    T-2/var/log/httpd/_empty_access_log
    T-2/var/log/httpd/_empty_backend_log
    T-2/var/log/httpd/_empty_error_log
    T-2/var/log/httpd/_enable-http2-default_access_log
    T-2/var/log/httpd/_enable-http2-default_backend_log
    ......@@ -79,10 +77,8 @@ T-2/var/log/httpd/_https-only_access_log
    T-2/var/log/httpd/_https-only_backend_log
    T-2/var/log/httpd/_https-only_error_log
    T-2/var/log/httpd/_monitor-ipv4-test_access_log
    T-2/var/log/httpd/_monitor-ipv4-test_backend_log
    T-2/var/log/httpd/_monitor-ipv4-test_error_log
    T-2/var/log/httpd/_monitor-ipv6-test_access_log
    T-2/var/log/httpd/_monitor-ipv6-test_backend_log
    T-2/var/log/httpd/_monitor-ipv6-test_error_log
    T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
    T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log
    ......
    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