diff --git a/Dockerfile b/Dockerfile
index 61f7e518666f10f3b47cd80441bb0db9603ba068..f30ca42e2a14228742c1ce2c9f060387219d0b92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM unicaen-dev-php${PHP_VERSION}-apache
LABEL maintainer="Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>"
-WORKDIR /app
+WORKDIR /var/www/html
ENV APACHE_CONF_DIR=/etc/apache2 \
PHP_CONF_DIR=/etc/php/${PHP_VERSION}
@@ -23,11 +23,9 @@ RUN ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log
RUN ln -sf /dev/stderr /var/log/apache2/error.log
# Configuration Apache et FPM
-ADD docker/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf
-ADD docker/apache-site.conf ${APACHE_CONF_DIR}/sites-available/app.conf
-ADD docker/apache-site-ssl.conf ${APACHE_CONF_DIR}/sites-available/app-ssl.conf
-ADD docker/fpm/pool.d/app.conf ${PHP_CONF_DIR}/fpm/pool.d/app.conf
-ADD docker/fpm/conf.d/app.ini ${PHP_CONF_DIR}/fpm/conf.d/app.ini
+ADD docker/apache/000-default.conf ${APACHE_CONF_DIR}/sites-available/
+ADD docker/php/fpm/conf.d/*.ini ${PHP_CONF_DIR}/fpm/conf.d/
+ADD docker/php/cli/conf.d/*.ini ${PHP_CONF_DIR}/cli/conf.d/
-RUN a2ensite app app-ssl && \
+RUN a2enconf php${PHP_VERSION}-fpm.conf && \
service php${PHP_VERSION}-fpm reload
diff --git a/docker-compose.yml b/docker-compose.yml
index 79216a45d4a1e4cc619baae14fb858a2ed83404f..084c9c58510ed4079fcd02f0e9e963aad35baf74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,8 @@ services:
- "8080:80"
- "8443:443"
volumes:
- - .:/app
- working_dir: /app
+ - .:/var/www/html
+ working_dir: /var/www/html
db:
image: postgres
diff --git a/docker/apache-ports.conf b/docker/apache-ports.conf
deleted file mode 100644
index 24c3bb25553799a8d9cf668d90e81cb791b77047..0000000000000000000000000000000000000000
--- a/docker/apache-ports.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-Listen 80
-Listen 443
diff --git a/docker/apache-site-ssl.conf b/docker/apache-site-ssl.conf
deleted file mode 100644
index 22c5db5335a6fe0a2563e3e6b885c9ab4563fc78..0000000000000000000000000000000000000000
--- a/docker/apache-site-ssl.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-<VirtualHost *:443>
- ServerName localhost
- DocumentRoot /app/public
-
- SetEnv APPLICATION_ENV "development"
-
- RewriteEngine On
-
- <Directory /app/public>
- DirectoryIndex index.php
- AllowOverride All
- Require all granted
- </Directory>
-
- <IfModule proxy_fcgi_module>
- <FilesMatch ".+\.ph(ar|p|tml)$">
- SetHandler "proxy:unix:/var/run/php7.0-fpm-webapp.sock|fcgi://localhost/"
- </FilesMatch>
- </IfModule>
-
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
- SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-
- Header always set Strict-Transport-Security "max-age=15768000; includeSubdomains;"
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
- CustomLog ${APACHE_LOG_DIR}/access.log combined
- #LogLevel debug
-</VirtualHost>
diff --git a/docker/apache-site.conf b/docker/apache-site.conf
deleted file mode 100644
index 1e7e5f8d13ff34e46b71c00325d1ee68a1ef8ab7..0000000000000000000000000000000000000000
--- a/docker/apache-site.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<VirtualHost *:80>
- ServerName localhost
- DocumentRoot /app/public
-
- RewriteEngine On
-
- Header always set Strict-Transport-Security "max-age=15768000; includeSubdomains;"
-
- ### Redirection en HTTPS
- RewriteCond %{SERVER_PORT} !^443$
- RewriteRule ^/(.*) https://%{SERVER_NAME}:443/$1 [L,R]
-
-</VirtualHost>
\ No newline at end of file
diff --git a/docker/apache/000-default.conf b/docker/apache/000-default.conf
new file mode 100644
index 0000000000000000000000000000000000000000..a7a7cea4d88b3ac8e4231104302eb566c53342b4
--- /dev/null
+++ b/docker/apache/000-default.conf
@@ -0,0 +1,146 @@
+<IfModule mod_ssl.c>
+ <VirtualHost _default_:443>
+ ServerAdmin webmaster@localhost
+
+ DocumentRoot /var/www/html/public
+
+ SetEnv APPLICATION_ENV "development"
+
+ RewriteEngine On
+
+ <Directory /var/www/html/public>
+ DirectoryIndex index.php
+ AllowOverride All
+ Require all granted
+ </Directory>
+
+ Header always set Strict-Transport-Security "max-age=15768000; includeSubdomains;"
+
+ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+ # error, crit, alert, emerg.
+ # It is also possible to configure the loglevel for particular
+ # modules, e.g.
+ #LogLevel info ssl:warn
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+ # For most configuration files from conf-available/, which are
+ # enabled or disabled at a global level, it is possible to
+ # include a line for only one particular virtual host. For example the
+ # following line enables the CGI configuration for this host only
+ # after it has been globally disabled with "a2disconf".
+ #Include conf-available/serve-cgi-bin.conf
+
+ # SSL Engine Switch:
+ # Enable/Disable SSL for this virtual host.
+ SSLEngine on
+
+ # A self-signed (snakeoil) certificate can be created by installing
+ # the ssl-cert package. See
+ # /usr/share/doc/apache2/README.Debian.gz for more info.
+ # If both key and certificate are stored in the same file, only the
+ # SSLCertificateFile directive is needed.
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
+ # Server Certificate Chain:
+ # Point SSLCertificateChainFile at a file containing the
+ # concatenation of PEM encoded CA certificates which form the
+ # certificate chain for the server certificate. Alternatively
+ # the referenced file can be the same as SSLCertificateFile
+ # when the CA certificates are directly appended to the server
+ # certificate for convinience.
+ #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
+
+ # Certificate Authority (CA):
+ # Set the CA certificate verification path where to find CA
+ # certificates for client authentication or alternatively one
+ # huge file containing all of them (file must be PEM encoded)
+ # Note: Inside SSLCACertificatePath you need hash symlinks
+ # to point to the certificate files. Use the provided
+ # Makefile to update the hash symlinks after changes.
+ #SSLCACertificatePath /etc/ssl/certs/
+ #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
+
+ # Certificate Revocation Lists (CRL):
+ # Set the CA revocation path where to find CA CRLs for client
+ # authentication or alternatively one huge file containing all
+ # of them (file must be PEM encoded)
+ # Note: Inside SSLCARevocationPath you need hash symlinks
+ # to point to the certificate files. Use the provided
+ # Makefile to update the hash symlinks after changes.
+ #SSLCARevocationPath /etc/apache2/ssl.crl/
+ #SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
+
+ # Client Authentication (Type):
+ # Client certificate verification type and depth. Types are
+ # none, optional, require and optional_no_ca. Depth is a
+ # number which specifies how deeply to verify the certificate
+ # issuer chain before deciding the certificate is not valid.
+ #SSLVerifyClient require
+ #SSLVerifyDepth 10
+
+ # SSL Engine Options:
+ # Set various options for the SSL engine.
+ # o FakeBasicAuth:
+ # Translate the client X.509 into a Basic Authorisation. This means that
+ # the standard Auth/DBMAuth methods can be used for access control. The
+ # user name is the `one line' version of the client's X.509 certificate.
+ # Note that no password is obtained from the user. Every entry in the user
+ # file needs this password: `xxj31ZMTZzkVA'.
+ # o ExportCertData:
+ # This exports two additional environment variables: SSL_CLIENT_CERT and
+ # SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+ # server (always existing) and the client (only existing when client
+ # authentication is used). This can be used to import the certificates
+ # into CGI scripts.
+ # o StdEnvVars:
+ # This exports the standard SSL/TLS related `SSL_*' environment variables.
+ # Per default this exportation is switched off for performance reasons,
+ # because the extraction step is an expensive operation and is usually
+ # useless for serving static content. So one usually enables the
+ # exportation for CGI and SSI requests only.
+ # o OptRenegotiate:
+ # This enables optimized SSL connection renegotiation handling when SSL
+ # directives are used in per-directory context.
+ #SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+
+ # SSL Protocol Adjustments:
+ # The safe and default but still SSL/TLS standard compliant shutdown
+ # approach is that mod_ssl sends the close notify alert but doesn't wait for
+ # the close notify alert from client. When you need a different shutdown
+ # approach you can use one of the following variables:
+ # o ssl-unclean-shutdown:
+ # This forces an unclean shutdown when the connection is closed, i.e. no
+ # SSL close notify alert is send or allowed to received. This violates
+ # the SSL/TLS standard but is needed for some brain-dead browsers. Use
+ # this when you receive I/O errors because of the standard approach where
+ # mod_ssl sends the close notify alert.
+ # o ssl-accurate-shutdown:
+ # This forces an accurate shutdown when the connection is closed, i.e. a
+ # SSL close notify alert is send and mod_ssl waits for the close notify
+ # alert of the client. This is 100% SSL/TLS standard compliant, but in
+ # practice often causes hanging connections with brain-dead browsers. Use
+ # this only for browsers where you know that their SSL implementation
+ # works correctly.
+ # Notice: Most problems of broken clients are also related to the HTTP
+ # keep-alive facility, so you usually additionally want to disable
+ # keep-alive for those clients, too. Use variable "nokeepalive" for this.
+ # Similarly, one has to force some clients to use HTTP/1.0 to workaround
+ # their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+ # "force-response-1.0" for this.
+ # BrowserMatch "MSIE [2-6]" \
+ # nokeepalive ssl-unclean-shutdown \
+ # downgrade-1.0 force-response-1.0
+
+ </VirtualHost>
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/docker/fpm/pool.d/app.conf b/docker/fpm/pool.d/app.conf
deleted file mode 100644
index 965a099fd401eb8f810aa34471bcba361dbb2d2b..0000000000000000000000000000000000000000
--- a/docker/fpm/pool.d/app.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[webapp]
-
-user = www-data
-group = www-data
-
-listen = /var/run/php7.0-fpm-webapp.sock
-listen.owner = www-data
-listen.group = www-data
-
-; mandatory values
-; Soit:
-; pm = dynamic
-; pm.max_children = 5
-; pm.start_servers = 2
-; pm.min_spare_servers = 1
-; pm.max_spare_servers = 3
-; Soit:
-pm = ondemand
-pm.max_children = 35
-pm.process_idle_timeout = 10s
-pm.max_requests = 500
-
-request_slowlog_timeout = 30
-slowlog = /var/log/php5-fpm.slow.log
-
-php_admin_value[error_log] = /var/log/fpm-php.log
-; php_admin_value[log_level] = warning
-php_admin_flag[log_errors] = on
diff --git a/docker/php/cli/conf.d/99-app.ini b/docker/php/cli/conf.d/99-app.ini
new file mode 100644
index 0000000000000000000000000000000000000000..5b82015f8dc97345258d50b4cf46356c0ff90a2c
--- /dev/null
+++ b/docker/php/cli/conf.d/99-app.ini
@@ -0,0 +1,16 @@
+date.timezone = Europe/Paris
+
+log_errors = On
+display_startup_errors = On
+display_errors = On
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_NOTICE
+
+opcache.enable_cli = 0
+
+xdebug.enable = 1
+xdebug.remote_enable = 1
+xdebug.remote_connect_back = 0
+xdebug.var_display_max_children = 1024
+xdebug.var_display_max_data = -1
+xdebug.max_nesting_level = 256
+# Attention: trop diminuer 'max_nesting_level' peut causer une erreur 'Maximum function nesting level of x reached'
diff --git a/docker/fpm/conf.d/app.ini b/docker/php/fpm/conf.d/99-app.ini
similarity index 70%
rename from docker/fpm/conf.d/app.ini
rename to docker/php/fpm/conf.d/99-app.ini
index e2c35fd3b81c318085c210a379ba098954735c3c..89729a213db6336988cbb16f9524c983560731a1 100644
--- a/docker/fpm/conf.d/app.ini
+++ b/docker/php/fpm/conf.d/99-app.ini
@@ -8,21 +8,12 @@ display_startup_errors = On
display_errors = On
error_reporting = E_ALL & ~E_DEPRECATED & ~E_NOTICE
-max_execution_time = 120
-
-# NB: ne peut-être supérieur au memory_limit du php.ini
-memory_limit = 256M
-
-# NB: post_max_size > upload_max_filesize
-upload_max_filesize = 51M
-post_max_size = 52M
-
-opcache.enable = 0
+opcache.enable = 1
+xdebug.enable = 1
xdebug.remote_enable = 1
xdebug.remote_connect_back = 1
xdebug.profiler_enable_trigger = 1
-
xdebug.collect_params = 2
xdebug.var_display_max_children = 1024
xdebug.var_display_max_data = -1