From 9ac0ec6917d6bac14667e7eaa66539d28621acd3 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sat, 8 Jul 2017 11:36:16 +0200
Subject: [PATCH] templates.metadata for shares pools must be independant from
 www.conf

---
 createlinks                                                 | 6 ------
 .../etc/opt/remi/php70/php-fpm.d/shares.conf                | 2 ++
 .../etc/opt/remi/php71/php-fpm.d/shares.conf                | 2 ++
 .../e-smith/templates.metadata/etc/php-fpm.d/shares.conf    | 2 ++
 .../opt/remi/php56/root/etc/php-fpm.d/shares.conf           | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf
 create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf
 create mode 100644 root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf
 create mode 100644 root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf

diff --git a/createlinks b/createlinks
index dffa1ef..b76c06e 100644
--- a/createlinks
+++ b/createlinks
@@ -23,9 +23,3 @@ foreach my $file qw( /etc/php-fpm.conf
                      /etc/opt/remi/php71/php-fpm.d/shares.conf ){
   templates2events($file, qw(webapps-update bootstrap-console-save));
 }
-
-safe_symlink('/etc/e-smith/templates.metadata/etc/php-fpm.d/www.conf' , 'root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf');
-safe_symlink('/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/www.conf', 'root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf');
-safe_symlink('/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/www.conf', 'root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf');
-safe_symlink('/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/www.conf', 'root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf');
-
diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf b/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf
new file mode 100644
index 0000000..0efe011
--- /dev/null
+++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
+MORE_DATA={ PHP_VERSION => 70 }
diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf b/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf
new file mode 100644
index 0000000..701faf3
--- /dev/null
+++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
+MORE_DATA={ PHP_VERSION => 71 }
diff --git a/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf b/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf
new file mode 100644
index 0000000..4a224c0
--- /dev/null
+++ b/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
+MORE_DATA={ PHP_VERSION => '' }
diff --git a/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf b/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf
new file mode 100644
index 0000000..f4382e7
--- /dev/null
+++ b/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
+MORE_DATA={ PHP_VERSION => 56 }