caddy-frontend: Drop external executable for URL checks

validators.url is enough, even for Caddy, to check that URL is correct, and
caddy_backend_url_validator was introduced before validators.

Also calling an external command for each slave takes a lot of time.

software/caddy-frontend/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = e7d7e1448b6420657e953026573311ca
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 8be633e31abe94b6a782bbbf08d6740b
+md5sum = b70f9ce80dd927ead51b4526997b75ed
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
@@ -40,10 +40,6 @@ md5sum = de268251dafa5ad83ebf5b20636365d9
 _update_hash_filename_ = templates/Caddyfile.in
 md5sum = 2503056e35463e045db3329bb8b6fae8
 
-[caddy-backend-url-validator]
-filename = templates/caddy-backend-url-validator.in
-md5sum = 0979a03476e86bf038516c9565dadc17
-
 [template-not-found-html]
 _update_hash_filename_ = templates/notfound.html
 md5sum = 88af61e7abbf30dc99a1a2526161128d

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

@@ -164,7 +164,7 @@ context =
 {%   for url_key in ['url', 'https-url'] %}
 {%     if url_key in slave %}
 {%       set url = (slave[url_key] or '').strip() %}
-{%       if subprocess_module.call([software_parameter_dict['caddy_backend_url_validator'], url]) == 1 or not validators.url(url) %}
+{%       if not validators.url(url) %}
 {%         do slave_error_list.append('slave %s %r invalid' % (url_key, url)) %}
 {%       elif url != slave[url_key] %}
 {%         do slave_warning_list.append('slave %s %r has been converted to %r' % (url_key, slave[url_key], url)) %}

software/caddy-frontend/software.cfg

@@ -115,7 +115,6 @@ template_trafficserver_records_config = ${template-trafficserver-records-config:
 template_trafficserver_storage_config = ${template-trafficserver-storage-config:target}
 template_validate_script = ${template-validate-script:target}
 template_wrapper = ${template-wrapper:output}
-caddy_backend_url_validator = ${caddy-backend-url-validator:output}
 
 # directories
 bin_directory = ${buildout:bin-directory}
@@ -154,12 +153,6 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg.in
 mode = 0644
 
-[caddy-backend-url-validator]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/caddy-backend-url-validator
-mode = 0750
-
 [profile-caddy-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in

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