Commit 13213c8f authored by Jérome Perrin's avatar Jérome Perrin

*: review promises for slapos.toolbox 0.123 compatibility

In b049c057 (upgrade to slapos.toolbox version 0.123, 2021-07-19), we
translated check-secure = 1 to config-http-code = 401, but check-secure = 1
also accepted responses with status code 200.

Thoses promises where checking servers without authentication enabled, they
reply with 200, so update the promises accordingly to expect 200.
parent cdb6e760
......@@ -21,7 +21,7 @@ md5sum = 9e486efe4ab1aba8cb72b04f6c6da8ad
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
md5sum = 115918e0f8854e957ea8388bb064f457
md5sum = 283440057c659bde2ae7fcc2c4c5b781
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
......
......@@ -239,4 +239,3 @@ module = check_url_available
name = html5as-http-frontend.py
url = ${html5as-frontend:connection-secure_access}
config-url = ${:url}
config-http-code = 401
......@@ -19,7 +19,7 @@ md5sum = 6c17361a49cfc47564063b867aab6e8c
[template-jscrawler]
filename = instance-jscrawler.cfg.jinja2.in
md5sum = e76e35d9070bdeca014063e0a00879da
md5sum = f61e0507717447e47c76a2b2712f17f4
[template-jscrawler-builder]
filename = template-jscrawler.builder.sh.in
......
......@@ -50,7 +50,6 @@ return = secure_access domain
module = check_url_available
name = jscrawler_frontend.py
config-url = ${request-jscrawler-frontend:connection-secure_access}
config-http-code = 401
[logrotate-entry-httpd]
<= logrotate-entry-base
......
......@@ -18,7 +18,7 @@ md5sum = 8a08be95a04f1a47098c4fdef80bdfed
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
md5sum = b2273a47198d38f74c0bf84163b2ea1a
md5sum = 839642d7a56447b3f08fa69729faca61
[config-toml.in]
_update_hash_filename_ = templates/config.toml.in
......
......@@ -511,14 +511,12 @@ return = domain secure_access
module = check_url_available
name = check_repman_frontend.py
config-url = https://${repman-frontend:connection-domain}
config-http-code = 401
[repman-backend-promise]
<= monitor-promise-base
module = check_url_available
name = check_repman_backend.py
config-url = ${nginx-parameter:backend-ssl-url}
config-http-code = 401
[template-proxysql-need-stop-start]
recipe = slapos.recipe.template:jinja2
......
......@@ -18,7 +18,7 @@ md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
[template-runner]
filename = instance-runner.cfg
md5sum = 60b4d2025eace8da7de14b5bae3772d9
md5sum = 32326e969e6942e9fb40cdcf7d872ba7
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
......
......@@ -440,7 +440,6 @@ module = check_url_available
name = $${:filename}.py
filename = apache-httpd-listening-on-tcp
config-url = $${apache-httpd:access-url}
config-http-code = 401
[slaprunner-httpd-cors]
recipe = plone.recipe.command
......
......@@ -22,7 +22,7 @@ md5sum = 4afee4377fa9cbc1e4ff80647b2f279c
[instance-lamp]
filename = instance-lamp.cfg.jinja2.in
md5sum = 437ec82ac37b28626091000ba7a991a6
md5sum = 79f562260895df2665a85df5cb442193
[template-apache.conf]
filename = apache.conf.in
......
......@@ -82,7 +82,6 @@ name = lamp-http-frontend.py
url = ${request-frontend:connection-secure_access}
config-url = ${:url}
config-custom-domain = {{ slapparameter_dict.get('custom-domain', '') }}
config-http-code = 401
{% do publish_dict.__setitem__('url', '${lamp-frontend-promise:url}') -%}
......
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