samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move all .env refs to .conf

This commit is contained in:
Patrick Skowronek 2022-05-17 09:37:20 +02:00
parent c6865624e5
commit ce10b41bbb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridgehead
View File

@ -44,7 +44,7 @@ esac
case "$ACTION" in case "$ACTION" in
start) start)
checkRequirements 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 exec docker-compose -f ./$PROJECT/docker-compose.yml --env-file /etc/bridgehead/$PROJECT.conf up
;; ;;
stop) stop)

4
lib/prerequisites.sh
View File

@ -51,8 +51,8 @@ if [ -z "$SITE_NAME" ]; then
fi fi
#check if project env is present #check if project env is present
if [ -d "/etc/bridgehead/${PROJECT}.env" ]; then 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}.env." log ERROR "Project config not found. Please copy the template from ${PROJECT} and put it under /etc/bridgehead-config/${PROJECT}.conf."
exit 1 exit 1
fi fi