From 643457a37258c5edcd3e1a0c96583913a052d3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 13 Oct 2022 11:53:49 +0200 Subject: [PATCH] rapid-cdn: Introduce It's based on phased out caddy-frontend, especially as next step is to drop Caddy software from the software release. --- .../caddy-frontend/CHANGES.caddy_frontend.rst | 63 ------------------- .../README.rst} | 0 .../buildout.hash.cfg | 0 .../instance-common.cfg.in | 0 .../instance-frontend.cfg.in | 0 .../instance-input-schema.json | 0 .../instance-kedifa.cfg.in | 0 ...ce-master-publish-slave-information.cfg.in | 0 .../instance-master.cfg.in | 0 .../instance-output-schema.json | 2 +- .../instance-slave-input-schema.json | 0 .../instance-slave-list.cfg.in | 0 .../instance-slave-output-schema.json | 2 +- .../instance.cfg.in | 0 .../{caddy-frontend => rapid-cdn}/setup.py | 0 .../software.cfg | 0 .../software.cfg.json | 4 +- .../{caddy-frontend => rapid-cdn}/software.py | 0 .../templates/Caddyfile.in | 0 .../backend-haproxy-rsyslogd.conf.in | 0 .../templates/backend-haproxy.cfg.in | 0 .../configuration-state-script.sh.in | 0 .../templates/default-virtualhost.conf.in | 0 .../templates/empty.in | 0 .../templates/expose-csr-nginx.conf.in | 0 .../templates/graceful-script.sh.in | 0 .../templates/lazy-script-call.sh.in | 0 .../templates/notfound.html | 0 .../templates/rotate-script.sh.in | 0 .../slave-introspection-httpd-nginx.conf.in | 0 .../trafficserver/logging.yaml.jinja2 | 0 .../trafficserver/records.config.jinja2 | 0 .../trafficserver/storage.config.jinja2 | 0 .../templates/validate-script.sh.in | 0 .../templates/wrapper.in | 0 .../test/setup.py | 4 +- .../test/test.py | 2 +- ...luster_request_instance_parameter_dict.txt | 0 ...efaultDefaultSlave.test00file_list_log.txt | 0 ...efaultDefaultSlave.test00file_list_run.txt | 0 ...ultDefaultSlave.test00supervisor_state.txt | 0 ...DefaultSlave.test_file_list_etc_cron_d.txt | 0 ...aultDefaultSlave.test_file_list_plugin.txt | 0 ...DisableHttp2.test_file_list_etc_cron_d.txt | 0 ...obalDisableHttp2.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...yDefaultFalseSlave.test00file_list_log.txt | 0 ...yDefaultFalseSlave.test00file_list_run.txt | 0 ...faultFalseSlave.test00supervisor_state.txt | 0 ...ltFalseSlave.test_file_list_etc_cron_d.txt | 0 ...efaultFalseSlave.test_file_list_plugin.txt | 0 ...DisableHttp2.test_file_list_etc_cron_d.txt | 0 ...obalDisableHttp2.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...BCCDisabledRequest.test00file_list_log.txt | 0 ...BCCDisabledRequest.test00file_list_run.txt | 0 ...DisabledRequest.test00supervisor_state.txt | 0 ...abledRequest.test_file_list_etc_cron_d.txt | 0 ...CDisabledRequest.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ....TestMasterRequest.test00file_list_log.txt | 0 ....TestMasterRequest.test00file_list_run.txt | 0 ...stMasterRequest.test00supervisor_state.txt | 0 ...asterRequest.test_file_list_etc_cron_d.txt | 0 ...estMasterRequest.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...asterRequestDomain.test00file_list_log.txt | 0 ...asterRequestDomain.test00file_list_run.txt | 0 ...erRequestDomain.test00supervisor_state.txt | 0 ...equestDomain.test_file_list_etc_cron_d.txt | 0 ...terRequestDomain.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...ionUrlDefaultSlave.test00file_list_log.txt | 0 ...ionUrlDefaultSlave.test00file_list_run.txt | 0 ...UrlDefaultSlave.test00supervisor_state.txt | 0 ...DefaultSlave.test_file_list_etc_cron_d.txt | 0 ...nUrlDefaultSlave.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...rificationUrlSlave.test00file_list_log.txt | 0 ...rificationUrlSlave.test00file_list_run.txt | 0 ...icationUrlSlave.test00supervisor_state.txt | 0 ...tionUrlSlave.test_file_list_etc_cron_d.txt | 0 ...ficationUrlSlave.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...TestReplicateSlave.test00file_list_log.txt | 0 ...TestReplicateSlave.test00file_list_run.txt | 0 ...tReplicateSlave.test00supervisor_state.txt | 0 ...plicateSlave.test_file_list_etc_cron_d.txt | 0 ...stReplicateSlave.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 .../test.TestSlave.test00file_list_log.txt | 0 .../test.TestSlave.test00file_list_run.txt | 0 .../test.TestSlave.test00supervisor_state.txt | 0 ...st.TestSlave.test_file_list_etc_cron_d.txt | 0 .../test.TestSlave.test_file_list_plugin.txt | 0 ....TestSlave.test_master_partition_state.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...t.TestSlaveCiphers.test00file_list_log.txt | 0 ...t.TestSlaveCiphers.test00file_list_run.txt | 0 ...estSlaveCiphers.test00supervisor_state.txt | 0 ...SlaveCiphers.test_file_list_etc_cron_d.txt | 0 ...TestSlaveCiphers.test_file_list_plugin.txt | 0 ...DisableHttp2.test_file_list_etc_cron_d.txt | 0 ...obalDisableHttp2.test_file_list_plugin.txt | 0 ...sableHttp2.test_master_partition_state.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...stSlaveHealthCheck.test00file_list_log.txt | 0 ...stSlaveHealthCheck.test00file_list_run.txt | 0 ...laveHealthCheck.test00supervisor_state.txt | 0 ...eHealthCheck.test_file_list_etc_cron_d.txt | 0 ...SlaveHealthCheck.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...veHostHaproxyClash.test00file_list_log.txt | 0 ...veHostHaproxyClash.test00file_list_run.txt | 0 ...ostHaproxyClash.test00supervisor_state.txt | 0 ...HaproxyClash.test_file_list_etc_cron_d.txt | 0 ...HostHaproxyClash.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...icateCompatibility.test00file_list_log.txt | 0 ...icateCompatibility.test00file_list_run.txt | 0 ...teCompatibility.test00supervisor_state.txt | 0 ...ompatibility.test_file_list_etc_cron_d.txt | 0 ...ateCompatibility.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...lityOverrideMaster.test00file_list_log.txt | 0 ...lityOverrideMaster.test00file_list_run.txt | 0 ...yOverrideMaster.test00supervisor_state.txt | 0 ...errideMaster.test_file_list_etc_cron_d.txt | 0 ...tyOverrideMaster.test_file_list_plugin.txt | 0 ...luster_request_instance_parameter_dict.txt | 0 ...ompatibilityUpdate.test00file_list_log.txt | 0 ...ompatibilityUpdate.test00file_list_run.txt | 0 ...atibilityUpdate.test00supervisor_state.txt | 0 ...bilityUpdate.test_file_list_etc_cron_d.txt | 0 ...patibilityUpdate.test_file_list_plugin.txt | 0 software/slapos-sr-testing/software.cfg | 14 ++--- 136 files changed, 14 insertions(+), 77 deletions(-) delete mode 100644 software/caddy-frontend/CHANGES.caddy_frontend.rst rename software/{caddy-frontend/README.caddy_frontend.rst => rapid-cdn/README.rst} (100%) rename software/{caddy-frontend => rapid-cdn}/buildout.hash.cfg (100%) rename software/{caddy-frontend => rapid-cdn}/instance-common.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/instance-frontend.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/instance-input-schema.json (100%) rename software/{caddy-frontend => rapid-cdn}/instance-kedifa.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/instance-master-publish-slave-information.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/instance-master.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/instance-output-schema.json (97%) rename software/{caddy-frontend => rapid-cdn}/instance-slave-input-schema.json (100%) rename software/{caddy-frontend => rapid-cdn}/instance-slave-list.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/instance-slave-output-schema.json (95%) rename software/{caddy-frontend => rapid-cdn}/instance.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/setup.py (100%) rename software/{caddy-frontend => rapid-cdn}/software.cfg (100%) rename software/{caddy-frontend => rapid-cdn}/software.cfg.json (94%) rename software/{caddy-frontend => rapid-cdn}/software.py (100%) rename software/{caddy-frontend => rapid-cdn}/templates/Caddyfile.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/backend-haproxy-rsyslogd.conf.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/backend-haproxy.cfg.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/configuration-state-script.sh.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/default-virtualhost.conf.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/empty.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/expose-csr-nginx.conf.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/graceful-script.sh.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/lazy-script-call.sh.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/notfound.html (100%) rename software/{caddy-frontend => rapid-cdn}/templates/rotate-script.sh.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/slave-introspection-httpd-nginx.conf.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/trafficserver/logging.yaml.jinja2 (100%) rename software/{caddy-frontend => rapid-cdn}/templates/trafficserver/records.config.jinja2 (100%) rename software/{caddy-frontend => rapid-cdn}/templates/trafficserver/storage.config.jinja2 (100%) rename software/{caddy-frontend => rapid-cdn}/templates/validate-script.sh.in (100%) rename software/{caddy-frontend => rapid-cdn}/templates/wrapper.in (100%) rename software/{caddy-frontend => rapid-cdn}/test/setup.py (96%) rename software/{caddy-frontend => rapid-cdn}/test/test.py (99%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequest.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequest.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequest.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequestDomain.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequestDomain.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequestDomain.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlSlave.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestReplicateSlave.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestReplicateSlave.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestReplicateSlave.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlave.test_master_partition_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveCiphers.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveCiphers.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveCiphers.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveGlobalDisableHttp2.test_master_partition_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHealthCheck.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHealthCheck.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHealthCheck.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHostHaproxyClash.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_run.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00supervisor_state.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_etc_cron_d.txt (100%) rename software/{caddy-frontend => rapid-cdn}/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt (100%) diff --git a/software/caddy-frontend/CHANGES.caddy_frontend.rst b/software/caddy-frontend/CHANGES.caddy_frontend.rst deleted file mode 100644 index ae97e6bf2..000000000 --- a/software/caddy-frontend/CHANGES.caddy_frontend.rst +++ /dev/null @@ -1,63 +0,0 @@ -Changes -======= - -Here are listed the most important changes, which might affect upgrades. - -1.0.XXX (XXXX-XX-XX) --------------------- - - * fix: exposed log file names are stabilised - * feature: in case of not found instance more information are provided - * feature: telemetry is fully disabled - * feature: Apache Traffic Server 8.0 is used - * feature: backend-haproxy statistic for haproxy's frontend is available - * fix: slave publication has been fixed in case of mixed case slave reference - * feature: running test/test.py resolves with starting backend used in tests - * fix: automatic caucase-updater usage has been fixed - * fix/workaround: reconnect to backend-haproxy from Caddy and Apache Traffic Server - * fix/feature: use explicitly Apache Traffic Server simulation of stale-if-error, as in reality Apache Traffic Server does not support it - * feature: dropped not used parameters - * feature: Strict-Transport-Security aka HSTS - * fix: use kedifa with with for file with multiple CAs - * feature: support query string (the characters after ? in the url) in url and https-url - * fix: by having unique acl names fix rare bug of directing traffic to https-url instead of url or otherwise - * feature: failover backend - -1.0.164 (2020-09-24) --------------------- - - * feature: serve a stale result up to 1 day if the origin server is down - * feature: request real frontend for slave introspection (aka log access) - * fix: Kedifa reloading, it was resulting with kedifa server disallowing access after some time - * feature: allow to set software release for each node, instead for the whole cluster - * fix: haproxy matches correct hostname in case of wildcards, instead of using wildcard host instead of the specific one - -1.0.160 (2020-08-25) --------------------- - - * haproxy updated from 2.0.15 to 2.0.17 in order to fix issue while accessing inaccessible backends - -1.0.159 (2020-07-30) --------------------- - - * logs are ensured to be available in slave's ``log-access-url`` - * logs from backend Haproxy are also available to slaves - -1.0.158 (2020-07-24) --------------------- - - * manual customisation of profiles has been dropped, as not used, dropped keys are ``apache_custom_http``, ``apache_custom_https``, ``caddy_custom_http``, ``caddy_custom_https`` from slaves and ``-frontend-authorized-slave-string`` from master - * ``re6st-optimal-test`` has been dropped from slave - * QUIC is dropped, as was not used and has been superseded by HTTP/3, dropped key is ``enable-quic`` from master - * haproxy is used as a gateway to backends: - - * ``automatic-internal-backend-client-caucase-csr`` switch for master is introduced to control it CSR signing - * ``proxy-try-duration`` and ``proxy-try-interval`` has been dropped, as Caddy is not used anymore to connect to the backend, and instead ``backend-connect-timeout`` and ``backend-connect-retries`` is used, as it comes from Haproxy - * ``backend-client-caucase-url`` is returned in master and slave, so that backends can use caucase to fetch CA from frontend cluster - * ``request-timeout`` is supported per slave, as now it became possible - * ``authenticate-to-backend`` is added for master and slave, defaulting to False, to have control over cluster default authentication, and make it possible to do it per slave - -1.0.149 (2020-05-05) --------------------- - - * no changes noted diff --git a/software/caddy-frontend/README.caddy_frontend.rst b/software/rapid-cdn/README.rst similarity index 100% rename from software/caddy-frontend/README.caddy_frontend.rst rename to software/rapid-cdn/README.rst diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/rapid-cdn/buildout.hash.cfg similarity index 100% rename from software/caddy-frontend/buildout.hash.cfg rename to software/rapid-cdn/buildout.hash.cfg diff --git a/software/caddy-frontend/instance-common.cfg.in b/software/rapid-cdn/instance-common.cfg.in similarity index 100% rename from software/caddy-frontend/instance-common.cfg.in rename to software/rapid-cdn/instance-common.cfg.in diff --git a/software/caddy-frontend/instance-frontend.cfg.in b/software/rapid-cdn/instance-frontend.cfg.in similarity index 100% rename from software/caddy-frontend/instance-frontend.cfg.in rename to software/rapid-cdn/instance-frontend.cfg.in diff --git a/software/caddy-frontend/instance-input-schema.json b/software/rapid-cdn/instance-input-schema.json similarity index 100% rename from software/caddy-frontend/instance-input-schema.json rename to software/rapid-cdn/instance-input-schema.json diff --git a/software/caddy-frontend/instance-kedifa.cfg.in b/software/rapid-cdn/instance-kedifa.cfg.in similarity index 100% rename from software/caddy-frontend/instance-kedifa.cfg.in rename to software/rapid-cdn/instance-kedifa.cfg.in diff --git a/software/caddy-frontend/instance-master-publish-slave-information.cfg.in b/software/rapid-cdn/instance-master-publish-slave-information.cfg.in similarity index 100% rename from software/caddy-frontend/instance-master-publish-slave-information.cfg.in rename to software/rapid-cdn/instance-master-publish-slave-information.cfg.in diff --git a/software/caddy-frontend/instance-master.cfg.in b/software/rapid-cdn/instance-master.cfg.in similarity index 100% rename from software/caddy-frontend/instance-master.cfg.in rename to software/rapid-cdn/instance-master.cfg.in diff --git a/software/caddy-frontend/instance-output-schema.json b/software/rapid-cdn/instance-output-schema.json similarity index 97% rename from software/caddy-frontend/instance-output-schema.json rename to software/rapid-cdn/instance-output-schema.json index 8ded5b163..c1c0c2289 100644 --- a/software/caddy-frontend/instance-output-schema.json +++ b/software/rapid-cdn/instance-output-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Values returned by Caddy Frontend instanciation", + "description": "Values returned by Rapid.CDN instanciation", "properties": { "accepted-slave-amount": { "description": "Amount of Slaves allocated to the Instance which are deployed", diff --git a/software/caddy-frontend/instance-slave-input-schema.json b/software/rapid-cdn/instance-slave-input-schema.json similarity index 100% rename from software/caddy-frontend/instance-slave-input-schema.json rename to software/rapid-cdn/instance-slave-input-schema.json diff --git a/software/caddy-frontend/instance-slave-list.cfg.in b/software/rapid-cdn/instance-slave-list.cfg.in similarity index 100% rename from software/caddy-frontend/instance-slave-list.cfg.in rename to software/rapid-cdn/instance-slave-list.cfg.in diff --git a/software/caddy-frontend/instance-slave-output-schema.json b/software/rapid-cdn/instance-slave-output-schema.json similarity index 95% rename from software/caddy-frontend/instance-slave-output-schema.json rename to software/rapid-cdn/instance-slave-output-schema.json index 21c4545f7..022105595 100644 --- a/software/caddy-frontend/instance-slave-output-schema.json +++ b/software/rapid-cdn/instance-slave-output-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Values returned by Caddy Frontend instanciation", + "description": "Values returned by Rapid.CDN slave instanciation", "properties": { "domain": { "description": "Base domain used by the instance", diff --git a/software/caddy-frontend/instance.cfg.in b/software/rapid-cdn/instance.cfg.in similarity index 100% rename from software/caddy-frontend/instance.cfg.in rename to software/rapid-cdn/instance.cfg.in diff --git a/software/caddy-frontend/setup.py b/software/rapid-cdn/setup.py similarity index 100% rename from software/caddy-frontend/setup.py rename to software/rapid-cdn/setup.py diff --git a/software/caddy-frontend/software.cfg b/software/rapid-cdn/software.cfg similarity index 100% rename from software/caddy-frontend/software.cfg rename to software/rapid-cdn/software.cfg diff --git a/software/caddy-frontend/software.cfg.json b/software/rapid-cdn/software.cfg.json similarity index 94% rename from software/caddy-frontend/software.cfg.json rename to software/rapid-cdn/software.cfg.json index 6657b392f..313f32922 100644 --- a/software/caddy-frontend/software.cfg.json +++ b/software/rapid-cdn/software.cfg.json @@ -1,6 +1,6 @@ { - "description": "Caddy Frontend", - "name": "Caddy Frontend", + "description": "Rapid.CDN", + "name": "Rapid.CDN", "serialisation": "xml", "software-type": { "custom-personal": { diff --git a/software/caddy-frontend/software.py b/software/rapid-cdn/software.py similarity index 100% rename from software/caddy-frontend/software.py rename to software/rapid-cdn/software.py diff --git a/software/caddy-frontend/templates/Caddyfile.in b/software/rapid-cdn/templates/Caddyfile.in similarity index 100% rename from software/caddy-frontend/templates/Caddyfile.in rename to software/rapid-cdn/templates/Caddyfile.in diff --git a/software/caddy-frontend/templates/backend-haproxy-rsyslogd.conf.in b/software/rapid-cdn/templates/backend-haproxy-rsyslogd.conf.in similarity index 100% rename from software/caddy-frontend/templates/backend-haproxy-rsyslogd.conf.in rename to software/rapid-cdn/templates/backend-haproxy-rsyslogd.conf.in diff --git a/software/caddy-frontend/templates/backend-haproxy.cfg.in b/software/rapid-cdn/templates/backend-haproxy.cfg.in similarity index 100% rename from software/caddy-frontend/templates/backend-haproxy.cfg.in rename to software/rapid-cdn/templates/backend-haproxy.cfg.in diff --git a/software/caddy-frontend/templates/configuration-state-script.sh.in b/software/rapid-cdn/templates/configuration-state-script.sh.in similarity index 100% rename from software/caddy-frontend/templates/configuration-state-script.sh.in rename to software/rapid-cdn/templates/configuration-state-script.sh.in diff --git a/software/caddy-frontend/templates/default-virtualhost.conf.in b/software/rapid-cdn/templates/default-virtualhost.conf.in similarity index 100% rename from software/caddy-frontend/templates/default-virtualhost.conf.in rename to software/rapid-cdn/templates/default-virtualhost.conf.in diff --git a/software/caddy-frontend/templates/empty.in b/software/rapid-cdn/templates/empty.in similarity index 100% rename from software/caddy-frontend/templates/empty.in rename to software/rapid-cdn/templates/empty.in diff --git a/software/caddy-frontend/templates/expose-csr-nginx.conf.in b/software/rapid-cdn/templates/expose-csr-nginx.conf.in similarity index 100% rename from software/caddy-frontend/templates/expose-csr-nginx.conf.in rename to software/rapid-cdn/templates/expose-csr-nginx.conf.in diff --git a/software/caddy-frontend/templates/graceful-script.sh.in b/software/rapid-cdn/templates/graceful-script.sh.in similarity index 100% rename from software/caddy-frontend/templates/graceful-script.sh.in rename to software/rapid-cdn/templates/graceful-script.sh.in diff --git a/software/caddy-frontend/templates/lazy-script-call.sh.in b/software/rapid-cdn/templates/lazy-script-call.sh.in similarity index 100% rename from software/caddy-frontend/templates/lazy-script-call.sh.in rename to software/rapid-cdn/templates/lazy-script-call.sh.in diff --git a/software/caddy-frontend/templates/notfound.html b/software/rapid-cdn/templates/notfound.html similarity index 100% rename from software/caddy-frontend/templates/notfound.html rename to software/rapid-cdn/templates/notfound.html diff --git a/software/caddy-frontend/templates/rotate-script.sh.in b/software/rapid-cdn/templates/rotate-script.sh.in similarity index 100% rename from software/caddy-frontend/templates/rotate-script.sh.in rename to software/rapid-cdn/templates/rotate-script.sh.in diff --git a/software/caddy-frontend/templates/slave-introspection-httpd-nginx.conf.in b/software/rapid-cdn/templates/slave-introspection-httpd-nginx.conf.in similarity index 100% rename from software/caddy-frontend/templates/slave-introspection-httpd-nginx.conf.in rename to software/rapid-cdn/templates/slave-introspection-httpd-nginx.conf.in diff --git a/software/caddy-frontend/templates/trafficserver/logging.yaml.jinja2 b/software/rapid-cdn/templates/trafficserver/logging.yaml.jinja2 similarity index 100% rename from software/caddy-frontend/templates/trafficserver/logging.yaml.jinja2 rename to software/rapid-cdn/templates/trafficserver/logging.yaml.jinja2 diff --git a/software/caddy-frontend/templates/trafficserver/records.config.jinja2 b/software/rapid-cdn/templates/trafficserver/records.config.jinja2 similarity index 100% rename from software/caddy-frontend/templates/trafficserver/records.config.jinja2 rename to software/rapid-cdn/templates/trafficserver/records.config.jinja2 diff --git a/software/caddy-frontend/templates/trafficserver/storage.config.jinja2 b/software/rapid-cdn/templates/trafficserver/storage.config.jinja2 similarity index 100% rename from software/caddy-frontend/templates/trafficserver/storage.config.jinja2 rename to software/rapid-cdn/templates/trafficserver/storage.config.jinja2 diff --git a/software/caddy-frontend/templates/validate-script.sh.in b/software/rapid-cdn/templates/validate-script.sh.in similarity index 100% rename from software/caddy-frontend/templates/validate-script.sh.in rename to software/rapid-cdn/templates/validate-script.sh.in diff --git a/software/caddy-frontend/templates/wrapper.in b/software/rapid-cdn/templates/wrapper.in similarity index 100% rename from software/caddy-frontend/templates/wrapper.in rename to software/rapid-cdn/templates/wrapper.in diff --git a/software/caddy-frontend/test/setup.py b/software/rapid-cdn/test/setup.py similarity index 96% rename from software/caddy-frontend/test/setup.py rename to software/rapid-cdn/test/setup.py index a5886abd2..de374f2ab 100644 --- a/software/caddy-frontend/test/setup.py +++ b/software/rapid-cdn/test/setup.py @@ -27,11 +27,11 @@ from setuptools import setup, find_packages version = '0.0.1.dev0' -name = 'slapos.test.caddy-frontend' +name = 'slapos.test.rapid-cdn' setup(name=name, version=version, - description="Test for SlapOS' Caddy Frontend", + description="Test for SlapOS' Rapid.CDN", maintainer="Nexedi", maintainer_email="info@nexedi.com", url="https://lab.nexedi.com/nexedi/slapos", diff --git a/software/caddy-frontend/test/test.py b/software/rapid-cdn/test/test.py similarity index 99% rename from software/caddy-frontend/test/test.py rename to software/rapid-cdn/test/test.py index 5a3c550e1..7176cc059 100644 --- a/software/caddy-frontend/test/test.py +++ b/software/rapid-cdn/test/test.py @@ -1250,7 +1250,7 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase): os.environ.get( 'SLAPOS_TEST_WORKING_DIR', os.path.join(os.getcwd(), '.slapos'))), - 'caddy-frontend-test') + 'rapid-cdn-test') if not os.path.isdir(cls.working_directory): os.mkdir(cls.working_directory) diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequest.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequest.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequest.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequest.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequest.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequest.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestReplicateSlave.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_master_partition_state.txt b/software/rapid-cdn/test/test_data/test.TestSlave.test_master_partition_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlave.test_master_partition_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlave.test_master_partition_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_master_partition_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_master_partition_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_master_partition_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_master_partition_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_log.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_run.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_run.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_run.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00file_list_run.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00supervisor_state.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00supervisor_state.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00supervisor_state.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00supervisor_state.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_etc_cron_d.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_etc_cron_d.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_etc_cron_d.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_etc_cron_d.txt diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt b/software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt similarity index 100% rename from software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt rename to software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt diff --git a/software/slapos-sr-testing/software.cfg b/software/slapos-sr-testing/software.cfg index aaaa762f9..17df1cae7 100644 --- a/software/slapos-sr-testing/software.cfg +++ b/software/slapos-sr-testing/software.cfg @@ -41,11 +41,6 @@ setup = ${slapos-repository:location}/ egg = slapos.test.backupserver setup = ${slapos-repository:location}/software/backupserver/test/ -[slapos.test.caddy-frontend-setup] -<= setup-develop-egg -egg = slapos.test.caddy-frontend -setup = ${slapos-repository:location}/software/caddy-frontend/test/ - [slapos.test.dufs-setup] <= setup-develop-egg egg = slapos.test.dufs @@ -101,6 +96,11 @@ setup = ${slapos-repository:location}/software/powerdns/test/ egg = slapos.test.proftpd setup = ${slapos-repository:location}/software/proftpd/test/ +[slapos.test.rapid-cdn-setup] +<= setup-develop-egg +egg = slapos.test.rapid-cdn +setup = ${slapos-repository:location}/software/rapid-cdn/test/ + [slapos.test.re6stnet-setup] <= setup-develop-egg egg = slapos.test.re6stnet @@ -301,7 +301,6 @@ eggs += ${slapos.cookbook-setup:egg} ${slapos.test.backupserver-setup:egg} ${slapos.test.beremiz-ide-setup:egg} - ${slapos.test.caddy-frontend-setup:egg} ${slapos.test.caucase-setup:egg} ${slapos.test.cloudooo-setup:egg} ${slapos.test.dream-setup:egg} @@ -330,6 +329,7 @@ eggs += ${slapos.test.plantuml-setup:egg} ${slapos.test.powerdns-setup:egg} ${slapos.test.proftpd-setup:egg} + ${slapos.test.rapid-cdn-setup:egg} ${slapos.test.re6stnet-setup:egg} ${slapos.test.repman-setup:egg} ${slapos.test.restic_rest_server-setup:egg} @@ -389,7 +389,6 @@ tests = json-schemas ${slapos.cookbook-setup:setup} backupserver ${slapos.test.backupserver-setup:setup} beremiz-ide ${slapos.test.beremiz-ide-setup:setup} - caddy-frontend ${slapos.test.caddy-frontend-setup:setup} caucase ${slapos.test.caucase-setup:setup} cloudooo ${slapos.test.cloudooo-setup:setup} dream ${slapos.test.dream-setup:setup} @@ -421,6 +420,7 @@ tests = plantuml ${slapos.test.plantuml-setup:setup} powerdns ${slapos.test.powerdns-setup:setup} proftpd ${slapos.test.proftpd-setup:setup} + rapid-cdn ${slapos.test.rapid-cdn-setup:setup} re6stnet ${slapos.test.re6stnet-setup:setup} repman ${slapos.test.repman-setup:setup} restic-rest-server ${slapos.test.restic_rest_server-setup:setup} -- 2.30.9