From: Thomas Goirand <thomas@goirand.fr>
Date: Sun, 14 Jul 2013 05:54:46 +0000 (+0800)
Subject: Now using .conf as extension for the apache2 site files.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=502c014f4228d271f79f3d5aeb052c596a3e5322;p=openstack-build%2Fhorizon-build.git

Now using .conf as extension for the apache2 site files.

Change-Id: Ibd9c1ec07221d60d78f02fce23c7ad0b6be5e90b
(cherry picked from commit 8c677a0dc69423997f92949f9fe5f7200a8d279a)

Rewritten-From: bd60c8b0df2b34a18eceea96e60dd1c6de96ed82
---

diff --git a/trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect b/trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect.conf
similarity index 100%
rename from trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect
rename to trusty/debian/apache-sites-available/openstack-dashboard-ssl-redirect.conf
diff --git a/trusty/debian/apache-sites-available/openstack-dashboard-ssl b/trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf
similarity index 100%
rename from trusty/debian/apache-sites-available/openstack-dashboard-ssl
rename to trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf
diff --git a/trusty/debian/apache-sites-available/openstack-dashboard b/trusty/debian/apache-sites-available/openstack-dashboard.conf
similarity index 100%
rename from trusty/debian/apache-sites-available/openstack-dashboard
rename to trusty/debian/apache-sites-available/openstack-dashboard.conf
diff --git a/trusty/debian/openstack-dashboard-apache.install b/trusty/debian/openstack-dashboard-apache.install
index 9f2865e..504b1c9 100644
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -1,3 +1,3 @@
-debian/apache-sites-available/openstack-dashboard	/etc/apache2/sites-available
-debian/apache-sites-available/openstack-dashboard-ssl	/etc/apache2/sites-available
-debian/apache-sites-available/openstack-dashboard-ssl-redirect	/etc/apache2/sites-available
+debian/apache-sites-available/openstack-dashboard.conf	/etc/apache2/sites-available
+debian/apache-sites-available/openstack-dashboard-ssl.conf	/etc/apache2/sites-available
+debian/apache-sites-available/openstack-dashboard-ssl-redirect.conf	/etc/apache2/sites-available
diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index da446d9..70d75cb 100644
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/debian/openstack-dashboard-apache.postinst
@@ -29,14 +29,14 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
 			sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=yes#' /etc/default/openstack-dashboard-apache
 			a2enmod ssl
 			a2enmod rewrite
-			a2dissite openstack-dashboard
-			a2ensite openstack-dashboard-ssl-redirect
-			a2ensite openstack-dashboard-ssl
+			a2dissite openstack-dashboard.conf
+			a2ensite openstack-dashboard-ssl-redirect.conf
+			a2ensite openstack-dashboard-ssl.conf
 		else
 			sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=no#' /etc/default/openstack-dashboard-apache
-			a2dissite openstack-dashboard-ssl
-			a2dissite openstack-dashboard-ssl-redirect
-			a2ensite openstack-dashboard
+			a2dissite openstack-dashboard-ssl.conf
+			a2dissite openstack-dashboard-ssl-redirect.conf
+			a2ensite openstack-dashboard.conf
 		fi
 		invoke-rc.d --quiet apache2 reload
 	else