feat: Version 3.3.4 - Nouvelle architecture pages, optimisations widgets Flutter et API
- Mise à jour VERSION vers 3.3.4 - Optimisations et révisions architecture API (deploy-api.sh, scripts de migration) - Ajout documentation Stripe Tap to Pay complète - Migration vers polices Inter Variable pour Flutter - Optimisations build Android et nettoyage fichiers temporaires - Amélioration système de déploiement avec gestion backups - Ajout scripts CRON et migrations base de données 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
pierre
@@ -24,8 +24,8 @@ HOST_PORT="22"
|
||||
HOST_USER="root"
|
||||
|
||||
# Configuration des serveurs
|
||||
RCA_HOST="195.154.80.116" # Serveur de recette
|
||||
PRA_HOST="51.159.7.190" # Serveur de production
|
||||
RCA_HOST="195.154.80.116" # IN3 - Serveur de recette
|
||||
PRA_HOST="51.159.7.190" # IN4 - Serveur de production
|
||||
|
||||
# Configuration Incus
|
||||
INCUS_PROJECT="default"
|
||||
@@ -33,9 +33,10 @@ API_PATH="/var/www/geosector/api"
|
||||
FINAL_OWNER="nginx"
|
||||
FINAL_GROUP="nginx"
|
||||
FINAL_OWNER_LOGS="nobody"
|
||||
FINAL_GROUP_LOGS="nginx"
|
||||
|
||||
# Configuration de sauvegarde
|
||||
BACKUP_DIR="/data/backup/geosector"
|
||||
BACKUP_DIR="/data/backup/geosector/api"
|
||||
|
||||
# Couleurs pour les messages
|
||||
GREEN='\033[0;32m'
|
||||
@@ -65,31 +66,20 @@ echo_error() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Fonction pour créer une sauvegarde locale
|
||||
create_local_backup() {
|
||||
local archive_file=$1
|
||||
local backup_type=$2
|
||||
|
||||
echo_info "Creating backup in ${BACKUP_DIR}..."
|
||||
|
||||
if [ ! -d "${BACKUP_DIR}" ]; then
|
||||
mkdir -p "${BACKUP_DIR}" || echo_warning "Could not create backup directory ${BACKUP_DIR}"
|
||||
fi
|
||||
|
||||
if [ -d "${BACKUP_DIR}" ]; then
|
||||
BACKUP_FILE="${BACKUP_DIR}/api-${backup_type}-$(date +%Y%m%d-%H%M%S).tar.gz"
|
||||
cp "${archive_file}" "${BACKUP_FILE}" && {
|
||||
echo_info "Backup saved to: ${BACKUP_FILE}"
|
||||
echo_info "Backup size: $(du -h "${BACKUP_FILE}" | cut -f1)"
|
||||
|
||||
# Nettoyer les anciens backups (garder les 10 derniers)
|
||||
echo_info "Cleaning old backups (keeping last 10)..."
|
||||
ls -t "${BACKUP_DIR}"/api-${backup_type}-*.tar.gz 2>/dev/null | tail -n +11 | xargs -r rm -f && {
|
||||
REMAINING_BACKUPS=$(ls "${BACKUP_DIR}"/api-${backup_type}-*.tar.gz 2>/dev/null | wc -l)
|
||||
echo_info "Kept ${REMAINING_BACKUPS} backup(s)"
|
||||
}
|
||||
} || echo_warning "Failed to create backup in ${BACKUP_DIR}"
|
||||
fi
|
||||
# Fonction pour nettoyer les anciens backups
|
||||
cleanup_old_backups() {
|
||||
local prefix=""
|
||||
case $TARGET_ENV in
|
||||
"dev") prefix="api-dev-" ;;
|
||||
"rca") prefix="api-rca-" ;;
|
||||
"pra") prefix="api-pra-" ;;
|
||||
esac
|
||||
|
||||
echo_info "Cleaning old backups (keeping last 10)..."
|
||||
ls -t "${BACKUP_DIR}"/${prefix}*.tar.gz 2>/dev/null | tail -n +11 | xargs -r rm -f && {
|
||||
REMAINING_BACKUPS=$(ls "${BACKUP_DIR}"/${prefix}*.tar.gz 2>/dev/null | wc -l)
|
||||
echo_info "Kept ${REMAINING_BACKUPS} backup(s) for ${TARGET_ENV}"
|
||||
}
|
||||
}
|
||||
|
||||
# =====================================
|
||||
@@ -98,16 +88,17 @@ create_local_backup() {
|
||||
|
||||
case $TARGET_ENV in
|
||||
"dev")
|
||||
echo_step "Configuring for LOCAL DEV deployment"
|
||||
echo_step "Configuring for DEV deployment on IN3"
|
||||
SOURCE_TYPE="local_code"
|
||||
DEST_CONTAINER="geo"
|
||||
DEST_HOST="local"
|
||||
DEST_CONTAINER="dva-geo"
|
||||
DEST_HOST="${RCA_HOST}" # IN3 pour le DEV aussi
|
||||
ENV_NAME="DEVELOPMENT"
|
||||
;;
|
||||
"rca")
|
||||
echo_step "Configuring for RECETTE delivery"
|
||||
SOURCE_TYPE="local_container"
|
||||
SOURCE_CONTAINER="geo"
|
||||
SOURCE_TYPE="remote_container"
|
||||
SOURCE_CONTAINER="dva-geo"
|
||||
SOURCE_HOST="${RCA_HOST}"
|
||||
DEST_CONTAINER="rca-geo"
|
||||
DEST_HOST="${RCA_HOST}"
|
||||
ENV_NAME="RECETTE"
|
||||
@@ -132,9 +123,29 @@ echo_info "Deployment flow: ${ENV_NAME}"
|
||||
# Création de l'archive selon la source
|
||||
# =====================================
|
||||
|
||||
TIMESTAMP=$(date +%s)
|
||||
ARCHIVE_NAME="api-deploy-${TIMESTAMP}.tar.gz"
|
||||
TEMP_ARCHIVE="/tmp/${ARCHIVE_NAME}"
|
||||
# Créer le dossier de backup s'il n'existe pas
|
||||
if [ ! -d "${BACKUP_DIR}" ]; then
|
||||
echo_info "Creating backup directory ${BACKUP_DIR}..."
|
||||
mkdir -p "${BACKUP_DIR}" || echo_error "Failed to create backup directory"
|
||||
fi
|
||||
|
||||
# Horodatage format YYYYMMDDHH
|
||||
TIMESTAMP=$(date +%Y%m%d%H)
|
||||
|
||||
# Nom de l'archive selon l'environnement
|
||||
case $TARGET_ENV in
|
||||
"dev")
|
||||
ARCHIVE_NAME="api-dev-${TIMESTAMP}.tar.gz"
|
||||
;;
|
||||
"rca")
|
||||
ARCHIVE_NAME="api-rca-${TIMESTAMP}.tar.gz"
|
||||
;;
|
||||
"pra")
|
||||
ARCHIVE_NAME="api-pra-${TIMESTAMP}.tar.gz"
|
||||
;;
|
||||
esac
|
||||
|
||||
ARCHIVE_PATH="${BACKUP_DIR}/${ARCHIVE_NAME}"
|
||||
|
||||
if [ "$SOURCE_TYPE" = "local_code" ]; then
|
||||
# DEV: Créer une archive depuis le code local
|
||||
@@ -165,34 +176,15 @@ if [ "$SOURCE_TYPE" = "local_code" ]; then
|
||||
--exclude='*.swp' \
|
||||
--exclude='*.swo' \
|
||||
--exclude='*~' \
|
||||
--warning=no-file-changed \
|
||||
--no-xattrs \
|
||||
-czf "${TEMP_ARCHIVE}" . || echo_error "Failed to create archive"
|
||||
-czf "${ARCHIVE_PATH}" . 2>/dev/null || echo_error "Failed to create archive"
|
||||
|
||||
echo_info "Archive created: ${ARCHIVE_PATH}"
|
||||
echo_info "Archive size: $(du -h "${ARCHIVE_PATH}" | cut -f1)"
|
||||
|
||||
create_local_backup "${TEMP_ARCHIVE}" "dev"
|
||||
|
||||
elif [ "$SOURCE_TYPE" = "local_container" ]; then
|
||||
# RCA: Créer une archive depuis le container local
|
||||
echo_step "Creating archive from local container ${SOURCE_CONTAINER}..."
|
||||
|
||||
echo_info "Switching to Incus project ${INCUS_PROJECT}..."
|
||||
incus project switch ${INCUS_PROJECT} || echo_error "Failed to switch project"
|
||||
|
||||
# Créer l'archive directement depuis le container local
|
||||
incus exec ${SOURCE_CONTAINER} -- tar \
|
||||
--exclude='logs' \
|
||||
--exclude='uploads' \
|
||||
--warning=no-file-changed \
|
||||
-czf /tmp/${ARCHIVE_NAME} -C ${API_PATH} . || echo_error "Failed to create archive from container"
|
||||
|
||||
# Récupérer l'archive depuis le container
|
||||
incus file pull ${SOURCE_CONTAINER}/tmp/${ARCHIVE_NAME} ${TEMP_ARCHIVE} || echo_error "Failed to pull archive from container"
|
||||
incus exec ${SOURCE_CONTAINER} -- rm -f /tmp/${ARCHIVE_NAME}
|
||||
|
||||
create_local_backup "${TEMP_ARCHIVE}" "to-rca"
|
||||
# Cette section n'est plus utilisée car RCA utilise maintenant remote_container
|
||||
|
||||
elif [ "$SOURCE_TYPE" = "remote_container" ]; then
|
||||
# PRA: Créer une archive depuis un container distant
|
||||
# RCA et PRA: Créer une archive depuis un container distant
|
||||
echo_step "Creating archive from remote container ${SOURCE_CONTAINER} on ${SOURCE_HOST}..."
|
||||
|
||||
# Créer l'archive sur le serveur source
|
||||
@@ -201,7 +193,6 @@ elif [ "$SOURCE_TYPE" = "remote_container" ]; then
|
||||
incus exec ${SOURCE_CONTAINER} -- tar \
|
||||
--exclude='logs' \
|
||||
--exclude='uploads' \
|
||||
--warning=no-file-changed \
|
||||
-czf /tmp/${ARCHIVE_NAME} -C ${API_PATH} .
|
||||
" || echo_error "Failed to create archive on remote"
|
||||
|
||||
@@ -211,54 +202,23 @@ elif [ "$SOURCE_TYPE" = "remote_container" ]; then
|
||||
incus exec ${SOURCE_CONTAINER} -- rm -f /tmp/${ARCHIVE_NAME}
|
||||
" || echo_error "Failed to extract archive from remote container"
|
||||
|
||||
# Copier l'archive vers la machine locale pour backup
|
||||
scp -i ${HOST_KEY} -P ${HOST_PORT} ${HOST_USER}@${SOURCE_HOST}:/tmp/${ARCHIVE_NAME} ${TEMP_ARCHIVE} || echo_error "Failed to copy archive locally"
|
||||
|
||||
create_local_backup "${TEMP_ARCHIVE}" "to-pra"
|
||||
# Copier l'archive vers la machine locale
|
||||
scp -i ${HOST_KEY} -P ${HOST_PORT} ${HOST_USER}@${SOURCE_HOST}:/tmp/${ARCHIVE_NAME} ${ARCHIVE_PATH} || echo_error "Failed to copy archive locally"
|
||||
|
||||
echo_info "Archive saved: ${ARCHIVE_PATH}"
|
||||
echo_info "Archive size: $(du -h "${ARCHIVE_PATH}" | cut -f1)"
|
||||
fi
|
||||
|
||||
ARCHIVE_SIZE=$(du -h "${TEMP_ARCHIVE}" | cut -f1)
|
||||
echo_info "Archive size: ${ARCHIVE_SIZE}"
|
||||
# Nettoyer les anciens backups
|
||||
cleanup_old_backups
|
||||
|
||||
# =====================================
|
||||
# Déploiement selon la destination
|
||||
# =====================================
|
||||
|
||||
if [ "$DEST_HOST" = "local" ]; then
|
||||
# Déploiement sur container local (DEV)
|
||||
echo_step "Deploying to local container ${DEST_CONTAINER}..."
|
||||
|
||||
echo_info "Switching to Incus project ${INCUS_PROJECT}..."
|
||||
incus project switch ${INCUS_PROJECT} || echo_error "Failed to switch to project ${INCUS_PROJECT}"
|
||||
|
||||
echo_info "Pushing archive to container..."
|
||||
incus file push "${TEMP_ARCHIVE}" ${DEST_CONTAINER}/tmp/${ARCHIVE_NAME} || echo_error "Failed to push archive to container"
|
||||
|
||||
echo_info "Preparing deployment directory..."
|
||||
incus exec ${DEST_CONTAINER} -- mkdir -p ${API_PATH} || echo_error "Failed to create deployment directory"
|
||||
incus exec ${DEST_CONTAINER} -- rm -rf ${API_PATH}/* || echo_warning "Could not clean deployment directory"
|
||||
|
||||
echo_info "Extracting archive..."
|
||||
incus exec ${DEST_CONTAINER} -- tar -xzf /tmp/${ARCHIVE_NAME} -C ${API_PATH}/ || echo_error "Failed to extract archive"
|
||||
|
||||
echo_info "Setting permissions..."
|
||||
incus exec ${DEST_CONTAINER} -- mkdir -p ${API_PATH}/logs ${API_PATH}/uploads
|
||||
incus exec ${DEST_CONTAINER} -- chown -R ${FINAL_OWNER}:${FINAL_GROUP} ${API_PATH}
|
||||
incus exec ${DEST_CONTAINER} -- find ${API_PATH} -type d -exec chmod 755 {} \;
|
||||
incus exec ${DEST_CONTAINER} -- find ${API_PATH} -type f -exec chmod 644 {} \;
|
||||
|
||||
# Permissions spéciales pour logs et uploads
|
||||
incus exec ${DEST_CONTAINER} -- chown -R ${FINAL_OWNER}:${FINAL_OWNER_LOGS} ${API_PATH}/logs ${API_PATH}/uploads
|
||||
incus exec ${DEST_CONTAINER} -- chmod -R 775 ${API_PATH}/logs ${API_PATH}/uploads
|
||||
|
||||
echo_info "Updating Composer dependencies..."
|
||||
incus exec ${DEST_CONTAINER} -- bash -c "cd ${API_PATH} && composer update --no-dev --optimize-autoloader" || echo_warning "Composer not available or failed"
|
||||
|
||||
echo_info "Cleaning up..."
|
||||
incus exec ${DEST_CONTAINER} -- rm -f /tmp/${ARCHIVE_NAME}
|
||||
|
||||
else
|
||||
# Déploiement sur container distant (RCA ou PRA)
|
||||
# Tous les déploiements se font maintenant sur des containers distants
|
||||
if [ "$DEST_HOST" != "local" ]; then
|
||||
# Déploiement sur container distant (DEV, RCA ou PRA)
|
||||
echo_step "Deploying to remote container ${DEST_CONTAINER} on ${DEST_HOST}..."
|
||||
|
||||
# Créer une sauvegarde sur le serveur de destination
|
||||
@@ -276,17 +236,20 @@ else
|
||||
# Transférer l'archive vers le serveur de destination
|
||||
echo_info "Transferring archive to ${DEST_HOST}..."
|
||||
|
||||
if [ "$SOURCE_TYPE" = "local_container" ]; then
|
||||
# Pour RCA: copier depuis local vers distant
|
||||
scp -i ${HOST_KEY} -P ${HOST_PORT} ${TEMP_ARCHIVE} ${HOST_USER}@${DEST_HOST}:/tmp/${ARCHIVE_NAME} || echo_error "Failed to copy archive to destination"
|
||||
if [ "$SOURCE_TYPE" = "local_code" ]; then
|
||||
# Pour DEV: copier depuis local vers IN3
|
||||
scp -i ${HOST_KEY} -P ${HOST_PORT} ${ARCHIVE_PATH} ${HOST_USER}@${DEST_HOST}:/tmp/${ARCHIVE_NAME} || echo_error "Failed to copy archive to destination"
|
||||
elif [ "$SOURCE_TYPE" = "remote_container" ] && [ "$SOURCE_HOST" = "$DEST_HOST" ]; then
|
||||
# Pour RCA: même serveur (IN3), pas de transfert nécessaire, l'archive est déjà là
|
||||
echo_info "Archive already on destination server (same host)"
|
||||
else
|
||||
# Pour PRA: copier de serveur à serveur
|
||||
ssh -i ${HOST_KEY} -p ${HOST_PORT} ${HOST_USER}@${SOURCE_HOST} "
|
||||
scp -i ${HOST_KEY} -P ${HOST_PORT} /tmp/${ARCHIVE_NAME} ${HOST_USER}@${DEST_HOST}:/tmp/${ARCHIVE_NAME}
|
||||
" || echo_error "Failed to transfer archive between servers"
|
||||
|
||||
# Nettoyer sur le serveur source
|
||||
ssh -i ${HOST_KEY} -p ${HOST_PORT} ${HOST_USER}@${SOURCE_HOST} "rm -f /tmp/${ARCHIVE_NAME}"
|
||||
# Pour PRA: l'archive est déjà sur la machine locale (copiée depuis IN3)
|
||||
# On la transfère maintenant vers IN4
|
||||
echo_info "Transferring archive from local to IN4..."
|
||||
scp -i ${HOST_KEY} -P ${HOST_PORT} ${ARCHIVE_PATH} ${HOST_USER}@${DEST_HOST}:/tmp/${ARCHIVE_NAME} || echo_error "Failed to copy archive to IN4"
|
||||
|
||||
# Nettoyer sur le serveur source IN3
|
||||
ssh -i ${HOST_KEY} -p ${HOST_PORT} ${HOST_USER}@${SOURCE_HOST} "rm -f /tmp/${ARCHIVE_NAME}" || echo_warning "Could not clean source server"
|
||||
fi
|
||||
|
||||
# Déployer sur le container de destination
|
||||
@@ -311,16 +274,16 @@ else
|
||||
|
||||
# Permissions spéciales pour logs
|
||||
incus exec ${DEST_CONTAINER} -- test -d ${API_PATH}/logs &&
|
||||
incus exec ${DEST_CONTAINER} -- chown -R ${FINAL_OWNER}:${FINAL_OWNER_LOGS} ${API_PATH}/logs &&
|
||||
incus exec ${DEST_CONTAINER} -- chmod -R 775 ${API_PATH}/logs || true &&
|
||||
incus exec ${DEST_CONTAINER} -- chown -R ${FINAL_OWNER_LOGS}:${FINAL_GROUP_LOGS} ${API_PATH}/logs &&
|
||||
incus exec ${DEST_CONTAINER} -- chmod -R 755 ${API_PATH}/logs || true &&
|
||||
|
||||
# Permissions spéciales pour uploads
|
||||
incus exec ${DEST_CONTAINER} -- test -d ${API_PATH}/uploads &&
|
||||
incus exec ${DEST_CONTAINER} -- chown -R ${FINAL_OWNER}:${FINAL_OWNER_LOGS} ${API_PATH}/uploads &&
|
||||
incus exec ${DEST_CONTAINER} -- chmod -R 775 ${API_PATH}/uploads || true &&
|
||||
incus exec ${DEST_CONTAINER} -- chown -R ${FINAL_OWNER_LOGS}:${FINAL_GROUP_LOGS} ${API_PATH}/uploads &&
|
||||
incus exec ${DEST_CONTAINER} -- chmod -R 755 ${API_PATH}/uploads || true &&
|
||||
|
||||
# Composer
|
||||
incus exec ${DEST_CONTAINER} -- bash -c 'cd ${API_PATH} && composer update --no-dev --optimize-autoloader' || echo 'Composer update skipped' &&
|
||||
incus exec ${DEST_CONTAINER} -- bash -c 'cd ${API_PATH} && composer install --no-dev --optimize-autoloader' || echo 'Composer install skipped' &&
|
||||
|
||||
# Nettoyage
|
||||
incus exec ${DEST_CONTAINER} -- rm -f /tmp/${ARCHIVE_NAME} &&
|
||||
@@ -330,8 +293,8 @@ else
|
||||
echo_info "Remote backup saved: ${REMOTE_BACKUP_DIR} on ${DEST_CONTAINER}"
|
||||
fi
|
||||
|
||||
# Nettoyage local
|
||||
rm -f "${TEMP_ARCHIVE}"
|
||||
# L'archive reste dans le dossier de backup, pas de nettoyage nécessaire
|
||||
echo_info "Archive preserved in backup directory: ${ARCHIVE_PATH}"
|
||||
|
||||
# =====================================
|
||||
# Résumé final
|
||||
@@ -341,9 +304,9 @@ echo_step "Deployment completed successfully!"
|
||||
echo_info "Environment: ${ENV_NAME}"
|
||||
|
||||
if [ "$TARGET_ENV" = "dev" ]; then
|
||||
echo_info "Deployed from local code to container ${DEST_CONTAINER}"
|
||||
echo_info "Deployed from local code to container ${DEST_CONTAINER} on IN3 (${DEST_HOST})"
|
||||
elif [ "$TARGET_ENV" = "rca" ]; then
|
||||
echo_info "Delivered from ${SOURCE_CONTAINER} (local) to ${DEST_CONTAINER} on ${DEST_HOST}"
|
||||
echo_info "Delivered from ${SOURCE_CONTAINER} to ${DEST_CONTAINER} on ${DEST_HOST}"
|
||||
elif [ "$TARGET_ENV" = "pra" ]; then
|
||||
echo_info "Delivered from ${SOURCE_CONTAINER} on ${SOURCE_HOST} to ${DEST_CONTAINER} on ${DEST_HOST}"
|
||||
fi
|
||||
@@ -351,4 +314,4 @@ fi
|
||||
echo_info "Deployment completed at: $(date)"
|
||||
|
||||
# Journaliser le déploiement
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') - API deployed to ${ENV_NAME} (${DEST_CONTAINER})" >> ~/.geo_deploy_history
|
||||
echo "$(date '+%Y-%m-%d %H:%M:%S') - API deployed to ${ENV_NAME} (${DEST_CONTAINER}) - Archive: ${ARCHIVE_NAME}" >> ~/.geo_deploy_history
|
||||
Reference in New Issue
Block a user