caddy-frontend: Assert Kedifa HTTP reply

As Kedifa speaks HTTP check that it can reply with HTTP, not that just
it is possible to connect to.

/reviewed-on !591

software/caddy-frontend/buildout.hash.cfg

@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = bb68849a97b0305bef149d6aed33a804
+md5sum = 299cea88789c8904e0e4414a55fd3a5c

software/caddy-frontend/instance-kedifa.cfg.in

@@ -10,7 +10,7 @@ parts =
   monitor-base
   directory
   kedifa
-  promise-kedifa-listen-ip-port
+  promise-kedifa-http-reply
   slave-kedifa-information
   caucased
   caucased-promise
@@ -219,12 +219,14 @@ recipe = slapos.cookbook:wrapper
 command-line = kill -SIGHUP `cat ${kedifa-config:pidfile}`
 wrapper-path = ${directory:etc-run}/kedifa-reloader
 
-[promise-kedifa-listen-ip-port]
+[promise-kedifa-http-reply]
 <= promise-plugin-base
-module = check_port_listening
-name = kedifa-ip-port-listening.py
-config-hostname = ${kedifa-config:ip}
-config-port = ${kedifa-config:port}
+module = check_url_available
+name = kedifa-http-reply.py
+# Kedifa replies 500 on /, so use it to be sure that Kedifa replied
+config-http_code = 500
+config-url = https://[${kedifa-config:ip}]:${kedifa-config:port}
+config-ca-cert-file = ${kedifa-config:ca-certificate}
 
 [kedifa]
 recipe = slapos.cookbook:wrapper

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_plugin-CADDY.txt

@@ -7,6 +7,6 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_plugin-CADDY.txt

@@ -7,6 +7,6 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: ERROR
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt

@@ -7,7 +7,7 @@ T-0/etc/plugin/rejected-slave.py: OK
 T-1/etc/plugin/buildout-T-1-status.py: OK
 T-1/etc/plugin/check-free-disk-space.py: OK
 T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-http-reply.py: OK
 T-1/etc/plugin/monitor-bootstrap-status.py: OK
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK