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

Merge branch 'dev'

Browse Source
This commit is contained in:
Alexander Trost
2015-11-17 10:23:29 +01:00
parent 787c37a7ac 421023d8a2
commit 64730b499f
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
entrypoint.sh
View File

@@ -59,11 +59,8 @@ unset ZULIP_USER_PASSWORD
# Auto backup settings # Auto backup settings
AUTO_BACKUP_ENABLED="${AUTO_BACKUP_ENABLED:-True}" AUTO_BACKUP_ENABLED="${AUTO_BACKUP_ENABLED:-True}"
AUTO_BACKUP_INTERVAL="${AUTO_BACKUP_INTERVAL:-30 3 * * *}" AUTO_BACKUP_INTERVAL="${AUTO_BACKUP_INTERVAL:-30 3 * * *}"
# entrypoint.sh specific variable(s)
# entrypoint.sh specific variables ZPROJECT_SETTINGS="/home/zulip/deployments/current/zproject/settings.py"
ZULIP_CURRENT_DEPLOY="/home/zulip/deployments/current"
ZPROJECT_SETTINGS="$ZULIP_CURRENT_DEPLOY/zproject/settings.py"
ZULIP_SETTINGS="/etc/zulip/settings.py"
# BEGIN appRun functions # BEGIN appRun functions
# === initialConfiguration === # === initialConfiguration ===
@@ -273,14 +270,26 @@ authenticationBackends() {
local FIRST=true local FIRST=true
echo "$ZULIP_AUTH_BACKENDS" | sed -n 1'p' | tr ',' '\n' | while read AUTH_BACKEND; do echo "$ZULIP_AUTH_BACKENDS" | sed -n 1'p' | tr ',' '\n' | while read AUTH_BACKEND; do
if [ "$FIRST" = true ]; then if [ "$FIRST" = true ]; then
setConfigurationValue "AUTHENTICATION_BACKENDS" "('zproject.backends.${AUTH_BACKEND//\'/\'}',)" "$ZULIP_SETTINGS" "array" setConfigurationValue "AUTHENTICATION_BACKENDS" "('zproject.backends.${AUTH_BACKEND//\'/\'}',)" "/etc/zulip/settings.py" "array"
FIRST=false FIRST=false
else else
setConfigurationValue "AUTHENTICATION_BACKENDS += ('zproject.backends.${AUTH_BACKEND//\'/\'}',)" "" "$ZULIP_SETTINGS" "literal" setConfigurationValue "AUTHENTICATION_BACKENDS += ('zproject.backends.${AUTH_BACKEND//\'/\'}',)" "" "/etc/zulip/settings.py" "literal"
fi fi
echo "Adding authentication backend \"$AUTH_BACKEND\"." echo "Adding authentication backend \"$AUTH_BACKEND\"."
done done
echo "Authentication backend activation succeeded." echo "Authentication backend activation succeeded."
echo "Setting LDAP settings if set ..."
if [ -z "$ZULIP_SETTINGS_AUTH_LDAP_USER_SEARCH" ]; then
setConfigurationValue "AUTH_LDAP_USER_SEARCH" "$ZULIP_SETTINGS_AUTH_LDAP_USER_SEARCH" "/etc/zulip/settings.py" "array"
fi
if [ -z "$ZULIP_SETTINGS_LDAP_APPEND_DOMAIN" ]; then
setConfigurationValue "LDAP_APPEND_DOMAIN" "$ZULIP_SETTINGS_LDAP_APPEND_DOMAIN" "/etc/zulip/settings.py" "string"
fi
if [ -z "$ZULIP_SETTINGS_AUTH_LDAP_USER_ATTR_MAP" ]; then
setConfigurationValue "AUTH_LDAP_USER_ATTR_MAP" "$ZULIP_SETTINGS_AUTH_LDAP_USER_ATTR_MAP" "/etc/zulip/settings.py" "array"
fi
unset ZULIP_SETTINGS_AUTH_LDAP_USER_SEARCH ZULIP_SETTINGS_LDAP_APPEND_DOMAIN ZULIP_SETTINGS_AUTH_LDAP_USER_ATTR_MAP
echo "LDAP settings set."
} }
redisConfiguration() { redisConfiguration() {
echo "Setting redis configuration ..." echo "Setting redis configuration ..."
@@ -292,7 +301,7 @@ redisConfiguration() {
rabbitmqConfiguration() { rabbitmqConfiguration() {
echo "Setting rabbitmq configuration ..." echo "Setting rabbitmq configuration ..."
setConfigurationValue "RABBITMQ_HOST" "$RABBITMQ_HOST" "$ZPROJECT_SETTINGS" setConfigurationValue "RABBITMQ_HOST" "$RABBITMQ_HOST" "$ZPROJECT_SETTINGS"
sed -i "s~pika.ConnectionParameters('localhost',~pika.ConnectionParameters(settings.RABBITMQ_HOST,~g" "$ZULIP_CURRENT_DEPLOY/zerver/lib/queue.py" sed -i "s~pika.ConnectionParameters('localhost',~pika.ConnectionParameters(settings.RABBITMQ_HOST,~g" "/home/zulip/deployments/current/zerver/lib/queue.py"
setConfigurationValue "RABBITMQ_USERNAME" "$RABBITMQ_USERNAME" "$ZPROJECT_SETTINGS" setConfigurationValue "RABBITMQ_USERNAME" "$RABBITMQ_USERNAME" "$ZPROJECT_SETTINGS"
echo "Rabbitmq configuration succeeded." echo "Rabbitmq configuration succeeded."
} }