From 9d9d3825a04c52346f1f1f1851bce259ba170841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@tiolive.com>
Date: Thu, 4 Jul 2013 14:35:59 +0200
Subject: [PATCH] apache-frontend: clean templates names and location
---
software/apache-frontend/common.cfg | 20 +++++++++----------
.../{ => templates}/000.conf.in | 0
.../apache-custom-slave-list.cfg.in} | 0
.../apache-default-slave-list.cfg.in} | 0
.../{ => templates}/apache.conf.in | 0
.../{ => templates}/apache_cached.conf.in | 0
.../apache_cached_rewrite.txt.in | 0
.../default-virtualhost.conf.in | 0
.../apache-frontend/{ => templates}/empty.in | 0
.../{ => templates}/notfound.html | 0
.../{ => templates}/slave-virtualhost.conf.in | 0
11 files changed, 10 insertions(+), 10 deletions(-)
rename software/apache-frontend/{ => templates}/000.conf.in (100%)
rename software/apache-frontend/{apache-slave-list.cfg.in => templates/apache-custom-slave-list.cfg.in} (100%)
rename software/apache-frontend/{apache-yakari.cfg.in => templates/apache-default-slave-list.cfg.in} (100%)
rename software/apache-frontend/{ => templates}/apache.conf.in (100%)
rename software/apache-frontend/{ => templates}/apache_cached.conf.in (100%)
rename software/apache-frontend/{ => templates}/apache_cached_rewrite.txt.in (100%)
rename software/apache-frontend/{ => templates}/default-virtualhost.conf.in (100%)
rename software/apache-frontend/{ => templates}/empty.in (100%)
rename software/apache-frontend/{ => templates}/notfound.html (100%)
rename software/apache-frontend/{ => templates}/slave-virtualhost.conf.in (100%)
diff --git a/software/apache-frontend/common.cfg b/software/apache-frontend/common.cfg
index bb93e33b43..fb1a810778 100644
--- a/software/apache-frontend/common.cfg
+++ b/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
diff --git a/software/apache-frontend/000.conf.in b/software/apache-frontend/templates/000.conf.in
similarity index 100%
rename from software/apache-frontend/000.conf.in
rename to software/apache-frontend/templates/000.conf.in
diff --git a/software/apache-frontend/apache-slave-list.cfg.in b/software/apache-frontend/templates/apache-custom-slave-list.cfg.in
similarity index 100%
rename from software/apache-frontend/apache-slave-list.cfg.in
rename to software/apache-frontend/templates/apache-custom-slave-list.cfg.in
diff --git a/software/apache-frontend/apache-yakari.cfg.in b/software/apache-frontend/templates/apache-default-slave-list.cfg.in
similarity index 100%
rename from software/apache-frontend/apache-yakari.cfg.in
rename to software/apache-frontend/templates/apache-default-slave-list.cfg.in
diff --git a/software/apache-frontend/apache.conf.in b/software/apache-frontend/templates/apache.conf.in
similarity index 100%
rename from software/apache-frontend/apache.conf.in
rename to software/apache-frontend/templates/apache.conf.in
diff --git a/software/apache-frontend/apache_cached.conf.in b/software/apache-frontend/templates/apache_cached.conf.in
similarity index 100%
rename from software/apache-frontend/apache_cached.conf.in
rename to software/apache-frontend/templates/apache_cached.conf.in
diff --git a/software/apache-frontend/apache_cached_rewrite.txt.in b/software/apache-frontend/templates/apache_cached_rewrite.txt.in
similarity index 100%
rename from software/apache-frontend/apache_cached_rewrite.txt.in
rename to software/apache-frontend/templates/apache_cached_rewrite.txt.in
diff --git a/software/apache-frontend/default-virtualhost.conf.in b/software/apache-frontend/templates/default-virtualhost.conf.in
similarity index 100%
rename from software/apache-frontend/default-virtualhost.conf.in
rename to software/apache-frontend/templates/default-virtualhost.conf.in
diff --git a/software/apache-frontend/empty.in b/software/apache-frontend/templates/empty.in
similarity index 100%
rename from software/apache-frontend/empty.in
rename to software/apache-frontend/templates/empty.in
diff --git a/software/apache-frontend/notfound.html b/software/apache-frontend/templates/notfound.html
similarity index 100%
rename from software/apache-frontend/notfound.html
rename to software/apache-frontend/templates/notfound.html
diff --git a/software/apache-frontend/slave-virtualhost.conf.in b/software/apache-frontend/templates/slave-virtualhost.conf.in
similarity index 100%
rename from software/apache-frontend/slave-virtualhost.conf.in
rename to software/apache-frontend/templates/slave-virtualhost.conf.in
--
2.30.9