.

diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf
index 446fd562875d1ee1e64d6335804a96b2ba8974eb..bc94bed86e5c665996bb7f72ba63d2157487a163 100644 (file)
--- a/.docker/config/httpd/httpd.conf
+++ b/.docker/config/httpd/httpd.conf
@@ -264,8 +264,8 @@ ServerAdmin you@example.com
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #

-DocumentRoot "/application/public"
-<Directory "/application/public">
+DocumentRoot "/application"
+<Directory "/application">

     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of:
     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of:


@@ -293,7 +293,7 @@ DocumentRoot "/application/public"
     Require all granted
 </Directory>
 
     Require all granted
 </Directory>
 

-ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://rodadocavaco:9000/application/public/$1" timeout=1800
+ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://php-fpm:9000/application/$1" timeout=1800

 
 XSendFile on
 XSendFilePath /application
 
 XSendFile on
 XSendFilePath /application

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index 557022e02065e235f36a090f67beb0430b787482..89a51e3a11cde22ec809649f47dcd88a9e75d593 100644 (file)
--- a/.docker/production/docker-compose.yml
+++ b/.docker/production/docker-compose.yml
@@ -4,16 +4,19 @@ services:
         build: './www/.docker/images/httpd'
         working_dir: /application
         volumes:
         build: './www/.docker/images/httpd'
         working_dir: /application
         volumes:

-            - './www/public:/usr/local/apache2/htdocs'
+            - './www:/usr/local/apache2/htdocs'

             - './www/:/application/'
             - './www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         environment:
             - './www/:/application/'
             - './www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         environment:

-            VIRTUAL_HOST: www.rodadocavaco.com
-            LETSENCRYPT_HOST: www.rodadocavaco.com
+            VIRTUAL_HOST: www.rodadocavaco.com,rodadocavaco.com
+            LETSENCRYPT_HOST: www.rodadocavaco.com,rodadocavaco.com

         networks:
             - rodadocavaco
             - nginxproxy
         restart: unless-stopped
         networks:
             - rodadocavaco
             - nginxproxy
         restart: unless-stopped

+        depends_on:
+          - php-fpm
+

     php-fpm:
         container_name: rodadocavaco
         hostname: rodadocavaco
     php-fpm:
         container_name: rodadocavaco
         hostname: rodadocavaco


@@ -40,8 +43,6 @@ services:
             - './www/.docker/config/cron/crontab:/etc/crontab'
             # PHP
             - './www/.docker/config/php.ini:/etc/php/8.5/fpm/conf.d/99-overrides.ini'
             - './www/.docker/config/cron/crontab:/etc/crontab'
             # PHP
             - './www/.docker/config/php.ini:/etc/php/8.5/fpm/conf.d/99-overrides.ini'

-            # ENV
-            - './www/.env.production:/application/.env'

             # Web path
             - './www:/application'
         ports:
             # Web path
             - './www:/application'
         ports:


@@ -49,6 +50,8 @@ services:
         networks:
           - rodadocavaco
         restart: unless-stopped
         networks:
           - rodadocavaco
         restart: unless-stopped

+        depends_on:
+          - mariadb

 
     adminer:
       image: 'adminer'
 
     adminer:
       image: 'adminer'


@@ -58,11 +61,13 @@ services:
         - "./www/.docker/config/adminer/php.ini:/etc/php/conf.d/99-adminer.ini"
       environment:
         ADMINER_DEFAULT_SERVER: rodadocavaco-mariadb
         - "./www/.docker/config/adminer/php.ini:/etc/php/conf.d/99-adminer.ini"
       environment:
         ADMINER_DEFAULT_SERVER: rodadocavaco-mariadb

-        VIRTUAL_HOST: adminer.www.rodadocavaco.com
-        LETSENCRYPT_HOST: adminer.www.rodadocavaco.com
+        VIRTUAL_HOST: adminer.rodadocavaco.com
+        LETSENCRYPT_HOST: adminer.rodadocavaco.com

       networks:
         - rodadocavaco
         - nginxproxy
       networks:
         - rodadocavaco
         - nginxproxy

+      depends_on:
+        - mariadb

 
     mariadb:
         container_name: rodadocavaco-mariadb
 
     mariadb:
         container_name: rodadocavaco-mariadb


@@ -99,6 +104,8 @@ services:
         EXTRA_OPTS: "--single-transaction"
       networks:
         - rodadocavaco
         EXTRA_OPTS: "--single-transaction"
       networks:
         - rodadocavaco

+      depends_on:
+        - mariadb

 
 networks:
   rodadocavaco:
 
 networks:
   rodadocavaco:


@@ -107,5 +114,3 @@ networks:
   nginxproxy:
     name: nginxproxy
     external: true
   nginxproxy:
     name: nginxproxy
     external: true

-
-

diff --git a/php.ini b/php.ini
deleted file mode 100644 (file)
index e3066f6..0000000
--- a/php.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[PHP]
-upload_max_filesize = 200M
-post_max_size = 200M
-php_value memory_limit = 128M
-php_value max_input_time = 120
\ No newline at end of file

diff --git a/wp-config.php b/wp-config.php
index cffe5eb8e1104018e7797f3946354a12a6d27576..2d0c10388c1e4bf8baf71e3a85fb3b0ac2c9ccef 100644 (file)
--- a/wp-config.php
+++ b/wp-config.php
@@ -26,16 +26,16 @@ ini_set("max_input_time","120");
 
 // ** Réglages MySQL - Votre hébergeur doit vous fournir ces informations. ** //
 /** Nom de la base de données de WordPress. */
 
 // ** Réglages MySQL - Votre hébergeur doit vous fournir ces informations. ** //
 /** Nom de la base de données de WordPress. */

-define('DB_NAME', 'db623244354');
+define('DB_NAME', 'rodadocavaco');

 
 /** Utilisateur de la base de données MySQL. */
 
 /** Utilisateur de la base de données MySQL. */

-define('DB_USER', 'dbo623244354');
+define('DB_USER', 'root');

 
 /** Mot de passe de la base de données MySQL. */
 
 /** Mot de passe de la base de données MySQL. */

-define('DB_PASSWORD', 'D#F7DmGm');
+define('DB_PASSWORD', 'Zn1yDsz2E7tMyKX2');

 
 /** Adresse de l'hébergement MySQL. */
 
 /** Adresse de l'hébergement MySQL. */

-define('DB_HOST', 'db623244354.db.1and1.com');
+define('DB_HOST', 'mariadb');

 
 /** Jeu de caractères à utiliser par la base de données lors de la création des tables. */
 define('DB_CHARSET', 'utf8mb4');
 
 /** Jeu de caractères à utiliser par la base de données lors de la création des tables. */
 define('DB_CHARSET', 'utf8mb4');


@@ -92,7 +92,11 @@ $table_prefix  = 'wp_';
 //define('WP_DEBUG', false); 
 define('WP_DEBUG_LOG', true); 
 define('WP_DEBUG', true); 
 //define('WP_DEBUG', false); 
 define('WP_DEBUG_LOG', true); 
 define('WP_DEBUG', true); 

-define('WP_DEBUG_DISPLAY', false); 
+define('WP_DEBUG_DISPLAY', false);
+
+if (strpos($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') !== false) {
+    $_SERVER['HTTPS'] = 'on';
+}

 
 /* C'est tout, ne touchez pas à ce qui suit ! Bon blogging ! */
 
 
 /* C'est tout, ne touchez pas à ce qui suit ! Bon blogging ! */