From 1f3a29cdab053898997797b5450257541dd40d80 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Tue, 17 May 2022 13:34:16 +0200 Subject: [PATCH] Remove old config checks --- bridgehead | 2 +- lib/prerequisites.sh | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/bridgehead b/bridgehead index 33dca60..c39e1ae 100755 --- a/bridgehead +++ b/bridgehead @@ -44,7 +44,7 @@ esac case "$ACTION" in start) checkRequirements - fetchVarsFromVault /etc/bridgehead/site.conf /etc/bridgehead/$PROJECT.conf || exit 1 + fetchVarsFromVault /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 e157d36..13e32f6 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -40,22 +40,8 @@ if [ ! -d "/etc/bridgehead/" ]; then exit 1 fi -#check if site.conf is created -if [ ! -f /etc/bridgehead/site.conf ]; then - log ERROR "Please create your specific site.conf file from the site.dev.conf" - exit 1 -fi - -#Load site specific variables -source /etc/bridgehead/site.conf - # TODO: Check all required variables here in a generic loop -if [ -z "$SITE_NAME" ]; then - log ERROR "Please set SITE_NAME." - exit 1 -fi - #check if project env is present 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."