XXX caddy-frontend: Switch from Caddy to Haproxy

TODO:

 * generate configuration for haproxy
 * reimplement caddy-backend-url-validator.in
 * merge frontend and backend haproxy into one process

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = e7d7e1448b6420657e953026573311ca
+md5sum = 69ce0af1c7a1748da04254ac1ca40617
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -30,7 +30,7 @@ md5sum = 59f3a67999f5fb3e595486e2b801af08
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 343e4ddbe38d1fb9d98dd587d4a894b2
+md5sum = 00aa71541c1450ba96524b502c0d9641
 
 [profile-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -42,7 +42,7 @@ md5sum = 2503056e35463e045db3329bb8b6fae8
 
 [caddy-backend-url-validator]
 filename = templates/caddy-backend-url-validator.in
-md5sum = 0979a03476e86bf038516c9565dadc17
+md5sum = fbb059ff2212d36bb041be06d75e8225
 
 [template-not-found-html]
 _update_hash_filename_ = templates/notfound.html

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

@@ -344,7 +344,7 @@ template = inline:
   #!/bin/sh
   export CADDYPATH=${directory:frontend_cluster}
   ulimit -n $(ulimit -Hn)
-  exec {{ software_parameter_dict['caddy'] }} \
+  exec {{ software_parameter_dict['haproxy_executable'] }} \
   -conf ${dynamic-caddy-frontend-template:rendered} \
   -log ${caddy-configuration:error-log} \
   -log-roll-mb 0 \

software/caddy-frontend/software.cfg

@@ -3,7 +3,6 @@ extends =
   buildout.hash.cfg
   ../../stack/slapos.cfg
   ../../component/dash/buildout.cfg
-  ../../component/caddy/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
@@ -124,7 +123,6 @@ bin_directory = ${buildout:bin-directory}
 sixtunnel = ${6tunnel:location}
 nginx = ${nginx-output:nginx}
 nginx_mime = ${nginx-output:mime}
-caddy = ${caddy:output}
 haproxy_executable = ${haproxy:location}/sbin/haproxy
 rsyslogd_executable = ${rsyslogd:location}/sbin/rsyslogd
 curl = ${curl:location}

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -594,7 +594,7 @@ depends =
   ${store-csr_id:command}
   ${store-backend-haproxy-csr_id:command}
 recipe = slapos.cookbook:wrapper
-command-line = {{ software_parameter_dict['caddy'] }}
+command-line = {{ software_parameter_dict['haproxy_executable'] }}
   -conf ${expose-csr_id-template:rendered}
   -log ${expose-csr_id-configuration:error-log}
   -http2=true

software/caddy-frontend/templates/caddy-backend-url-validator.in

 #!${dash:location}/bin/dash
 config="https://example.com {\n  proxy / $1 {\n  }\n}"
 
-echo -e $config | ${caddy:output} -conf stdin -validate > /dev/null 2>&1
+echo -e $config | ${software-parameter-section:haproxy_executable} -conf stdin -validate > /dev/null 2>&1