software.apache-frontend: Remove unecessary "raw" call

software/apache-frontend/common.cfg

@@ -56,7 +56,7 @@ mode = 0644
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = 6d437f8a3836484d42bf9bf8d747e201 
+md5sum = c86c435136f6b910b3dd7dcb84a789a2
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 

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

@@ -147,6 +147,15 @@ extra-context =
     key http_port instance-parameter:configuration.plain_http_port
     key https_port instance-parameter:configuration.port
 
+[software-release-path]
+template-empty = ${template-empty:target}
+template-slave-configuration = ${template-slave-configuration:target}
+template-default-slave-virtualhost = ${template-default-slave-virtualhost:target}
+template-cached-slave-virtualhost = ${template-cached-slave-virtualhost:target}
+template-nginx-eventsource-slave-virtualhost = ${template-nginx-eventsource-slave-virtualhost:target}
+template-nginx-notebook-slave-virtualhost = ${template-nginx-notebook-slave-virtualhost:target}
+apache-location = ${apache-2.2:location}
+
 [dynamic-custom-personal-template-slave-list]
 < = jinja2-template-base
 template = ${template-slave-list:target}
@@ -172,12 +181,12 @@ extra-context =
     key global_ipv6 slap-network-information:global-ipv6
     key cache_port apache-configuration:cache-port
     key varnginx directory:varnginx
-    raw empty_template ${template-empty:target}
-    raw template_custom_slave_configuration ${template-slave-configuration:target}
-    raw template_default_slave_configuration ${template-default-slave-virtualhost:target}
-    raw template_cached_slave_configuration ${template-cached-slave-virtualhost:target}
-    raw template_eventsource_slave_configuration ${template-nginx-eventsource-slave-virtualhost:target}
-    raw template_notebook_slave_configuration ${template-nginx-notebook-slave-virtualhost:target}
+    key empty_template software-release-path:template-empty
+    key template_custom_slave_configuration software-release-path:template-slave-configuration
+    key template_default_slave_configuration software-release-path:template-default-slave-virtualhost
+    key template_cached_slave_configuration software-release-path:template-cached-slave-virtualhost
+    key template_eventsource_slave_configuration software-release-path:template-nginx-eventsource-slave-virtualhost
+    key template_notebook_slave_configuration software-release-path:template-nginx-notebook-slave-virtualhost
     raw software_type single-custom-personal
     section logrotate_dict logrotate
     section frontend_configuration frontend-configuration
@@ -202,7 +211,7 @@ extra-context =
 template = ${template-apache-frontend-configuration:target}
 rendered = $${apache-configuration:frontend-configuration}
 extra-context =
-    raw httpd_home ${apache-2.2:location}
+    key httpd_home software-release-path:apache-location
     key httpd_mod_ssl_cache_directory apache-directory:mod-ssl
     key domain instance-parameter:configuration.domain
     key document_root apache-directory:document-root