paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-06 06:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the dot from .zulip-secrets.conf

Browse Source
This commit is contained in:
Alexander Trost
2015-10-21 18:09:18 +02:00
parent 24baabd3cf
commit 1c983b88f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
entrypoint.sh
View File

@@ -140,7 +140,7 @@ secretsSetup(){
sed -i -r "s~#?${SECRET_KEY}[ ]*=[ ]*['\"]+.*['\"]+$~${SECRET_KEY} = '${SECRET_VAR}'~g" /etc/zulip/zulip-secrets.conf sed -i -r "s~#?${SECRET_KEY}[ ]*=[ ]*['\"]+.*['\"]+$~${SECRET_KEY} = '${SECRET_VAR}'~g" /etc/zulip/zulip-secrets.conf
continue continue
fi fi
echo "$SECRET_KEY = '$SECRET_VAR'" >> /etc/zulip/zulip-secrets.conf echo "$SECRET_KEY = $SECRET_VAR" >> /etc/zulip/zulip-secrets.conf
done done
unset SECRET_KEY unset SECRET_KEY
} }
@@ -359,9 +359,9 @@ echo "Generating and setting secrets ..."
if [ ! -e "$DATA_DIR/zulip-secrets.conf" ]; then if [ ! -e "$DATA_DIR/zulip-secrets.conf" ]; then
# Generate the secrets # Generate the secrets
/root/zulip/scripts/setup/generate_secrets.py /root/zulip/scripts/setup/generate_secrets.py
mv -f "/etc/zulip/zulip-secrets.conf" "$DATA_DIR/.zulip-secrets.conf" mv -f "/etc/zulip/zulip-secrets.conf" "$DATA_DIR/zulip-secrets.conf"
fi fi
ln -sfT "$DATA_DIR/.zulip-secrets.conf" "/etc/zulip/zulip-secrets.conf" ln -sfT "$DATA_DIR/zulip-secrets.conf" "/etc/zulip/zulip-secrets.conf"
secretsSetup secretsSetup
echo "Secrets generated and set." echo "Secrets generated and set."
echo "Setting Zulip settings ..." echo "Setting Zulip settings ..."
@@ -393,7 +393,7 @@ fi
# If there's an "update" available, then "JUST DO IT!" - Shia Labeouf # If there's an "update" available, then "JUST DO IT!" - Shia Labeouf
if [ ! -e "$DATA_DIR/.zulip-$ZULIP_VERSION" ]; then if [ ! -e "$DATA_DIR/.zulip-$ZULIP_VERSION" ]; then
echo "Starting zulip migration ..." echo "Starting zulip migration ..."
if ! /home/zulip/deployments/current/manage.py migrate; then if ! su zulip -c "/home/zulip/deployments/current/manage.py migrate"; then
echo "Zulip migration failed." echo "Zulip migration failed."
exit 1 exit 1
fi fi