From b482be76cdbc87f00827ec9639baaf107a3e317d Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 18 Jun 2013 16:38:22 +0800 Subject: [PATCH] Only does db_set if the defaults file is found. Rewritten-From: bb6529d68d3debb6f0363d64b774e6d9747f7358 --- .../debian/openstack-dashboard-apache.config | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/xenial/debian/openstack-dashboard-apache.config b/xenial/debian/openstack-dashboard-apache.config index bee638e..4174d90 100644 --- a/xenial/debian/openstack-dashboard-apache.config +++ b/xenial/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 -- 2.45.2