Compare commits

..

5 Commits

Author SHA1 Message Date
syoul
22719e5630 Corrige detection HTTPS derriere Fabio via SetEnvIf dans .htaccess
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Fabio termine TLS et forward en HTTP plain : Apache ne voit jamais
HTTPS=on donc PrestaShop croit etre en HTTP et affiche le warning SSL.
Ajout de SetEnvIf X-Forwarded-Proto "https" HTTPS=on dans .htaccess
pour que PrestaShop detecte correctement les requetes HTTPS proxiees.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-20 17:09:52 +01:00
syoul
88b7205dbb Restaure docker restart apres cache clear pour eviter le 500 sur HTTPS
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Le cache PHP incohérent apres UPDATE en DB sans redemarrage causait
un 500 Internal Server Error sur les requetes HTTPS.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-20 17:01:39 +01:00
syoul
8e07544280 Corrige SSL : PS_SSL_ENABLED=1 sans EVERYWHERE pour que HTTPS fonctionne
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
- PS_SSL_ENABLED=0 causait la redirection HTTPS->HTTP par PrestaShop
- PS_SSL_ENABLED=1 : HTTPS fonctionne
- PS_SSL_ENABLED_EVERYWHERE=0 : admin accessible aussi en HTTP
- Re-ajoute PS_ENABLE_SSL:1 dans compose pour les URLs https:// via Fabio

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-20 16:54:18 +01:00
syoul
70c8e55729 Ne pas activer SSL automatiquement, laisser l'acces HTTP admin fonctionnel
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
- Supprime PS_ENABLE_SSL du docker-compose (bloquait HTTP admin a l'install)
- Configure step: remet PS_SSL_ENABLED=0 pour ne pas bloquer l'acces HTTP
- Supprime docker restart inutile apres clear cache
- Corrige container_name du service db (syoul -> ajr)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-20 16:45:00 +01:00
syoul
4c7fda3cf6 Desactive PS_SSL_ENABLED_EVERYWHERE pour ne pas bloquer l'acces HTTP admin
PS_SSL_ENABLED=1 suffit pour generer des URLs https://
PS_SSL_ENABLED_EVERYWHERE bloque HTTP meme si HTTPS n'est pas encore operationnel

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-20 16:41:51 +01:00
2 changed files with 16 additions and 5 deletions

View File

@@ -175,11 +175,23 @@ steps:
if [ "$READY" -gt "0" ] 2>/dev/null; then if [ "$READY" -gt "0" ] 2>/dev/null; then
echo "Base prete, activation SSL..." echo "Base prete, activation SSL..."
docker exec "$PROJECT-db" mysql -uprestashop -p"$DB_PASS" prestashop -e \ docker exec "$PROJECT-db" mysql -uprestashop -p"$DB_PASS" prestashop -e \
"UPDATE ps_configuration SET value='1' WHERE name IN ('PS_SSL_ENABLED','PS_SSL_ENABLED_EVERYWHERE');" "UPDATE ps_configuration SET value='1' WHERE name='PS_SSL_ENABLED';"
docker exec "$PROJECT-db" mysql -uprestashop -p"$DB_PASS" prestashop -e \
"UPDATE ps_configuration SET value='0' WHERE name='PS_SSL_ENABLED_EVERYWHERE';"
# Fabio termine TLS et forward en HTTP : Apache ne voit pas HTTPS sans cette directive
docker exec "$PROJECT-app" bash -c '
HTACCESS=/var/www/html/.htaccess
if [ -f "$HTACCESS" ] && ! grep -q "X-Forwarded-Proto" "$HTACCESS"; then
sed -i "1s|^|SetEnvIf X-Forwarded-Proto \"https\" HTTPS=on\n|" "$HTACCESS"
echo "SetEnvIf X-Forwarded-Proto ajoute dans .htaccess"
else
echo ".htaccess absent ou deja configure"
fi
'
docker exec "$PROJECT-app" rm -rf /var/www/html/install/ 2>/dev/null || true docker exec "$PROJECT-app" rm -rf /var/www/html/install/ 2>/dev/null || true
docker exec "$PROJECT-app" rm -rf /var/www/html/var/cache/prod/ 2>/dev/null || true docker exec "$PROJECT-app" rm -rf /var/www/html/var/cache/prod/ 2>/dev/null || true
docker restart "$PROJECT-app" docker restart "$PROJECT-app"
echo "SSL active, dossier install supprime, cache efface, app redemarree" echo "PS_SSL_ENABLED=1, X-Forwarded-Proto configure, cache efface, app redemarree"
break break
fi fi
i=$((i+1)) i=$((i+1))

View File

@@ -21,8 +21,7 @@ services:
ADMIN_PASSWD: ${PRESTASHOP_ADMIN_PASSWORD} ADMIN_PASSWD: ${PRESTASHOP_ADMIN_PASSWORD}
PS_INSTALL_AUTO: "1" PS_INSTALL_AUTO: "1"
PS_ERASE_DB: "0" PS_ERASE_DB: "0"
# SSL active : Fabio termine TLS et passe X-Forwarded-Proto:https # Fabio termine TLS et passe X-Forwarded-Proto:https -> PrestaShop genere des URLs https://
# PrestaShop honore ce header -> genere des URLs https:// sans boucle de redirection
PS_ENABLE_SSL: "1" PS_ENABLE_SSL: "1"
volumes: volumes:
- ps_data:/var/www/html - ps_data:/var/www/html
@@ -44,7 +43,7 @@ services:
db: db:
image: mariadb:10.11 image: mariadb:10.11
container_name: ${COMPOSE_PROJECT_NAME:-syoul-prestashop-main}-db container_name: ${COMPOSE_PROJECT_NAME:-ajr-mafabriqueadeco-main}-db
restart: always restart: always
environment: environment:
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}