caddy-frontend: Stabilize templates and profiles

Some profiles were templates and vice versa, which was very
misleading.

software/caddy-frontend/buildout.hash.cfg

@@ -26,17 +26,17 @@ md5sum = daf5f53156d0339ca935c2913953e352
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = e7209d9c66fd30e1fa950d2d07957b95
+md5sum = a86adb0791e2a00f4e8e4e2ce96221cf
 
 [profile-slave-list]
-_update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
+filename = instance-slave-list.cfg.in
 md5sum = af8caafa72fe821b220b03e92c00fade
 
-[profile-replicate-publish-slave-information]
-_update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
+[profile-master-publish-slave-information]
+filename = instance-master-publish-slave-information.cfg.in
 md5sum = b3422f3624054f57b78d0e50a0de399a
 
-[profile-caddy-frontend-configuration]
+[template-caddy-frontend-configuration]
 _update_hash_filename_ = templates/Caddyfile.in
 md5sum = cb627dfce9ab7bc23fd98818d55876b7
 

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

@@ -467,11 +467,11 @@ config-url =
 #-- Publish slave information
 [publish-slave-information]
 recipe = slapos.cookbook:switch-softwaretype
-default = dynamic-publish-slave-information:output
+default = instance-publish-slave-information:output
 RootSoftwareInstance = ${:default}
-replicate = dynamic-publish-slave-information:output
-custom-personal = dynamic-publish-slave-information:output
-custom-group = dynamic-publish-slave-information:output
+replicate = instance-publish-slave-information:output
+custom-personal = instance-publish-slave-information:output
+custom-group = instance-publish-slave-information:output
 
 [request-kedifa]
 <= slap-connection
@@ -532,10 +532,10 @@ active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, so
 {{ frontend }}-node-information-json = {{ section_part }}:connection-node-information-json}
 {% endfor %}
 
-[dynamic-publish-slave-information]
+[instance-publish-slave-information]
 < = jinja2-template-base
-url = {{ software_parameter_dict['profile_replicate_publish_slave_information'] }}
-filename = dynamic-publish-slave-information.cfg
+url = {{ software_parameter_dict['profile_master_publish_slave_information'] }}
+filename = instance-publish-slave-information.cfg
 extensions = jinja2.ext.do
 extra-context =
     section slave_information slave-information

software/caddy-frontend/software.cfg

@@ -78,13 +78,13 @@ profile_kedifa = ${profile-kedifa:target}
 profile_logrotate_base = ${template-logrotate-base:output}
 profile_monitor = ${monitor-template:output}
 profile_monitor2 = ${monitor2-template:output}
-profile_replicate_publish_slave_information = ${profile-replicate-publish-slave-information:target}
+profile_master_publish_slave_information = ${profile-master-publish-slave-information:target}
 profile_slave_list = ${profile-slave-list:target}
 
 # templates
 template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
 template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
-template_caddy_frontend_configuration = ${profile-caddy-frontend-configuration:target}
+template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
 template_caddy_lazy_script_call = ${template-caddy-lazy-script-call:target}
 template_configuration_state_script = ${template-configuration-state-script:target}
 template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
@@ -146,17 +146,17 @@ url = ${:_profile_base_location_}/${:filename}
 [profile-kedifa]
 <= download-profile
 
+[profile-slave-list]
+<= download-profile
+
+[profile-master-publish-slave-information]
+<= download-profile
+
 [download-template]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 
-[profile-slave-list]
-<=download-template
-
-[profile-replicate-publish-slave-information]
-<=download-template
-
-[profile-caddy-frontend-configuration]
+[template-caddy-frontend-configuration]
 <=download-template
 
 [template-not-found-html]