caddy-frontend: Rename profiles

software/caddy-frontend/buildout.hash.cfg

@@ -14,18 +14,18 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = f1f04e7f27bc6e40a655dd4badb2a8af
+md5sum = adacc6cedd88addedb75726f373ac493
 
 [profile-common]
 filename = instance-common.cfg.in
 md5sum = 5784bea3bd608913769ff9a8afcccb68
 
-[profile-caddy-frontend]
-filename = instance-apache-frontend.cfg.in
-md5sum = 75db32dd9b17c923b16420784dfba581
+[profile-frontend]
+filename = instance-frontend.cfg.in
+md5sum = daf5f53156d0339ca935c2913953e352
 
-[profile-caddy-replicate]
-filename = instance-apache-replicate.cfg.in
+[profile-master]
+filename = instance-master.cfg.in
 md5sum = e7209d9c66fd30e1fa950d2d07957b95
 
 [profile-slave-list]

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

@@ -11,7 +11,7 @@ parts =
   logrotate-entry-caddy
   caddy-frontend
   caddyprofiledeps
-  switch-caddy-softwaretype
+  switch-frontend-softwaretype
   caucase-updater
   caucase-updater-promise
   backend-client-caucase-updater
@@ -166,7 +166,7 @@ expose-csr-var = ${:var}/expose-csr
 # slave introspection
 slave-introspection-var = ${:var}/slave-introspection
 
-[switch-caddy-softwaretype]
+[switch-frontend-softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
 default = dynamic-custom-personal-profile-slave-list:output
 RootSoftwareInstance = ${:default}
@@ -349,7 +349,7 @@ stop-on-error = True
 < = jinja2-template-base
 depends = ${caddyprofiledeps:recipe}
 url = {{ software_parameter_dict['profile_slave_list'] }}
-filename = custom-personal-instance-slave-list.cfg
+filename = instance-slave-list.cfg
 master_key_download_url = {{ dumps(slapparameter_dict['master-key-download-url']) }}
 software_type = single-custom-personal
 organization = {{ slapparameter_dict['cluster-identification'] }}

software/caddy-frontend/instance.cfg.in

@@ -25,12 +25,12 @@ import-list =
 
 [switch-softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
-default = dynamic-profile-caddy-replicate:output
+default = dynamic-profile-master:output
 RootSoftwareInstance = ${:default}
-custom-personal = dynamic-profile-caddy-replicate:output
-single-default = dynamic-profile-caddy-frontend:output
-single-custom-personal = dynamic-profile-caddy-frontend:output
-replicate = dynamic-profile-caddy-replicate:output
+custom-personal = dynamic-profile-master:output
+single-default = dynamic-profile-frontend:output
+single-custom-personal = dynamic-profile-frontend:output
+replicate = dynamic-profile-master:output
 kedifa = dynamic-profile-kedifa:output
 
 [software-parameter-section]
@@ -38,19 +38,19 @@ kedifa = dynamic-profile-kedifa:output
 {{ key }} = {{ dumps(value) }}
 {% endfor -%}
 
-[dynamic-profile-caddy-frontend]
+[dynamic-profile-frontend]
 < = jinja2-template-base
-url = {{ software_parameter_dict['profile_caddy_frontend'] }}
-filename = instance-caddy-frontend.cfg
+url = {{ software_parameter_dict['profile_frontend'] }}
+filename = instance-frontend.cfg
 extra-context =
   import furl_module furl
   raw software_type single-custom-personal
 
-[dynamic-profile-caddy-replicate]
+[dynamic-profile-master]
 < = jinja2-template-base
 depends = ${caddyprofiledeps:recipe}
-url = {{ software_parameter_dict['profile_caddy_replicate'] }}
-filename = instance-caddy-replicate.cfg
+url = {{ software_parameter_dict['profile_master'] }}
+filename = instance-master.cfg
 extra-context =
     import subprocess_module subprocess
     import functools_module functools

software/caddy-frontend/software.cfg

@@ -71,8 +71,8 @@ context =
 caucase_jinja2_library = ${caucase-jinja2-library:target}
 
 # profiles
-profile_caddy_frontend = ${profile-caddy-frontend:target}
-profile_caddy_replicate = ${profile-caddy-replicate:target}
+profile_frontend = ${profile-frontend:target}
+profile_master = ${profile-master:target}
 profile_common = ${profile-common:output}
 profile_kedifa = ${profile-kedifa:target}
 profile_logrotate_base = ${template-logrotate-base:output}
@@ -137,10 +137,10 @@ context =
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 
-[profile-caddy-frontend]
+[profile-frontend]
 <= download-profile
 
-[profile-caddy-replicate]
+[profile-master]
 <= download-profile
 
 [profile-kedifa]

software/caddy-frontend/test/test.py

@@ -2181,7 +2181,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
 
   def test_server_polluted_keys_removed(self):
     buildout_file = os.path.join(
-      self.getMasterPartitionPath(), 'instance-caddy-replicate.cfg')
+      self.getMasterPartitionPath(), 'instance-master.cfg')
     with open(buildout_file) as fh:
       for line in [
         q for q in fh.readlines()
@@ -4708,7 +4708,7 @@ class TestReplicateSlaveOtherDestroyed(SlaveHttpFrontendTestCase):
     self.slap.waitForInstance(self.instance_max_retry)
 
     buildout_file = os.path.join(
-      self.getMasterPartitionPath(), 'instance-caddy-replicate.cfg')
+      self.getMasterPartitionPath(), 'instance-master.cfg')
     with open(buildout_file) as fh:
       buildout_file_content = fh.read()
       node_1_present = re.search(