From ce10b41bbb8606ec850504a38123c0817dd6559a Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Tue, 17 May 2022 09:37:20 +0200 Subject: [PATCH] Move all .env refs to .conf --- bridgehead | 2 +- lib/prerequisites.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgehead b/bridgehead index 7998d86..33dca60 100755 --- a/bridgehead +++ b/bridgehead @@ -44,7 +44,7 @@ esac case "$ACTION" in start) checkRequirements - fetchVarsFromVault /etc/bridgehead/site.conf /etc/bridgehead/$PROJECT.env || exit 1 + fetchVarsFromVault /etc/bridgehead/site.conf /etc/bridgehead/$PROJECT.conf || exit 1 exec docker-compose -f ./$PROJECT/docker-compose.yml --env-file /etc/bridgehead/$PROJECT.conf up ;; stop) diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 8deaf67..b879218 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -51,8 +51,8 @@ if [ -z "$SITE_NAME" ]; then fi #check if project env is present -if [ -d "/etc/bridgehead/${PROJECT}.env" ]; then - log ERROR "Project config not found. Please copy the template from ${PROJECT} and put it under /etc/bridgehead-config/${PROJECT}.env." +if [ -d "/etc/bridgehead/${PROJECT}.conf" ]; then + log ERROR "Project config not found. Please copy the template from ${PROJECT} and put it under /etc/bridgehead-config/${PROJECT}.conf." exit 1 fi