g
This commit is contained in:
1 parent
ef641e9fe2
commit
e03bb926e8
8 files changed
+87
-52
No files matched your search
@@ -2,16 +2,15 @@
|
||||
|
||||
|
||||
dump_config (){
|
||||
echo "========== Odoo Container Configuration =========="
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') ========== Odoo Container Configuration =========="
|
||||
echo "UUID: $UUID"
|
||||
echo "BRANCH: $BRANCH"
|
||||
echo "STAGING: $STAGING"
|
||||
echo
|
||||
echo "PostgreSQL Host: $POSTGRES_HOST"
|
||||
echo "PostgreSQL Port: $POSTGRES_PORT"
|
||||
echo "PostgreSQL Admin: $POSTGRES_ADMIN_USER / $POSTGRES_ADMIN_PASSWORD"
|
||||
echo "PostgreSQL Admin: $POSTGRES_ADMIN_USER"
|
||||
echo "ODOO DB User: $ODOO_DB_USER"
|
||||
echo "ODOO DB Password: $ODOO_DB_PASSWORD"
|
||||
echo
|
||||
echo "BASEURL: $BASEURL"
|
||||
echo "DATA_DIR: $DATA_DIR"
|
||||
@@ -52,22 +51,21 @@ wait_for_postgres() {
|
||||
if pg_admin "SELECT 1;" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
echo "Postgres not reachable yet ($i/$tries), retrying..."
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') Postgres at $POSTGRES_HOST:$POSTGRES_PORT not reachable yet ($i/$tries), retrying in 2s"
|
||||
sleep 2
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
check_and_create_db() {
|
||||
echo "check and create"
|
||||
echo "Connecting as $POSTGRES_ADMIN_USER to $POSTGRES_HOST:$POSTGRES_PORT"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') Checking user and database for $UUID (DB user $ODOO_DB_USER) as $POSTGRES_ADMIN_USER on $POSTGRES_HOST:$POSTGRES_PORT"
|
||||
|
||||
# -----------------------------
|
||||
# Never guess: if Postgres cannot be queried we must NOT assume the DB is
|
||||
# missing, because a restore wipes the filestore.
|
||||
# -----------------------------
|
||||
if ! wait_for_postgres; then
|
||||
echo "ERROR: cannot connect to Postgres at $POSTGRES_HOST:$POSTGRES_PORT - skipping DB check, NO restore performed"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') ERROR: cannot connect to Postgres at $POSTGRES_HOST:$POSTGRES_PORT - skipping DB check, NO restore performed"
|
||||
return 1
|
||||
fi
|
||||
|
||||
@@ -76,8 +74,11 @@ fi
|
||||
# -----------------------------
|
||||
USER_EXISTS=$(PGPASSWORD="$POSTGRES_ADMIN_PASSWORD" psql -h "$POSTGRES_HOST" -U "$POSTGRES_ADMIN_USER" -p "$POSTGRES_PORT" -d postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='$ODOO_DB_USER';" | grep -q 1 && echo "yes" || echo "no")
|
||||
if [ "$USER_EXISTS" = "no" ]; then
|
||||
echo "Creating PostgreSQL user $ODOO_DB_USER..."
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') PostgreSQL user $ODOO_DB_USER does not exist, creating it"
|
||||
PGPASSWORD="$POSTGRES_ADMIN_PASSWORD" psql -h "$POSTGRES_HOST" -U "$POSTGRES_ADMIN_USER" -p "$POSTGRES_PORT" -d postgres -c "CREATE USER \"$ODOO_DB_USER\" WITH PASSWORD '$ODOO_DB_PASSWORD';"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') CREATE USER $ODOO_DB_USER finished with exit code $?"
|
||||
else
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') PostgreSQL user $ODOO_DB_USER already exists"
|
||||
fi
|
||||
|
||||
# -----------------------------
|
||||
@@ -86,7 +87,7 @@ fi
|
||||
DB_RESULT=$(pg_admin "SELECT 1 FROM pg_database WHERE datname='$UUID';")
|
||||
DB_RC=$?
|
||||
if [ $DB_RC -ne 0 ]; then
|
||||
echo "ERROR: DB existence query failed (rc=$DB_RC) - NO restore performed"
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') ERROR: existence query for database $UUID failed (rc=$DB_RC) - NO restore performed"
|
||||
return 1
|
||||
fi
|
||||
|
||||
@@ -99,10 +100,16 @@ fi
|
||||
if [ "$DB_EXISTS" = "no" ]; then
|
||||
FILESTORE_HOST="/4server/data/$UUID/odoo/odoo-web-data/filestore"
|
||||
if [ -d "$FILESTORE_HOST" ] && [ -n "$(ls -A "$FILESTORE_HOST" 2>/dev/null)" ]; then
|
||||
echo "ERROR: database $UUID not found but a filestore exists at $FILESTORE_HOST - refusing automatic restore of default.zip (would delete the filestore). Restore manually if intended."
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') ERROR: database $UUID not found but a filestore exists at $FILESTORE_HOST - refusing automatic restore of default.zip (would delete the filestore). Restore manually if intended."
|
||||
return 1
|
||||
fi
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') Database $UUID does not exist and no filestore found, restoring default.zip"
|
||||
/4server/sbin/ODOO_19/restore $UUID default.zip
|
||||
local restore_rc=$?
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') Restore of default.zip for $UUID finished with exit code $restore_rc"
|
||||
return $restore_rc
|
||||
else
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') Database $UUID already exists, nothing to do"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user