changes
This commit is contained in:
@@ -13,11 +13,10 @@ source /4server/sbin/helpers
|
|||||||
get_contract_info
|
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 "PASSWORD $ODOO_DB_PASSWORD"
|
||||||
|
|
||||||
echo "POSTGRES HOST: $POSTGRES_HOST"
|
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"
|
doas docker exec -it "$UUID" odoo shell --db_host beedb --db_password="$ODOO_DB_PASSWORD" -d "$UUID" --db_user="$UUID"
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ get_contract_info
|
|||||||
|
|
||||||
# Export Odoo database password
|
# Export Odoo database password
|
||||||
export ODOO_DB_PASSWORD
|
export ODOO_DB_PASSWORD
|
||||||
ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql')
|
#ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql')
|
||||||
|
|
||||||
# Display basic info
|
# Display basic info
|
||||||
echo "UUID: $UUID"
|
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"
|
echo "Deleting old backup: $file"
|
||||||
doas rm -f "$file"
|
doas rm -f "$file"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ get_contract_info
|
|||||||
|
|
||||||
# Export Odoo database password
|
# Export Odoo database password
|
||||||
export ODOO_DB_PASSWORD
|
export ODOO_DB_PASSWORD
|
||||||
ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql')
|
#ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql')
|
||||||
|
|
||||||
# Display basic info
|
# Display basic info
|
||||||
echo "UUID: $UUID"
|
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"
|
echo "Deleting old backup: $file"
|
||||||
doas rm -f "$file"
|
doas rm -f "$file"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ get_contract_info
|
|||||||
|
|
||||||
# Export Odoo database password
|
# Export Odoo database password
|
||||||
export ODOO_DB_PASSWORD
|
export ODOO_DB_PASSWORD
|
||||||
ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql')
|
#ODOO_DB_PASSWORD=$(echo "$SECRET" | jq -r '.psql')
|
||||||
|
|
||||||
# Display basic info
|
# Display basic info
|
||||||
echo "UUID: $UUID"
|
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"
|
echo "Deleting old backup: $file"
|
||||||
doas rm -f "$file"
|
doas rm -f "$file"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ POSTGRES_PORT="${POSTGRES_PORT:-5432}"
|
|||||||
POSTGRES_ADMIN_USER="${POSTGRES_ADMIN_USER:-1gtT0sf8klB9lDbYZD9}"
|
POSTGRES_ADMIN_USER="${POSTGRES_ADMIN_USER:-1gtT0sf8klB9lDbYZD9}"
|
||||||
POSTGRES_ADMIN_PASSWORD="${POSTGRES_ADMIN_PASSWORD:-ZpSwWNafyy9GhY2gzHw}"
|
POSTGRES_ADMIN_PASSWORD="${POSTGRES_ADMIN_PASSWORD:-ZpSwWNafyy9GhY2gzHw}"
|
||||||
ODOO_DB_USER="${UUID}"
|
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}"
|
BASEURL="${BASEURL:-/4server/data/$UUID}"
|
||||||
BACKUPURL="/4backup/$UUID"
|
BACKUPURL="/4backup/$UUID"
|
||||||
@@ -52,5 +52,3 @@ END
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
echo "✅ Database '$UUID' and user '$ODOO_DB_USER' removed (if they existed)."
|
echo "✅ Database '$UUID' and user '$ODOO_DB_USER' removed (if they existed)."
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user