From bacee37ad22d9532ab40910b193765fcf9f9dc56 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Mon, 13 Apr 2015 14:23:27 +0100
Subject: [PATCH] Update of php5-fpm configuration

---
 conf/php-fpm.conf | 4 ++--
 scripts/install   | 6 ++++--
 scripts/remove    | 2 +-
 scripts/upgrade   | 9 +++++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 67f989d..5721539 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -170,7 +170,7 @@ request_slowlog_timeout = 5s
 ; The log file for slow requests
 ; Default Value: not set
 ; Note: slowlog is mandatory if request_slowlog_timeout is set
-slowlog = /var/log/nginx/NAMETOCHANGE.slow.log
+slowlog = /var/log/nginx/LOGNAMETOCHANGE.slow.log
 
 ; Set open file descriptor rlimit.
 ; Default Value: system defined value
@@ -195,7 +195,7 @@ rlimit_core = 0
 ; Chdir to this directory at the start.
 ; Note: relative path can be used.
 ; Default Value: current directory or / when chroot
-chdir = /var/www/NAMETOCHANGE
+chdir = /var/www/FOLDERNAMETOCHANGE
 
 ; Redirect worker stdout and stderr into main error log. If not set, stdout and
 ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/scripts/install b/scripts/install
index c1aa971..99a4c19 100644
--- a/scripts/install
+++ b/scripts/install
@@ -53,8 +53,10 @@ sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
 sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$sitename.conf
 
-sed -i "s@NAMETOCHANGE@$app@g" ../conf/php-fpm.conf
-finalphpconf=/etc/php5/fpm/pool.d/$domain\_$app.conf
+sed -i "s@NAMETOCHANGE@$domain\_$sitename@g" ../conf/php-fpm.conf
+sed -i "s@LOGNAMETOCHANGE@$domain\_$sitename@g" ../conf/php-fpm.conf
+sed -i "s@FOLDERNAMETOCHANGE@$domain/$sitename@g" ../conf/php-fpm.conf
+finalphpconf=/etc/php5/fpm/pool.d/$domain\_$sitename.conf
 sudo cp ../conf/php-fpm.conf $finalphpconf
 sudo chown root: $finalphpconf
 sudo chmod 644 $finalphpconf
diff --git a/scripts/remove b/scripts/remove
index 8615105..3af697d 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,7 +14,7 @@ sudo rm -rf $final_path
 
 # Suppression de la config nginx de la webapp
 sudo rm -f /etc/nginx/conf.d/$domain.d/$sitename.conf
-sudo rm -f /etc/php5/fpm/pool.d/$domain\_$app.conf
+sudo rm -f /etc/php5/fpm/pool.d/$domain\_$sitename.conf
 
 # We check if folders are empty and if yes we delete them
 if test -z "$(ls /var/www/webapp_multi/$domain | head -n1)"
diff --git a/scripts/upgrade b/scripts/upgrade
index 5a1227f..8c597b4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,8 +18,13 @@ sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
 sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$name.conf
 
-sed -i "s@NAMETOCHANGE@$app@g" ../conf/php-fpm.conf
-finalphpconf=/etc/php5/fpm/pool.d/$domain\_$app.conf
+
+# php5-fpm configuration
+sed -i "s@NAMETOCHANGE@$domain\_$sitename@g" ../conf/php-fpm.conf
+sed -i "s@LOGNAMETOCHANGE@$domain\_$sitename@g" ../conf/php-fpm.conf
+sed -i "s@FOLDERNAMETOCHANGE@$domain/$sitename@g" ../conf/php-fpm.conf
+
+finalphpconf=/etc/php5/fpm/pool.d/$domain\_$sitename.conf
 sudo cp ../conf/php-fpm.conf $finalphpconf
 sudo chown root: $finalphpconf
 sudo chmod 644 $finalphpconf