From b810bb40f8802bd4f38be9f1256ed2b0c4afe085 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 13 Jul 2017 17:19:02 +0200
Subject: [PATCH] Put PHP-FPM pool conf in www.conf

---
 createlinks                                           |  2 --
 .../php71/php-fpm.d/{tt-rss.conf => www.conf}/10All   | 11 +++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 rename root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/{tt-rss.conf => www.conf}/10All (91%)

diff --git a/createlinks b/createlinks
index b72cf38..caed9d3 100644
--- a/createlinks
+++ b/createlinks
@@ -6,7 +6,6 @@ use esmith::Build::CreateLinks  qw(:all);
 templates2events("/etc/e-smith/sql/init/tt-rss", qw(bootstrap-console-save webapps-update));
 templates2events("/usr/share/tt-rss/config.php", qw(bootstrap-console-save webapps-update));
 templates2events("/etc/cron.d/tt-rss", qw(bootstrap-console-save webapps-update));
-templates2events("/etc/opt/remi/php71/php-fpm.d/tt-rss.conf", qw(bootstrap-console-save webapps-update));
 
 # tt-rss daemon
 safe_symlink("restart", "root/etc/e-smith/events/webapps-update/services2adjust/tt-rss");
@@ -22,4 +21,3 @@ service_link_enhanced("tt-rss", "K10", "0");
 safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/usr/share/tt-rss/config.php/template-begin");
 safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/usr/share/tt-rss/config.php/template-end");
 
-safe_symlink("/etc/e-smith/templates-default/template-begin-ini", "root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/tt-rss.conf/template-begin");
diff --git a/root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/tt-rss.conf/10All b/root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/www.conf/10All
similarity index 91%
rename from root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/tt-rss.conf/10All
rename to root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/www.conf/10All
index 80bb84c..8dd6ddc 100644
--- a/root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/tt-rss.conf/10All
+++ b/root/etc/e-smith/templates/etc/opt/remi/php71/php-fpm.d/www.conf/10All
@@ -1,3 +1,7 @@
+{
+if ((${'tt-rss'}{status} || 'disabled') eq 'enabled){
+  $OUT .=<<_EOF;
+
 [php71-tt-rss]
 user = www
 group = www
@@ -34,3 +38,10 @@ php_admin_flag[file_upload] = off
 php_admin_flag[session.cookie_httponly] = on
 php_admin_flag[allow_url_include] = off
 php_admin_value[session.save_handler] = files
+
+_EOF
+}
+else{
+  $OUT .= '; Tiny Tiny RSS is disabled';
+}
+}