From 0d874b79e2e4c66b4b3c512315f91459d7e59f99 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Mon, 31 Aug 2015 15:23:07 +0200
Subject: [PATCH] add timezone in php fpm movim pool.

---
 README.md         | 1 +
 TODO              | 1 -
 conf/php-fpm.conf | 1 +
 scripts/install   | 4 +++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4880b41..a78a81d 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ Current Movim version : 0.9 git2015-08-31
 - Remove proxy_read_timeout and proxy_send_timeout in vhost configuration (default 60s is enough)
 - Movim sysvinit script now uses syslog.
 - Installation script now checks if path is empty.
+- Add timezone in Movim php fpm conf.
 
 0.8b 2015-08-24
 - Added language selection : ar, de, es, it, ja, nl, ru
diff --git a/TODO b/TODO
index b39eec0..e69de29 100644
--- a/TODO
+++ b/TODO
@@ -1 +0,0 @@
-- Set timezone in php5-fpm pool
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 5c18954..8fae1a0 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -13,3 +13,4 @@ pm.min_spare_servers = 1
 pm.max_spare_servers = 3
 chdir = /var/www/movim
 php_admin_value[open_basedir] = none
+date.timezone = "YHTZ"
diff --git a/scripts/install b/scripts/install
index 8239164..4cbf356 100644
--- a/scripts/install
+++ b/scripts/install
@@ -8,6 +8,7 @@ password=$4
 language=$5
 public_site=$6
 port=$7
+timzone=`cat /etc/timezone`
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a movim
@@ -81,7 +82,7 @@ sudo su -c "cd $final_path && php mud.php db set" movim
 sudo su -c "cd $final_path && php mud.php config locale:$language" movim
 sudo su -c "cd $final_path && php mud.php config loglevel:1" movim
 sudo su -c "cd $final_path && php mud.php config environment:production" movim
-sudo su -c "cd $final_path && php mud.php config timezone:`cat /etc/timezone`" movim
+sudo su -c "cd $final_path && php mud.php config timezone:$timezone" movim
 sudo su -c "cd $final_path && php mud.php config username:$admin" movim
 sudo su -c "cd $final_path && php mud.php config password:`echo -n $password | sha1sum | awk '{print $1}'`" movim
 if [ $public_site = "No" ]; 
@@ -108,6 +109,7 @@ else
 fi
 
 # php-fpm configuration
+sed -i "s@YHTZ@$timezone@g" ../conf/php-fpm.conf
 sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/movim.conf
 
 # Nginx configuration