apache-frontend: clean templates names and location

software/apache-frontend/common.cfg

@@ -74,53 +74,53 @@ mode = 0644
 
 [template-slave-list]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/apache-slave-list.cfg.in
+url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
 #md5sum = 53492e520be57f4c6a9eacd107c8d446
 mode = 640
 
 [template-slave-configuration]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/slave-virtualhost.conf.in
+url = ${:_profile_base_location_}/templates/slave-virtualhost.conf.in
 #md5sum = 53492e520be57f4c6a9eacd107c8d446
 mode = 640
 
 [template-apache-frontend-configuration]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/apache.conf.in
+url = ${:_profile_base_location_}/templates/apache.conf.in
 mode = 640
 
 [template-apache-cached-configuration]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/apache_cached.conf.in
+url = ${:_profile_base_location_}/templates/apache_cached.conf.in
 mode = 640
 
 [template-rewrite-cached]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/apache_cached_rewrite.txt.in
+url = ${:_profile_base_location_}/templates/apache_cached_rewrite.txt.in
 mode = 640
 
 [template-custom-slave-list]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/apache-yakari.cfg.in
+url = ${:_profile_base_location_}/templates/apache-default-slave-list.cfg.in
 mode = 640
 
 [template-not-found-html]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/notfound.html
+url = ${:_profile_base_location_}/templates/notfound.html
 filename = notfound.html
 mode = 640
 
 [template-default-virtualhost]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/000.conf.in
+url = ${:_profile_base_location_}/templates/000.conf.in
 mode = 640
 
 [template-default-slave-virtualhost]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/default-virtualhost.conf.in
+url = ${:_profile_base_location_}/templates/default-virtualhost.conf.in
 mode = 640
 
 [template-empty]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/empty.in
+url = ${:_profile_base_location_}/templates/empty.in
 mode = 640
\ No newline at end of file