From 2f123f903b2d984fbf1994d52b8debfcdd73f642 Mon Sep 17 00:00:00 2001
From: Julien VAUBOURG <julien@vaubourg.com>
Date: Thu, 9 Apr 2015 21:47:05 +0200
Subject: [PATCH] Remove php.ini modification

---
 conf/phpfpm_wifiadmin.conf | 2 ++
 scripts/install            | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/phpfpm_wifiadmin.conf b/conf/phpfpm_wifiadmin.conf
index f6cd874..ea074be 100644
--- a/conf/phpfpm_wifiadmin.conf
+++ b/conf/phpfpm_wifiadmin.conf
@@ -196,5 +196,7 @@ catch_workers_output = no
 ;
 ; Note: path INI options can be relative and will be expanded with the prefix
 ; (pool, global or /usr)
+
+php_value[max_execution_time] = 600
 php_value[upload_max_filesize] = 10G
 php_value[post_max_size] = 10G
diff --git a/scripts/install b/scripts/install
index 4cb7575..3994895 100644
--- a/scripts/install
+++ b/scripts/install
@@ -168,7 +168,6 @@ sudo sed 's|<TPL:PHP_NAME>|wifiadmin|g' -i /etc/php5/fpm/pool.d/wifiadmin.conf
 sudo sed 's|<TPL:PHP_USER>|admin|g' -i /etc/php5/fpm/pool.d/wifiadmin.conf
 sudo sed 's|<TPL:PHP_GROUP>|admins|g' -i /etc/php5/fpm/pool.d/wifiadmin.conf
 sudo sed 's|<TPL:NGINX_REALPATH>|/var/www/wifiadmin/|g' -i /etc/php5/fpm/pool.d/wifiadmin.conf
-sudo sed 's|^;\?\s*max_execution_time.\+|max_execution_time = 600|' -i /etc/php5/fpm/php.ini
 
 # Fix sources
 sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /var/www/wifiadmin/config.php