diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 7727ffc973c5faec84a3a10a72bb4cfc720bbaa4..c9bd41be79df3d3a19e5105f84d49589652f6f8c 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b [template-apache-frontend] filename = instance-apache-frontend.cfg.in -md5sum = bde0f62dfe2eeef8f10b4315535095cb +md5sum = 04f7b96a65c304a8a5bf6265d62bb05a [template-apache-replicate] filename = instance-apache-replicate.cfg.in diff --git a/software/caddy-frontend/instance-apache-frontend.cfg.in b/software/caddy-frontend/instance-apache-frontend.cfg.in index 2aa617d5a07525dbb898d5fc2a32f9262a4dfc84..e188d18f0bdc8d64ade42bcd38964929feae7313 100644 --- a/software/caddy-frontend/instance-apache-frontend.cfg.in +++ b/software/caddy-frontend/instance-apache-frontend.cfg.in @@ -24,7 +24,6 @@ parts = promise-caddy-frontend-v6-http promise-caddy-frontend-cached promise-caddy-frontend-ssl-cached - promise-caddy-is-process-older-than-dependency-set trafficserver-launcher trafficserver-reload @@ -634,11 +633,6 @@ name = caddy_ssl_cached.py config-hostname = {{ instance_parameter['ipv4-random'] }} config-port = ${caddy-configuration:ssl-cache-through-port} -[promise-caddy-is-process-older-than-dependency-set] -recipe = slapos.cookbook:wrapper -command-line = {{ parameter_dict['bin_directory'] }}/is-process-older-than-dependency-set ${caddy-configuration:pid-file} -wrapper-path = ${directory:promise}/caddy-frontend-is-running-actual-software-release - ####### # Monitoring sections # diff --git a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt index 4aceea6ee58b5116c712a8460d6cfb634be61ab2..0ec007f075326b33d8e9e357889b21ffc1f1c778 100644 --- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_promise-CADDY.txt @@ -1,6 +1,4 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK -T-3/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-3/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_promise-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_promise-CADDY.txt index 8d6f75e20bc98a9b854f167974d4bd26983ae43e..90ae9d92fc586554c4f13acd3f5d6ad686c46931 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_promise-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_promise-CADDY.txt @@ -1,4 +1,3 @@ T-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK T-1/etc/promise/caucased: OK -T-2/etc/promise/caddy-frontend-is-running-actual-software-release: OK T-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set: OK \ No newline at end of file