Merge branch 'master' into chore/cleanup-TABLES_DEFAULT_ADMIN-flag
This commit is contained in:
commit
b8483afcec
|
@ -81,11 +81,17 @@ mkdir -p ${DATA_DIR}/minio
|
|||
mkdir -p ${DATA_DIR}/redis
|
||||
chown -R couchdb:couchdb ${DATA_DIR}/couch
|
||||
|
||||
sed -i "s#DATA_DIR#${DATA_DIR}#g" /etc/redis/redis.conf
|
||||
REDIS_CONFIG="/etc/redis/redis.conf"
|
||||
sed -i "s#DATA_DIR#${DATA_DIR}#g" "${REDIS_CONFIG}"
|
||||
|
||||
if [[ -n "${USE_DEFAULT_REDIS_CONFIG}" ]]; then
|
||||
REDIS_CONFIG=""
|
||||
fi
|
||||
|
||||
if [[ -n "${REDIS_PASSWORD}" ]]; then
|
||||
redis-server /etc/redis/redis.conf --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
|
||||
redis-server "${REDIS_CONFIG}" --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
|
||||
else
|
||||
redis-server /etc/redis/redis.conf > /dev/stdout 2>&1 &
|
||||
redis-server "${REDIS_CONFIG}" > /dev/stdout 2>&1 &
|
||||
fi
|
||||
/bbcouch-runner.sh &
|
||||
|
||||
|
|
Loading…
Reference in New Issue