mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #12422 from overleaf/em-server-pro-history-config
Allow git bridge to communicate with history in Server Pro GitOrigin-RevId: f6eca0063e582ad73a7db29d06da0018387de444
This commit is contained in:
parent
330d671c96
commit
8ed9144c7d
2 changed files with 21 additions and 9 deletions
|
@ -271,7 +271,7 @@ const settings = {
|
|||
url: 'http://localhost:3054',
|
||||
},
|
||||
v1_history: {
|
||||
url: 'http://localhost:3100/api',
|
||||
url: process.env.V1_HISTORY_URL || 'http://localhost:3100/api',
|
||||
user: 'staging',
|
||||
pass: process.env.STAGING_PASSWORD,
|
||||
},
|
||||
|
|
|
@ -8,19 +8,31 @@ WEB_API_PASSWORD_FILE=/etc/container_environment/WEB_API_PASSWORD
|
|||
STAGING_PASSWORD_FILE=/etc/container_environment/STAGING_PASSWORD # HTTP auth for history-v1
|
||||
V1_HISTORY_PASSWORD_FILE=/etc/container_environment/V1_HISTORY_PASSWORD
|
||||
CRYPTO_RANDOM_FILE=/etc/container_environment/CRYPTO_RANDOM
|
||||
OT_JWT_AUTH_KEY_FILE=/etc/container_environment/OT_JWT_AUTH_KEY
|
||||
|
||||
if [ ! -f "$WEB_API_PASSWORD_FILE" ] || [ ! -f "$STAGING_PASSWORD_FILE" ] || [ ! -f "$CRYPTO_RANDOM_FILE" ]; then
|
||||
generate_secret () {
|
||||
dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 -w 0 | rev | cut -b 2- | rev | tr -d '\n+/'
|
||||
}
|
||||
|
||||
if [ ! -f "$WEB_API_PASSWORD_FILE" ] ||
|
||||
[ ! -f "$STAGING_PASSWORD_FILE" ] ||
|
||||
[ ! -f "$V1_HISTORY_PASSWORD_FILE" ] ||
|
||||
[ ! -f "$CRYPTO_RANDOM_FILE" ] ||
|
||||
[ ! -f "$OT_JWT_AUTH_KEY_FILE" ]
|
||||
then
|
||||
echo "generating random secrets"
|
||||
|
||||
SECRET=$(dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 -w 0 | rev | cut -b 2- | rev | tr -d '\n+/')
|
||||
echo ${SECRET} > ${WEB_API_PASSWORD_FILE}
|
||||
SECRET=$(generate_secret)
|
||||
echo "${SECRET}" > ${WEB_API_PASSWORD_FILE}
|
||||
|
||||
SECRET=$(dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 -w 0 | rev | cut -b 2- | rev | tr -d '\n+/')
|
||||
echo ${SECRET} > ${STAGING_PASSWORD_FILE}
|
||||
echo ${SECRET} > ${V1_HISTORY_PASSWORD_FILE}
|
||||
SECRET=$(generate_secret)
|
||||
echo "${SECRET}" > ${STAGING_PASSWORD_FILE}
|
||||
echo "${SECRET}" > ${V1_HISTORY_PASSWORD_FILE}
|
||||
|
||||
SECRET=$(dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64 -w 0 | rev | cut -b 2- | rev | tr -d '\n+/')
|
||||
echo ${SECRET} > ${CRYPTO_RANDOM_FILE}
|
||||
SECRET=$(generate_secret)
|
||||
echo "${SECRET}" > ${CRYPTO_RANDOM_FILE}
|
||||
|
||||
SECRET=$(generate_secret)
|
||||
echo "${SECRET}" > ${OT_JWT_AUTH_KEY_FILE}
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue