diff --git a/.github/workflows/molecule-loadbalancer.yml b/.github/workflows/molecule-loadbalancer.yml index 9456def47..86a354be3 100644 --- a/.github/workflows/molecule-loadbalancer.yml +++ b/.github/workflows/molecule-loadbalancer.yml @@ -2,22 +2,23 @@ name: loadbalancer on: - push: - paths: - - 'roles/haproxy/**' - - 'roles/keepalived/**' - - 'roles/bind/**' - - 'molecule/loadbalancer/**' - - 'roles/selfsigned_certs/**' - - '.github/workflows/molecule-loadbalancer.yml' - pull_request: - paths: - - 'roles/haproxy/**' - - 'roles/keepalived/**' - - 'roles/bind/**' - - 'molecule/loadbalancer/**' - - 'roles/selfsigned_certs/**' - - '.github/workflows/molecule-loadbalancer.yml' + workflow_dispatch: + # push: + # paths: + # - 'roles/haproxy/**' + # - 'roles/keepalived/**' + # - 'roles/bind/**' + # - 'molecule/loadbalancer/**' + # - 'roles/selfsigned_certs/**' + # - '.github/workflows/molecule-loadbalancer.yml' + # pull_request: + # paths: + # - 'roles/haproxy/**' + # - 'roles/keepalived/**' + # - 'roles/bind/**' + # - 'molecule/loadbalancer/**' + # - 'roles/selfsigned_certs/**' + # - '.github/workflows/molecule-loadbalancer.yml' jobs: build: diff --git a/.github/workflows/molecule-mongo.yml b/.github/workflows/molecule-mongo.yml index 4d8b6b713..702a4731d 100644 --- a/.github/workflows/molecule-mongo.yml +++ b/.github/workflows/molecule-mongo.yml @@ -2,16 +2,17 @@ name: mongo on: - push: - paths: - - 'roles/mongo/**' - - 'molecule/mongo/**' - - '.github/workflows/molecule-mongo.yml' - pull_request: - paths: - - 'roles/mongo/**' - - 'molecule/mongo/**' - - '.github/workflows/molecule-mongo.yml' + workflow_dispatch: + # push: + # paths: + # - 'roles/mongo/**' + # - 'molecule/mongo/**' + # - '.github/workflows/molecule-mongo.yml' + # pull_request: + # paths: + # - 'roles/mongo/**' + # - 'molecule/mongo/**' + # - '.github/workflows/molecule-mongo.yml' jobs: build: diff --git a/roles/haproxy/templates/haproxy_backend.cfg.j2 b/roles/haproxy/templates/haproxy_backend.cfg.j2 index a9432af76..d2387c033 100644 --- a/roles/haproxy/templates/haproxy_backend.cfg.j2 +++ b/roles/haproxy/templates/haproxy_backend.cfg.j2 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # backend {{ application.name }}_be - option httpchk {{ application.ha_method }} {{ application.ha_url }} + option httpchk {{ application.ha_method }} {{ application.ha_url }} http-check send ver HTTP/1.1 hdr Host {{ application.vhost_name }} {%if application.x_forwarded_port is defined %} @@ -35,8 +35,8 @@ cookie HTTPSERVERID insert nocache indirect httponly secure maxidle {{ haproxy_cookie_max_idle }} {% for server in application.servers %} - server {{ server.label }} {{ server.ip }}:{% if server.port is defined %}{{ server.port }}{% else %}{{ application.port }}{% endif %} cookie {{ server.label }} check inter 8000 fall 5 rise 2 maxconn {{ application.maxconn | default('35') }} {% if application.sslbackend is defined%} ssl verify required verifyhost {{ application.backend_vhost_name }} ca-file {{ application.backend_ca_file }}{% endif %} weight 100 - + server {{ server.label }} {{ server.ip }}:{% if server.port is defined %}{{ server.port }}{% else %}{{ application.port }}{% endif %} cookie {{ server.label }} check inter 8000 fall 5 rise 2 maxconn {{ application.maxconn | default('35') }} {% if application.sslbackend is defined%} ssl verify required verifyhost {{ application.backend_vhost_name }} ca-file {{ application.backend_ca_file }}{% endif %} weight 50 + {% endfor %} {% endfor %} @@ -48,7 +48,7 @@ #--------------------------------------------------------------------- # backend {{ application.name }}_staging_be - option httpchk {{ application.ha_method }} {{ application.ha_url }} + option httpchk {{ application.ha_method }} {{ application.ha_url }} http-check send ver HTTP/1.1 hdr Host {{ application.vhost_name }} {%if application.x_forwarded_port is defined %} @@ -62,8 +62,8 @@ cookie HTTPSERVERIDSTAGING insert nocache indirect httponly secure maxidle {{ haproxy_cookie_max_idle }} {% for server in application.stagingservers %} - server {{ server.label }} {{ server.ip }}:{{ application.port }} cookie {{ server.label }} check inter 8000 fall 5 rise 2 maxconn {{ application.maxconn | default('35') }} {% if application.sslbackend is defined%} ssl verify required verifyhost {{ application.backend_vhost_name }} ca-file {{ application.backend_ca_file }}{% endif %} weight 100 - + server {{ server.label }} {{ server.ip }}:{{ application.port }} cookie {{ server.label }} check inter 8000 fall 5 rise 2 maxconn {{ application.maxconn | default('35') }} {% if application.sslbackend is defined%} ssl verify required verifyhost {{ application.backend_vhost_name }} ca-file {{ application.backend_ca_file }}{% endif %} weight 50 + {% endfor %} {% endif %} {% endfor %}