software/rapid-cdn: Avoid double configuration parameter

software/rapid-cdn/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-frontend]
 filename = instance-frontend.cfg.in
-md5sum = cbdb70c2e93479e5ff0d868997f4adc6
+md5sum = 11c152cb4a23814051eed6d6bb836c00
 
 [profile-master]
 filename = instance-master.cfg.in
@@ -30,7 +30,7 @@ md5sum = 877e08db0fb814882f716a9cd0429c83
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
-md5sum = 3271341d0f2f0f81dc970a458d4030a1
+md5sum = 1c40e4b756503c34edca47c9f46f0f5c
 
 [profile-master-publish-slave-information]
 filename = instance-master-publish-slave-information.cfg.in

software/rapid-cdn/instance-frontend.cfg.in

@@ -1127,7 +1127,7 @@ config-state = empty
 {#- XXX: Some other approach would be useful #}
 {%- set DROP_KEY_LIST = ['recipe', '__buildout_signature__', 'computer', 'partition', 'url', 'key', 'cert'] %}
 {%- for key, value in instance_parameter_dict.items() -%}
-{%-   if not key.startswith('configuration.') and key not in DROP_KEY_LIST %}
+{%-   if not key.startswith('configuration') and key not in DROP_KEY_LIST %}
 {{ key }} = {{ dumps(value) }}
 {%-   endif -%}
 {%- endfor %}

software/rapid-cdn/instance-slave-list.cfg.in

@@ -222,7 +222,7 @@ context =
 {#-   Set slave domain if none was defined #}
 {%-   if slave_instance.get('custom_domain', None) == None %}
 {%-     set domain_prefix = slave_instance.get('slave_reference').replace("-", "").replace("_", "").lower() %}
-{%-     do slave_instance.__setitem__('custom_domain', "%s.%s" % (domain_prefix, instance_parameter_dict['configuration'].get('domain'))) %}
+{%-     do slave_instance.__setitem__('custom_domain', "%s.%s" % (domain_prefix, configuration['domain'])) %}
 {%-   endif %}
 {%-   do slave_publish_dict.__setitem__('domain', slave_instance.get('custom_domain')) %}
 {%-   do slave_publish_dict.__setitem__('url', "http://%s" % slave_instance.get('custom_domain')) %}