From 7c2ca44660ab2e1629b58cb8a7c06ec424da7692 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Wed, 13 Nov 2019 17:14:07 +0100
Subject: [PATCH] nginx php perf twiks

---
 Docker/nginx/default.conf   |  1 +
 Docker/php/Dockerfile       | 10 +++++-----
 Docker/php/bashrc           |  2 +-
 Docker/php/php-custom.ini   |  1 +
 Docker/php/phpSettings.conf | 20 ++++++++++++++++++++
 bin/dumpsql.sh              |  8 ++++++++
 bin/syncfiles.sh            |  3 +++
 docker-compose.yml          |  2 ++
 8 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 Docker/php/phpSettings.conf
 create mode 100755 bin/dumpsql.sh
 create mode 100755 bin/syncfiles.sh

diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf
index ce2967b..f95ef54 100644
--- a/Docker/nginx/default.conf
+++ b/Docker/nginx/default.conf
@@ -29,6 +29,7 @@ server {
         fastcgi_intercept_errors off;
         fastcgi_buffer_size 16k;
         fastcgi_buffers 4 16k;
+        fastcgi_read_timeout 150;
     }
 
     location ~ /\.ht {
diff --git a/Docker/php/Dockerfile b/Docker/php/Dockerfile
index 320d90b..c3cdabd 100644
--- a/Docker/php/Dockerfile
+++ b/Docker/php/Dockerfile
@@ -1,10 +1,5 @@
 FROM php:7.0-fpm
 
-COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
-
-COPY ./bashrc /root/.bashrc
-COPY ./inputrc /root/.inputrc
-
 RUN apt-get update && apt-get install -y \
 		libfreetype6-dev \
 		libjpeg62-turbo-dev \
@@ -31,3 +26,8 @@ RUN export COMPOSER_HOME=/usr/local/composer && \
 			curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar \
 				-L -o /usr/local/bin/drush && \
 			chmod +x /usr/local/bin/drush
+
+COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
+
+COPY ./bashrc /root/.bashrc
+COPY ./inputrc /root/.inputrc
diff --git a/Docker/php/bashrc b/Docker/php/bashrc
index 468610f..51a724e 100644
--- a/Docker/php/bashrc
+++ b/Docker/php/bashrc
@@ -1,4 +1,4 @@
 
-PS1='\e[36m\e[1mPHP\e[0m:\e[90m\w\e[0m\n$ '
+PS1='\e[36m\e[1medlpd8-PHP\e[0m:\e[90m\w\e[0m\n$ '
 bind '"\e[A": history-search-backward'
 bind '"\e[B": history-search-forward'
diff --git a/Docker/php/php-custom.ini b/Docker/php/php-custom.ini
index 523267b..8eda3b0 100644
--- a/Docker/php/php-custom.ini
+++ b/Docker/php/php-custom.ini
@@ -1,3 +1,4 @@
 memory_limit = 512M
 upload_max_filesize = 50M
 post_max_size = 50M
+max_execution_time = 30
diff --git a/Docker/php/phpSettings.conf b/Docker/php/phpSettings.conf
new file mode 100644
index 0000000..eee2297
--- /dev/null
+++ b/Docker/php/phpSettings.conf
@@ -0,0 +1,20 @@
+[www]
+;user = www-data
+;group = www-data
+;listen = 0.0.0.0:9000
+;pm = dynamic
+;pm.max_children = 5
+;pm.start_servers = 2
+;pm.min_spare_servers = 1
+;pm.max_spare_servers = 3
+
+catch_workers_output = yes
+php_admin_flag[log_errors] = on
+php_admin_flag[display_errors] = off
+php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
+php_admin_value[error_log] = /var/log/error.log
+access.log = /var/log/access.log
+php_value[memory_limit] = 512M
+php_value[post_max_size] = 50M
+php_value[upload_max_filesize] = 50M
+php_value[max_execution_time] = 150
diff --git a/bin/dumpsql.sh b/bin/dumpsql.sh
new file mode 100755
index 0000000..6006d0f
--- /dev/null
+++ b/bin/dumpsql.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+DATE=`date '+%Y-%m-%d %H:%M:%S'`
+#SCRIPT_D=dirname $0
+
+#export $(cat ${SCRIPT_D}/../.env | grep -v ^# | xargs)
+
+sudo docker exec edlpd8_mysql_1 sh -c 'exec mysqldump -uroot -p"$MYSQL_ROOT_PASSWORD" edlp_d8' > "./edlp_d8-${DATE}.sql"
diff --git a/bin/syncfiles.sh b/bin/syncfiles.sh
new file mode 100755
index 0000000..f834e65
--- /dev/null
+++ b/bin/syncfiles.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rsync --delete -ruv CT-edlp-deb9:www/encyclopediedelaparole.org/public_html/sites/default/files/ ./public_html/sites/default/files/ --exclude=js/* --exclude=php/* --exclude=styles/* --exclude=css/*
diff --git a/docker-compose.yml b/docker-compose.yml
index abaf265..4cc9b1c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,6 +47,8 @@ services:
       - 9000
     volumes:
       - php-root-data:/root
+      - ./Docker/php/phpSettings.conf:/usr/local/etc/php-fpm.d/zzz-phpSettings.conf
+      - "${LOG_ROOT}:/var/log:rw"
       - "${PROJECT_ROOT}:/var/www/html"
       - "${LEGACY_ROOT}:/var/www/drupal6"
     networks: