apache-frontend: Include backward compatibility with RootSoftwareInstance.

software/apache-frontend/common.cfg

@@ -58,7 +58,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 5c22b1e0fe601255ebf19adf6093489f
+md5sum = 16b22ef9b0476352e2e5b68f5966ce62
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -72,7 +72,7 @@ mode = 0644
 [template-apache-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
-md5sum = bf3de2d814110d4af8efb5b7b165665b
+md5sum = c495395bf4cae93ff665c5e74e6d4583 
 mode = 0644
 
 [template-slave-list]

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

@@ -14,9 +14,9 @@ context =
 
 {% set part_list = [] -%}
 {% set single_type_key = 'single-' %}
-{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
-{%   set frontend_type = slapparameter_dict.pop('-frontend-type', 'custom-personal') -%}
-{% elif slap_software_type == 'default' -%}
+{% if slap_software_type == "replicate" %}
+{%   set frontend_type = slapparameter_dict.pop('-frontend-type', 'single-default') -%}
+{% elif slap_software_type in ['default', 'RootSoftwareInstance'] -%}
 {%   set frontend_type = "%s%s" % (single_type_key, 'custom-personal') -%}
 {% else -%}
 {%   set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
@@ -131,6 +131,7 @@ rejected-slave-list = {{ json_module.dumps(rejected_slave_list) }}
 [publish-slave-information]
 recipe = slapos.cookbook:softwaretype
 default = ${dynamic-publish-slave-information:rendered}
+RootSoftwareInstance = ${dynamic-publish-slave-information:rendered}
 replicate = ${dynamic-publish-slave-information:rendered}
 custom-personal = ${dynamic-publish-slave-information:rendered}
 custom-group = ${dynamic-publish-slave-information:rendered}

software/apache-frontend/instance.cfg

@@ -31,6 +31,7 @@ context =
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = $${dynamic-template-apache-replicate:rendered}
+RootSoftwareInstance = $${dynamic-template-apache-replicate:rendered}
 custom-personal = $${dynamic-template-apache-replicate:rendered}
 custom-group = $${dynamic-template-apache-replicate:rendered}
 single-default = ${template-apache-frontend:output}