nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-02-25 14:28:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1118 from nextcloud/enh/1073/add-db-check

Browse source 
add a check for init-user-db.sh
This commit is contained in:
Simon L 2022-09-08 15:49:22 +02:00 committed by GitHub
commit d25c74e382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Containers/postgresql/init-user-db.sh
View file

@ -1,9 +1,13 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
touch /mnt/data/initdb.failed
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER "oc_$POSTGRES_USER" WITH PASSWORD '$POSTGRES_PASSWORD' CREATEDB; CREATE USER "oc_$POSTGRES_USER" WITH PASSWORD '$POSTGRES_PASSWORD' CREATEDB;
ALTER DATABASE "$POSTGRES_DB" OWNER TO "oc_$POSTGRES_USER"; ALTER DATABASE "$POSTGRES_DB" OWNER TO "oc_$POSTGRES_USER";
EOSQL EOSQL
rm /mnt/data/initdb.failed
set +ex set +ex

20
Containers/postgresql/start.sh
View file

@ -18,6 +18,16 @@ if ! [ -w "$DUMP_DIR" ]; then
exit 1 exit 1
fi fi
# Check if initdb was successful
if [ -f "/mnt/data/initdb.failed" ]; then
echo "It seems like initializing the database was unsuccessful."
echo "Most likely the timezone is not a valid one."
echo "Please restore a backup, change the timezone to a valid one and try again."
echo "If this is a new instance, clean it properly by following https://github.com/nextcloud/all-in-one#how-to-properly-reset-the-instance"
echo "Afterwards feel free to try again with a valid timezone."
exit 1
fi
# Delete the datadir once (needed for setting the correct credentials on old instances once) # Delete the datadir once (needed for setting the correct credentials on old instances once)
if ! [ -f "$DUMP_DIR/export.failed" ] && ! [ -f "$DUMP_DIR/initial-cleanup-done" ]; then if ! [ -f "$DUMP_DIR/export.failed" ] && ! [ -f "$DUMP_DIR/initial-cleanup-done" ]; then
set -ex set -ex
@ -58,6 +68,11 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
# Create new database # Create new database
exec docker-entrypoint.sh postgres & exec docker-entrypoint.sh postgres &
# Exit if initdb failed
if [ -f "/mnt/data/initdb.failed" ]; then
exit 1
fi
# Wait for creation # Wait for creation
while ! nc -z localhost 11000; do while ! nc -z localhost 11000; do
echo "Waiting for the database to start." echo "Waiting for the database to start."
@ -124,6 +139,11 @@ trap 'true' SIGINT SIGTERM
exec docker-entrypoint.sh postgres & exec docker-entrypoint.sh postgres &
wait $! wait $!
# Exit if initdb failed
if [ -f "/mnt/data/initdb.failed" ]; then
exit 1
fi
# Continue with shutdown procedure: do database dump, etc. # Continue with shutdown procedure: do database dump, etc.
rm -f "$DUMP_FILE.temp" rm -f "$DUMP_FILE.temp"
touch "$DUMP_DIR/export.failed" touch "$DUMP_DIR/export.failed"