From b525fdaeaf670273ecb4082a379ddae1cf9e98a6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 11 Apr 2026 19:26:23 -0300 Subject: [PATCH] changes --- app/sbin/ODOO_19/shell | 3 +-- app/sbin/backup/ODOO_17 | 4 +--- app/sbin/backup/ODOO_18 | 4 +--- app/sbin/backup/ODOO_19 | 4 +--- app/sbin/nuke/ODOO_19 | 6 ++---- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/sbin/ODOO_19/shell b/app/sbin/ODOO_19/shell index 939af7c..340a83b 100755 --- a/app/sbin/ODOO_19/shell +++ b/app/sbin/ODOO_19/shell @@ -13,11 +13,10 @@ source /4server/sbin/helpers get_contract_info -export ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') +#export ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') echo "PASSWORD $ODOO_DB_PASSWORD" echo "POSTGRES HOST: $POSTGRES_HOST" doas docker exec -it "$UUID" odoo shell --db_host beedb --db_password="$ODOO_DB_PASSWORD" -d "$UUID" --db_user="$UUID" - diff --git a/app/sbin/backup/ODOO_17 b/app/sbin/backup/ODOO_17 index 3745d3c..1e2dd70 100755 --- a/app/sbin/backup/ODOO_17 +++ b/app/sbin/backup/ODOO_17 @@ -13,7 +13,7 @@ get_contract_info # Export Odoo database password export ODOO_DB_PASSWORD -ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') +#ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') # Display basic info echo "UUID: $UUID" @@ -44,5 +44,3 @@ ls -t "$BACKUP_DIR"/[0-9]*.zip 2>/dev/null | tail -n +$((BACKUP_SLOTS + 1)) | wh echo "Deleting old backup: $file" doas rm -f "$file" done - - diff --git a/app/sbin/backup/ODOO_18 b/app/sbin/backup/ODOO_18 index 3745d3c..1e2dd70 100755 --- a/app/sbin/backup/ODOO_18 +++ b/app/sbin/backup/ODOO_18 @@ -13,7 +13,7 @@ get_contract_info # Export Odoo database password export ODOO_DB_PASSWORD -ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') +#ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') # Display basic info echo "UUID: $UUID" @@ -44,5 +44,3 @@ ls -t "$BACKUP_DIR"/[0-9]*.zip 2>/dev/null | tail -n +$((BACKUP_SLOTS + 1)) | wh echo "Deleting old backup: $file" doas rm -f "$file" done - - diff --git a/app/sbin/backup/ODOO_19 b/app/sbin/backup/ODOO_19 index 3745d3c..1e2dd70 100755 --- a/app/sbin/backup/ODOO_19 +++ b/app/sbin/backup/ODOO_19 @@ -13,7 +13,7 @@ get_contract_info # Export Odoo database password export ODOO_DB_PASSWORD -ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') +#ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') # Display basic info echo "UUID: $UUID" @@ -44,5 +44,3 @@ ls -t "$BACKUP_DIR"/[0-9]*.zip 2>/dev/null | tail -n +$((BACKUP_SLOTS + 1)) | wh echo "Deleting old backup: $file" doas rm -f "$file" done - - diff --git a/app/sbin/nuke/ODOO_19 b/app/sbin/nuke/ODOO_19 index 593686a..34fb8fc 100755 --- a/app/sbin/nuke/ODOO_19 +++ b/app/sbin/nuke/ODOO_19 @@ -12,7 +12,7 @@ POSTGRES_PORT="${POSTGRES_PORT:-5432}" POSTGRES_ADMIN_USER="${POSTGRES_ADMIN_USER:-1gtT0sf8klB9lDbYZD9}" POSTGRES_ADMIN_PASSWORD="${POSTGRES_ADMIN_PASSWORD:-ZpSwWNafyy9GhY2gzHw}" ODOO_DB_USER="${UUID}" -export ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') +#export ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql') BASEURL="${BASEURL:-/4server/data/$UUID}" BACKUPURL="/4backup/$UUID" @@ -24,7 +24,7 @@ if [ -n "${UUID:-}" ]; then echo "Removing directory: $BASEURL" #doas rm -rf "$BASEURL" echo "Removing backup directory $BACKUPURL" - #doas rm -rf $BACKUPURL + #doas rm -rf $BACKUPURL fi @@ -52,5 +52,3 @@ END EOF echo "✅ Database '$UUID' and user '$ODOO_DB_USER' removed (if they existed)." - -