Use image password
This commit is contained in:
parent
5292fac6ea
commit
8b84dc19a9
|
@ -58,10 +58,10 @@ function change_password_etherpad {
|
||||||
}
|
}
|
||||||
|
|
||||||
function etherpad_create_database {
|
function etherpad_create_database {
|
||||||
if [ ! $ETHERPAD_ADMIN_PASSWORD ]; then
|
if [ -f $IMAGE_PASSWORD_FILE ]; then
|
||||||
if [ -f $IMAGE_PASSWORD_FILE ]; then
|
ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
|
||||||
ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
|
else
|
||||||
else
|
if [ ! $ETHERPAD_ADMIN_PASSWORD ]; then
|
||||||
ETHERPAD_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
|
ETHERPAD_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -435,10 +435,10 @@ function install_etherpad {
|
||||||
exit 7359
|
exit 7359
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! $ETHERPAD_ADMIN_PASSWORD ]; then
|
if [ -f $IMAGE_PASSWORD_FILE ]; then
|
||||||
if [ -f $IMAGE_PASSWORD_FILE ]; then
|
ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
|
||||||
ETHERPAD_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
|
else
|
||||||
else
|
if [ ! $ETHERPAD_ADMIN_PASSWORD ]; then
|
||||||
ETHERPAD_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
|
ETHERPAD_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue