diff --git a/.woodpecker.yml b/.woodpecker.yml index 50a2272..01ea28b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -175,10 +175,12 @@ steps: if [ "$READY" -gt "0" ] 2>/dev/null; then echo "Base prete, activation SSL..." docker exec "$PROJECT-db" mysql -uprestashop -p"$DB_PASS" prestashop -e \ - "UPDATE ps_configuration SET value='0' 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';" 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 - echo "SSL desactive (a activer depuis le back-office apres validation HTTPS), install supprime, cache efface" + echo "PS_SSL_ENABLED=1, PS_SSL_ENABLED_EVERYWHERE=0, install supprime, cache efface" break fi i=$((i+1)) diff --git a/docker-compose.yml b/docker-compose.yml index d448e29..53b44b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,8 @@ services: ADMIN_PASSWD: ${PRESTASHOP_ADMIN_PASSWORD} PS_INSTALL_AUTO: "1" PS_ERASE_DB: "0" + # Fabio termine TLS et passe X-Forwarded-Proto:https -> PrestaShop genere des URLs https:// + PS_ENABLE_SSL: "1" volumes: - ps_data:/var/www/html labels: