diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh index 4ea208bc1860464b82b7031c2485225019828363..6d440b5cd1cefec8901a3e14c19abf2a183b23c1 100644 --- a/pica-etherpad/entrypoint.sh +++ b/pica-etherpad/entrypoint.sh @@ -39,40 +39,38 @@ if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then -e "create database ${ETHERPAD_DB_NAME}" fi -if [ ! -f /opt/etherpad-lite/settings.json ]; then - - cat <<- EOF > /opt/etherpad-lite/settings.json - { - "title": "${ETHERPAD_TITLE}", - "ip": "0.0.0.0", - "port" :${ETHERPAD_PORT}, - "dbType" : "mysql", - "dbSettings" : { - "user" : "${ETHERPAD_DB_USER}", - "host" : "${MYSQL_PORT_3306_TCP_ADDR}", - "password": "${ETHERPAD_DB_PASSWORD}", - "database": "${ETHERPAD_DB_NAME}", - "charset" : "utf8mb4" - }, - EOF +cat <<- EOF > /opt/etherpad-lite/settings.json +{ + "title": "${ETHERPAD_TITLE}", + "ip": "0.0.0.0", + "port" :${ETHERPAD_PORT}, + "dbType" : "mysql", + "dbSettings" : { + "user" : "${ETHERPAD_DB_USER}", + "host" : "${MYSQL_PORT_3306_TCP_ADDR}", + "password": "${ETHERPAD_DB_PASSWORD}", + "database": "${ETHERPAD_DB_NAME}", + "charset" : "utf8mb4" + }, +EOF - if [ $ETHERPAD_ADMIN_PASSWORD ]; then +if [ $ETHERPAD_ADMIN_PASSWORD ]; then - : ${ETHERPAD_ADMIN_USER:=admin} - - cat <<- EOF >> /opt/etherpad-lite/settings.json - "users": { - "${ETHERPAD_ADMIN_USER}": { - "password": "${ETHERPAD_ADMIN_PASSWORD}", - "is_admin": true - } - }, - EOF - fi + : ${ETHERPAD_ADMIN_USER:=admin} cat <<- EOF >> /opt/etherpad-lite/settings.json - } + "users": { + "${ETHERPAD_ADMIN_USER}": { + "password": "${ETHERPAD_ADMIN_PASSWORD}", + "is_admin": true + } + }, EOF fi +cat <<- EOF >> /opt/etherpad-lite/settings.json +} +EOF + + exec "$@"