From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 18 Jun 2013 08:38:22 +0000 (+0800)
Subject: Only does db_set if the defaults file is found.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e41a2dc45d9396dd03c9f85ee12c2aebeb5fc29d;p=openstack-build%2Fhorizon-build.git

Only does db_set if the defaults file is found.

Rewritten-From: bb6529d68d3debb6f0363d64b774e6d9747f7358
---

diff --git a/trusty/debian/openstack-dashboard-apache.config b/trusty/debian/openstack-dashboard-apache.config
index bee638e..4174d90 100644
--- a/trusty/debian/openstack-dashboard-apache.config
+++ b/trusty/debian/openstack-dashboard-apache.config
@@ -6,23 +6,26 @@ set -e
 
 if [ -r /etc/default/openstack-dashboard-apache ] ; then
 	. /etc/default/openstack-dashboard-apache
-fi
 
-if [ "${HORIZON_ACTIVATE_VHOSTS}" = "true" ] || [ "${HORIZON_ACTIVATE_VHOSTS}" = "yes" ] ; then
-	db_set horizon/activate_vhost true
-else
-	db_set horizon/activate_vhost false
+	if [ "${HORIZON_ACTIVATE_VHOSTS}" = "true" ] || [ "${HORIZON_ACTIVATE_VHOSTS}" = "yes" ] ; then
+		db_set horizon/activate_vhost true
+	else
+		db_set horizon/activate_vhost false
+	fi
 fi
 
+
 db_input high horizon/activate_vhost || true
 db_go || true
 
 db_get horizon/activate_vhost
 if [ "${RET}" = "true" ] ; then
-	if [ "${HORIZON_USE_SSL}" = "true" ] || [ "${HORIZON_USE_SSL}" = "yes" ] ; then
-		db_set horizon/use_ssl true
-	else
-		db_set horizon/use_ssl false
+	if [ -r /etc/default/openstack-dashboard-apache ] ; then
+		if [ "${HORIZON_USE_SSL}" = "true" ] || [ "${HORIZON_USE_SSL}" = "yes" ] ; then
+			db_set horizon/use_ssl true
+		else
+			db_set horizon/use_ssl false
+		fi
 	fi
 
 	db_input high horizon/use_ssl || true