hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3570 from alchemy-fr/PHRDPL-93-trusted-proxy-env-var

Browse Source 
PHRAS-3178 merge PHRASEANET_TRUSTED_PROXY env var
This commit is contained in:
Nicolas Maillat
2020-07-09 23:39:45 +02:00
committed by GitHub
parent 3254ca8ed2 ea23bdd996
commit 93545e6eea
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker/phraseanet/entrypoint.sh
View File

@@ -31,11 +31,14 @@ if [ -f "$FILE" ]; then
bin/setup system:config set registry.email.smtp-password $PHRASEANET_SMTP_PASSWORD
bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL
bin/setup system:config set registry.email.prefix $PHRASEANET_MAIL_OBJECT_PREFIX
if [[ -n $PHRASEANET_TRUSTED_PROXY ]]; then
bin/setup system:config add trusted-proxies $PHRASEANET_TRUSTED_PROXY
fi
fi
if [[ -n ${PHRASEANET_ADMIN_ACCOUNT_ID} && $PHRASEANET_ADMIN_ACCOUNT_ID =~ ^[0-9]+$ ]]; then
bin/console user:password --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y
fi
else
echo "$FILE doesn't exist, entering setup..."
runuser app -c docker/phraseanet/auto-install.sh
@@ -55,7 +58,7 @@ chown -R app:app \
datas \
tmp \
logs \
www
www
if [ -d "plugins/" ];then
chown -R app:app plugins;