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

This fixes the change to zproject/settings.py

Browse Source
This commit is contained in:
Alexander Trost
2015-10-22 16:36:35 +02:00
parent d116b77945
commit 573bbee657
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -22,7 +22,7 @@ RUN apt-get -qq update -q && \
rm -rf /root/zulip/puppet/zulip_internal /root/zulip/puppet/zulip && \ rm -rf /root/zulip/puppet/zulip_internal /root/zulip/puppet/zulip && \
mv -f /root/zulip-puppet /root/zulip/puppet/zulip && \ mv -f /root/zulip-puppet /root/zulip/puppet/zulip && \
/root/zulip/scripts/zulip-puppet-apply -f && \ /root/zulip/scripts/zulip-puppet-apply -f && \
cp -a /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \ cp -fa /root/zulip/zproject/local_settings_template.py /etc/zulip/settings.py && \
ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \ ln -nsf /etc/zulip/settings.py /root/zulip/zproject/local_settings.py && \
ZULIP_DEPLOY_PATH=$(/root/zulip/zulip_tools.py make_deploy_path) && \ ZULIP_DEPLOY_PATH=$(/root/zulip/zulip_tools.py make_deploy_path) && \
mv /root/zulip "$ZULIP_DEPLOY_PATH" && \ mv /root/zulip "$ZULIP_DEPLOY_PATH" && \

30
entrypoint.sh
View File

@@ -49,7 +49,7 @@ ZULIP_AUTH_BACKENDS="${ZULIP_AUTH_BACKENDS:-EmailAuthBackend}"
# entrypoint.sh specific variables # entrypoint.sh specific variables
ZULIP_CURRENT_DEPLOY="/home/zulip/deployments/current" ZULIP_CURRENT_DEPLOY="/home/zulip/deployments/current"
ZULIP_SETTINGS="/etc/zulip/settings.py" ZULIP_SETTINGS="/etc/zulip/settings.py"
#ZULIP_ZPROJECT_SETTINGS="$ZULIP_CURRENT_DEPLOY/zproject/settings.py" ZULIP_ZPROJECT_SETTINGS="$ZULIP_CURRENT_DEPLOY/zproject/settings.py"
# Some functions were originally taken from the zulip/zulip repo folder scripts # Some functions were originally taken from the zulip/zulip repo folder scripts
# But modified to fit the docker image :) # But modified to fit the docker image :)
@@ -193,7 +193,7 @@ zulipSetup(){
if [ -z "$DB_HOST_PORT" ]; then if [ -z "$DB_HOST_PORT" ]; then
export DB_HOST_PORT="5432" export DB_HOST_PORT="5432"
fi fi
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
from zerver.lib.db import TimeTrackingConnection from zerver.lib.db import TimeTrackingConnection
REMOTE_POSTGRES_HOST = '$DB_HOST' REMOTE_POSTGRES_HOST = '$DB_HOST'
@@ -215,7 +215,7 @@ DATABASES = {
}, },
} }
EOF EOF
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
CACHES = { CACHES = {
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache', 'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
@@ -241,16 +241,16 @@ EOF
echo "AUTHENTICATION_BACKENDS += ('zproject.backends.$AUTH_BACKEND',)" >> "$ZULIP_SETTINGS" echo "AUTHENTICATION_BACKENDS += ('zproject.backends.$AUTH_BACKEND',)" >> "$ZULIP_SETTINGS"
done done
# Rabbitmq settings # Rabbitmq settings
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
RABBITMQ_HOST = '$RABBITMQ_HOST' RABBITMQ_HOST = '$RABBITMQ_HOST'
EOF EOF
if [ ! -z "$RABBITMQ_USERNAME" ]; then if [ ! -z "$RABBITMQ_USERNAME" ]; then
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
RABBITMQ_USERNAME = '$RABBITMQ_USERNAME' RABBITMQ_USERNAME = '$RABBITMQ_USERNAME'
EOF EOF
fi fi
if [ ! -z "$RABBITMQ_PASS" ]; then if [ ! -z "$RABBITMQ_PASS" ]; then
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
RABBITMQ_PASSWORD = '$RABBITMQ_PASS' RABBITMQ_PASSWORD = '$RABBITMQ_PASS'
EOF EOF
fi fi
@@ -268,24 +268,24 @@ EOF
export REDIS_RATE_LIMITING="True" export REDIS_RATE_LIMITING="True"
;; ;;
esac esac
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
RATE_LIMITING = $REDIS_RATE_LIMITING RATE_LIMITING = $REDIS_RATE_LIMITING
REDIS_HOST = '$REDIS_HOST' REDIS_HOST = '$REDIS_HOST'
REDIS_PORT = $REDIS_HOST_PORT REDIS_PORT = $REDIS_HOST_PORT
EOF EOF
# Camo settings # Camo settings
if [ ! -z "$CAMO_KEY" ]; then if [ ! -z "$CAMO_KEY" ]; then
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
CAMO_KEY = '$CAMO_KEY' CAMO_KEY = '$CAMO_KEY'
EOF EOF
fi fi
if [ ! -z "$CAMO_URI" ]; then if [ ! -z "$CAMO_URI" ]; then
cat >> "$ZULIP_SETTINGS" <<EOF cat >> "$ZULIP_ZPROJECT_SETTINGS" <<EOF
CAMO_URI = '$CAMO_URI' CAMO_URI = '$CAMO_URI'
EOF EOF
fi fi
if [ ! -z "$ZULIP_CUSTOM_SETTINGS" ]; then if [ ! -z "$ZULIP_CUSTOM_SETTINGS" ]; then
echo -e "\n$ZULIP_CUSTOM_SETTINGS" >> "$ZULIP_SETTINGS" echo -e "\n$ZULIP_CUSTOM_SETTINGS" >> "$ZULIP_ZPROJECT_SETTINGS"
fi fi
local SET_SETTINGS=($(env | sed -nr "s/ZULIP_SETTINGS_([A-Z_]*).*/\1/p")) local SET_SETTINGS=($(env | sed -nr "s/ZULIP_SETTINGS_([A-Z_]*).*/\1/p"))
for SETTING_KEY in "${SET_SETTINGS[@]}"; do for SETTING_KEY in "${SET_SETTINGS[@]}"; do
@@ -306,13 +306,13 @@ EOF
export SETTING_VAR="'$SETTING_VAR'" export SETTING_VAR="'$SETTING_VAR'"
;; ;;
esac esac
if [ ! -z "$(grep "$SETTING_KEY" /etc/zulip/zulip-secrets.conf)" ]; then sed -i -r "s~#?${SETTING_KEY}[ ]*=[ ]*['\"]*.*['\"]*$~${SETTING_KEY} = ${SETTING_VAR}~g" "$ZULIP_SETTINGS"
sed -i -r "s~#?${SETTING_KEY}[ ]*=[ ]*['\"]+.*['\"]+$~${SETTING_KEY} = ${SETTING_VAR}~g" "$ZULIP_SETTINGS" SED_CODE=$?
echo "Setting key \"$SETTING_KEY\" to value \"$SETTING_VAR\". Edited $?." if (($SED_CODE > 0)); then
continue
else
echo "$SETTING_KEY = $SETTING_VAR" >> "$ZULIP_SETTINGS" echo "$SETTING_KEY = $SETTING_VAR" >> "$ZULIP_SETTINGS"
echo "Key found for \"$SETTING_KEY\". Added." echo "Key found for \"$SETTING_KEY\". Added."
else
echo "Setting key \"$SETTING_KEY\" to value \"$SETTING_VAR\"."
fi fi
done done
unset SETTING_KEY unset SETTING_KEY