smeserver-php-fpm/contribs9/smeserver-php-fpm-0.1.1.bz10851-php72php73.patch

diff -Nur smeserver-php-fpm-0.1.1.old/CHANGELOG.git smeserver-php-fpm-0.1.1/CHANGELOG.git
--- smeserver-php-fpm-0.1.1.old/CHANGELOG.git   2017-07-27 18:11:13.000000000 +0200
+++ smeserver-php-fpm-0.1.1/CHANGELOG.git       1970-01-01 01:00:00.000000000 +0100
@@ -1,380 +0,0 @@
-commit 0718fc8b4abb10e77cdbc91bcd59422033a89d0e
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 27 18:05:00 2017 +0200
-
-    Fix closing parenthesis on prop method
-
-commit fd8f348ce19fc6b450c09f71f074fc148917e733
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 26 17:20:31 2017 +0200
-
-    Spec file changes
-    Including build for x86_64 only. While this package itself is noarch, it depends on x86_64 only packages
-
-commit fa3d2112cd135360ed792f511a41c390cfb9e324
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 16:57:05 2017 +0200
-
-    Simplify mod_fastcgi config template
-
-commit 05acd7065887b777a1876962207a9b08037a40eb
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 16:53:28 2017 +0200
-
-    Fix reading status prop for cutom pools
-
-commit a317932158e9002c3aebe075dbe86984d21e38e7
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 16:52:04 2017 +0200
-
-    Add templates.metadata for custom php pools
-
-commit d37510d18b7e254bbc4511bb3d162c0330fc4358
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 16:48:25 2017 +0200
-
-    Missing closing quote and semi-colon
-
-commit 5bd514c6e355782cfe489a544f5e00841c647a1d
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 13:57:11 2017 +0200
-
-    Expand custom pools files
-
-commit fc97f8f92728fef9ab441f8dd24d4f1ed9b993b2
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 13:55:39 2017 +0200
-
-    Fix httpd template syntaxe
-
-commit 3f76ffa14155d9e13502de7a63dfa88a8ac802b2
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 12:40:34 2017 +0200
-
-    Possibility to use a custom PHP pool per share
-
-commit d7656b699c09a696166ee83d197bdfbd9cb4ee0a
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 12:29:46 2017 +0200
-
-    Cleanups in shares php pool templates
-
-commit daef899874a722f44afc13fc95e021670923a686
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Fri Jul 14 12:23:57 2017 +0200
-
-    Add possibility to define custom PHP pools
-
-commit 10eb0f65519515656b16af70db59136101abcaa4
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 18:57:35 2017 +0200
-
-    Fix template-begin link
-
-commit 198231fb458310f5f5f2a917818fd8c80132faa3
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 18:55:21 2017 +0200
-
-    Replace logrotate conf with templates
-
-commit 986e7b9ea7365d878a999f3b176244fb69c903f9
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 18:38:29 2017 +0200
-
-    Add a logrotate conf for php-fpm logs
-
-commit 6f64cb8c3f1fd9e82d2c2477d7f01c8c526671fb
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 18:26:36 2017 +0200
-
-    run tmpwatch for PHP temp dir
-
-commit fc4d59c64b6abbcb62d65e16a148ceaf9950fa60
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 12:17:50 2017 +0200
-
-    Fixes in php-pool-dirs action script
-
-commit 9895db690f645d1710ad4a4195c64fbd14324403
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 10:16:53 2017 +0200
-
-    Reload services and expand-template when modifying shares
-
-commit f88b75fbe02581da270a5ab4488691ce8c0f3f50
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 12 10:13:16 2017 +0200
-
-    Reload fpm services, no need to restart
-
-commit aa37d930f807a79c7ee421227aa597239ccc7137
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Tue Jul 11 19:57:10 2017 +0200
-
-    Fix shares pool template path for php56
-
-commit c1450e94f70804a9669265e48f25fd0e47d4410f
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Tue Jul 11 19:03:24 2017 +0200
-
-    Remove the adjust service action script
-    Instead makes sure there's no socket conflict by simply prepending the PHP version to the socket name
-
-commit bd62c565c02e0ae21374e100e8e007e6451159c0
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 22:13:51 2017 +0200
-
-    Various fixes in pools templates
-
-commit 3e21f2eaabf32d64eb2ba2f386f3ab5b203d93d9
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 22:01:11 2017 +0200
-
-    Fix PIDFILE for php71
-
-commit a3402637bc7731420cbc6b65cb46ce96ae3cdde3
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 21:53:39 2017 +0200
-
-    Env files mustn't use templaet-begin-ini
-
-commit 7d52484a4f90d835e25a2f610cfe08960b81e4fc
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 21:48:26 2017 +0200
-
-    Fixes in adjust-php-fpm-services
-
-commit d6b14adfc842a7a2e0bc34d0fff61b107495362e
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 21:43:57 2017 +0200
-
-    Set PIDFILE so services can be stopped
-
-commit b76293809ce23179935506e94b1f51dd26595730
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 21:26:06 2017 +0200
-
-    Add a action acript to handle FPM restarts
-
-commit 98a234d6f6f7789d8face7e7259fdcd59f6c708e
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 21:06:29 2017 +0200
-
-    templates-default and not template-default
-
-commit bfdabe4b1bd15df3aab2d7053de6060bbe80198f
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 21:04:29 2017 +0200
-
-    Fix double $ in var name
-
-commit a282212291a960040fd16113ef21d221dc729265
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 9 20:55:40 2017 +0200
-
-    Fix template-begin links
-
-commit 17cf6724ee85725826ce0d5281745d23d662ebfb
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 12:22:57 2017 +0200
-
-    No # allowed for comment in php conf since php 7
-
-commit 440227bf348b3a15676c30fccc677beae4e46b9e
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 12:12:20 2017 +0200
-
-    Add default DB entry for php70-php-fpm and php71-php-fpm
-
-commit 12527c1508a2484f9a288c1f9021690f16c15a4a
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 12:06:14 2017 +0200
-
-    Makes sure we remove php pool dirs on share delete
-
-commit 9649dd42228f0f2fdaf26948a96b014a190f9c56
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 12:05:32 2017 +0200
-
-    Add a script to create and delete php pool dirs
-
-commit c793cdef93755c21176504ae3f778be9f2c2580b
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 11:44:16 2017 +0200
-
-    Fixes and cleanup in shares template
-
-commit 9ac0ec6917d6bac14667e7eaa66539d28621acd3
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 11:36:16 2017 +0200
-
-    templates.metadata for shares pools must be independant from www.conf
-
-commit d73eb21445c43eb3a980cc51f0d2c68c67864f22
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 11:15:51 2017 +0200
-
-    Expand templates for shares PHP FPM pools config
-
-commit 0a70b24010868c7390e43c799c25f3b5948c311c
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 11:10:09 2017 +0200
-
-    Remove useless FPM_POOL_DIR from pools MORE_DATA
-
-commit c6275f4299cf239b6476411cde1bfb9da7302dde
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sat Jul 8 11:03:03 2017 +0200
-
-    Create one PHP FPM pool per shared folder
-
-commit 9c59939401c8a9ba435a3c4bf8f58d4a3cde5bbd
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 6 19:15:14 2017 +0200
-
-    Add support for PHP 7.0 and PHP 7.1
-
-commit 6b94210616165a0f63b86bbd42f2803b840b4eca
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 6 19:13:22 2017 +0200
-
-    Fix in spec file
-
-commit 998315223b95ccf4ce58fd3ae168aeb5adfadf69
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 6 19:10:51 2017 +0200
-
-    Remove useless PID_DIR from MORE_DATA
-
-commit 2e76904ff8126f46efb98c219acbbe6106469c47
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 6 19:04:55 2017 +0200
-
-    Allow complete access to the dummy location for php-cgi handlers
-
-commit f950348e8aef7b5a4216a88222f1bfff65405e76
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 6 18:40:22 2017 +0200
-
-    Adapt to work with mod_fastcgi or mod_proxy_fcgi
-
-commit c01d59f5238e6fbffeff4212651a2cd2658457b8
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Thu Jul 6 18:13:46 2017 +0200
-
-    Conditionaly load mod_proxy_fcgi or mod_fastcgi
-
-commit 4c0439a2a8fe914dce98869e0db2e218ad84c238
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 23:08:13 2017 +0200
-
-    Ensure each php-fpm master uses a different PID file
-
-commit e4668215ad8b3e76b102afa699e165e11012e1b9
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 23:03:08 2017 +0200
-
-    Remove useless $PID_DIR from MORE_DATA
-
-commit 7a2476785e632c06db61b10d97abfdb4a7417e37
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 23:02:48 2017 +0200
-
-    Add templates metadata for stock php-fpm.d/www.conf
-
-commit 52ee545b25763697b6c70d1a6aefce12b6ca767a
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 23:01:03 2017 +0200
-
-    Add template metadata for stock php-fpm.conf
-
-commit 0ab3ca30c9b1882d76b2f963f037b0d5a09af9ca
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 23:00:35 2017 +0200
-
-    Move defaults DB entry in their correct dir
-
-commit 7d8410f63ca4ac8761f86aaba1382bdd9e43c1e7
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:48:19 2017 +0200
-
-    Add links to start default php-fpm service
-
-commit 689f207cbe1e594f4d2c400f1db33e30716b41a1
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:46:05 2017 +0200
-
-    Add default DB entry for stock php-fpm service
-
-commit 73615c326bdf8c377428781449225de16b449de2
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:43:57 2017 +0200
-
-    Support empty $PHP_VERSION for default php-fpm service
-
-commit b9b738be0613933f1e77370e4f1860e589084a17
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:42:14 2017 +0200
-
-    Put PID in global /var/run/php-fpm dir
-
-commit e4f19a7defe934489d221efba609d4d1476fe089
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:35:31 2017 +0200
-
-    Add links to start php56-php-fpm service
-    And templates expension
-
-commit 27448561e2c1ce008a1e2667aa143753a2ec9df6
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:29:45 2017 +0200
-
-    Use php56-php-fpm entry to get conf instead of php56
-
-commit 69e1a214d0f7c37682379fc0919c2a2fdcd13fec
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:29:30 2017 +0200
-
-    Add service entry for php56-php-fpm
-
-commit a3c773364f305f3b4da2a06bb79cec8ec82c7726
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 22:19:53 2017 +0200
-
-    Load mod_proxy_fcgi
-
-commit 2ae809f147d493eee8a13b00c7d9015c1a57d046
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Wed Jul 5 10:26:10 2017 +0200
-
-    Set default disabled functions
-
-commit 77ffc47f4c839c76a6d8610a8f65eea95e218175
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Tue Jul 4 23:13:13 2017 +0200
-
-    Add php56 deps and create needed directories
-
-commit 3cff192c10ce28f13b28510ae6b7db458050ad72
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Tue Jul 4 22:53:42 2017 +0200
-
-    Read defalt pool settings from the DB
-
-commit 9d5481ddfb4d94920454cfef95f0f35a1c3aafb5
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Tue Jul 4 22:53:13 2017 +0200
-
-    Fix templates.metadata for fpm pools
-
-commit 1997dd3bcbb5dcd7d897b7beb183a06de23a3209
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 2 23:10:24 2017 +0200
-
-    Add templates for default PHP pool
-
-commit a0018ed841eb3ea7cb6b152e5fbe1e6a162d5424
-Author: Daniel Berteaud <daniel@firewall-services.com>
-Date:   Sun Jul 2 14:19:48 2017 +0200
-
-    First commit
diff -Nur smeserver-php-fpm-0.1.1.old/createlinks smeserver-php-fpm-0.1.1/createlinks
--- smeserver-php-fpm-0.1.1.old/createlinks     2017-07-27 18:05:00.000000000 +0200
+++ smeserver-php-fpm-0.1.1/createlinks 2019-12-16 19:54:02.827363588 +0100
@@ -2,7 +2,7 @@
 
 use esmith::Build::CreateLinks qw(:all);
 
-foreach my $service (qw(php-fpm php56-php-fpm php70-php-fpm php71-php-fpm)){
+foreach my $service (qw(php-fpm php56-php-fpm php70-php-fpm php71-php-fpm php72-php-fpm php73-php-fpm)){
   service_link_enhanced($service, "S86", "7");
   service_link_enhanced($service, "K16", "6");
   service_link_enhanced($service, "K16", "0");
@@ -27,7 +27,15 @@
                      /etc/opt/remi/php71/php-fpm.conf
                      /etc/opt/remi/php71/php-fpm.d/www.conf
                      /etc/opt/remi/php71/php-fpm.d/shares.conf
-                     /etc/opt/remi/php71/php-fpm.d/custom.conf ){
+                     /etc/opt/remi/php71/php-fpm.d/custom.conf 
+                     /etc/opt/remi/php72/php-fpm.conf
+                     /etc/opt/remi/php72/php-fpm.d/www.conf
+                     /etc/opt/remi/php72/php-fpm.d/shares.conf
+                     /etc/opt/remi/php72/php-fpm.d/custom.conf
+                     /etc/opt/remi/php73/php-fpm.conf
+                     /etc/opt/remi/php73/php-fpm.d/www.conf
+                     /etc/opt/remi/php73/php-fpm.d/shares.conf
+                     /etc/opt/remi/php73/php-fpm.d/custom.conf){
   templates2events($file, qw(webapps-update bootstrap-console-save share-create share-modify share-modify-server share-delete));
   safe_symlink('/etc/e-smith/templates-default/template-begin-ini', "root/etc/e-smith/templates$file/template-begin");
 }
@@ -38,6 +46,8 @@
                      /opt/remi/php56/root/etc/sysconfig/php-fpm
                      /etc/opt/remi/php70/sysconfig/php-fpm
                      /etc/opt/remi/php71/sysconfig/php-fpm
+                     /etc/opt/remi/php72/sysconfig/php-fpm
+                     /etc/opt/remi/php73/sysconfig/php-fpm
                      /etc/logrotate.d/php-fpm ){
   templates2events($file, qw(webapps-update bootstrap-console-save));
 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults   2017-07-27 18:05:00.000000000 +0200
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults       2019-12-16 19:51:05.387361636 +0100
@@ -1,5 +1,5 @@
 
-for VER in php php56 php70 php71; do
+for VER in php php56 php70 php71 php72 php73; do
   /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
   /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
   /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig    2017-07-27 18:05:00.000000000 +0200
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig        2019-12-16 19:50:36.887360748 +0100
@@ -17,7 +17,7 @@
 
 _EOF
 
-  foreach my $ver ('', '56', '70', '71'){
+  foreach my $ver ('', '56', '70', '71', '72', '73'){
     $OUT .=<<_EOF;
 
 Action php$ver-fastcgi /php-cgi-bin/php$ver-wrapper
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm      2017-07-27 18:05:00.000000000 +0200
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm  2019-12-16 19:51:35.599362570 +0100
@@ -8,5 +8,7 @@
       /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true
       /sbin/e-smith/service php70-php-fpm reload >/dev/null 2>&1 || true
       /sbin/e-smith/service php71-php-fpm reload >/dev/null 2>&1 || true
+      /sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true
+      /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
     endscript
 \}
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf     1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf 2019-12-16 19:46:37.302353030 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.conf"
+MORE_DATA={ PHP_VERSION => 72, FPM_POOL_DIR => "/etc/opt/remi/php72/php-fpm.d" }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf    1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf        2019-12-16 19:47:20.872354468 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
+MORE_DATA={ PHP_VERSION => 72 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf    1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf        2019-12-16 19:46:53.509353567 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
+MORE_DATA={ PHP_VERSION => 72 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf       1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf   2019-12-16 19:47:07.145354018 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
+MORE_DATA={ PHP_VERSION => 72 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm        1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm    2019-12-16 19:47:33.994354899 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/sysconfig/php-fpm"
+MORE_DATA={ PHP_VERSION => 72 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf     1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf 2019-12-16 19:48:05.336355919 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.conf"
+MORE_DATA={ PHP_VERSION => 73, FPM_POOL_DIR => "/etc/opt/remi/php73/php-fpm.d" }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf    1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf        2019-12-16 19:48:44.804357194 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
+MORE_DATA={ PHP_VERSION => 73 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf    1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf        2019-12-16 19:48:23.431356505 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
+MORE_DATA={ PHP_VERSION => 73 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf       1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf   2019-12-16 19:48:34.980356878 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
+MORE_DATA={ PHP_VERSION => 73 }
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm        1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm    2019-12-16 19:48:54.575357511 +0100
@@ -0,0 +1,2 @@
+TEMPLATE_PATH="/etc/sysconfig/php-fpm"
+MORE_DATA={ PHP_VERSION => 73 }
diff -Nur smeserver-php-fpm-0.1.1.old/smeserver-php-fpm.spec smeserver-php-fpm-0.1.1/smeserver-php-fpm.spec
--- smeserver-php-fpm-0.1.1.old/smeserver-php-fpm.spec  2017-07-27 18:05:00.000000000 +0200
+++ smeserver-php-fpm-0.1.1/smeserver-php-fpm.spec      1970-01-01 01:00:00.000000000 +0100
@@ -1,167 +0,0 @@
-%define version 0.1.0
-%define release 1
-%define name smeserver-php-fpm
-
-
-Summary: PHP FPM pools on SME Server
-Name: %{name}
-Version: %{version}
-Release: %{release}%{?dist}
-License: MIT
-Group: Applications/System
-Source: %{name}-%{version}.tar.gz
-
-BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-BuildArch: x86_64
-BuildRequires: e-smith-devtools
-
-Requires: e-smith-base >= 5.6.0
-
-# On el7 we can use mod_proxy_fcgi instead
-%if 0%{?rhel} <= 7
-Requires: mod_fastcgi
-%endif
-
-Requires: tmpwatch
-Requires: logrotate
-
-# Stock PHP
-Requires: php-cli
-Requires: php-ldap
-Requires: php-imap
-Requires: php-gd
-Requires: php-xml
-Requires: php-xmlrpc
-Requires: php-soap
-Requires: php-opcache
-Requires: php-fpm
-Requires: php-mbstring
-Requires: php-mysql
-Requires: php-json
-Requires: php-bcmath
-Requires: php-intl
-Requires: php-mcrypt
-Requires: php-pear
-Requires: php-process
-Requires: php-snmp
-
-# PHP 5.6
-Requires: php56-php-cli
-Requires: php56-php-ldap
-Requires: php56-php-imap
-Requires: php56-php-gd
-Requires: php56-php-xml
-Requires: php56-php-xmlrpc
-Requires: php56-php-soap
-Requires: php56-php-opcache
-Requires: php56-php-fpm
-Requires: php56-php-mbstring
-Requires: php56-php-mysql
-Requires: php56-php-json
-Requires: php56-php-bcmath
-Requires: php56-php-intl
-Requires: php56-php-mcrypt
-Requires: php56-php-pear
-Requires: php56-php-process
-Requires: php56-php-snmp
-
-# PHP 7.0
-Requires: php70-php-cli
-Requires: php70-php-ldap
-Requires: php70-php-imap
-Requires: php70-php-gd
-Requires: php70-php-xml
-Requires: php70-php-xmlrpc
-Requires: php70-php-soap
-Requires: php70-php-opcache
-Requires: php70-php-fpm
-Requires: php70-php-mbstring
-Requires: php70-php-mysql
-Requires: php70-php-json
-Requires: php70-php-bcmath
-Requires: php70-php-intl
-Requires: php70-php-mcrypt
-Requires: php70-php-pear
-Requires: php70-php-process
-Requires: php70-php-snmp
-
-# PHP 7.1
-Requires: php71-php-cli
-Requires: php71-php-ldap
-Requires: php71-php-imap
-Requires: php71-php-gd
-Requires: php71-php-xml
-Requires: php71-php-xmlrpc
-Requires: php71-php-soap
-Requires: php71-php-opcache
-Requires: php71-php-fpm
-Requires: php71-php-mbstring
-Requires: php71-php-mysql
-Requires: php71-php-json
-Requires: php71-php-bcmath
-Requires: php71-php-intl
-Requires: php71-php-mcrypt
-Requires: php71-php-pear
-Requires: php71-php-process
-Requires: php71-php-snmp
-
-%description
-Manage PHP FPM pools, and switch between PHP versions easily
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-perl createlinks
-%{__mkdir_p} root/var/www/php-cgi-bin/
-%{__mkdir_p} root/var/log/php/php/
-%{__mkdir_p} root/var/lib/php/php/{session,tmp,opcache,wsdlcache}
-%{__mkdir_p} root/var/log/php/php56/
-%{__mkdir_p} root/var/lib/php/php56/{session,tmp,opcache,wsdlcache}
-%{__mkdir_p} root/var/log/php/php70/
-%{__mkdir_p} root/var/lib/php/php70/{session,tmp,opcache,wsdlcache}
-%{__mkdir_p} root/var/log/php/php71/
-%{__mkdir_p} root/var/lib/php/php71/{session,tmp,opcache,wsdlcache}
-
-%install
-/bin/rm -rf $RPM_BUILD_ROOT
-(cd root; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
-/bin/rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-  --dir /var/log/php/php/ 'attr(0770,root,www)' \
-  --dir /var/lib/php/php/session 'attr(0770,root,www)' \
-  --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
-  --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
-  --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
-  --dir /var/log/php/php56/ 'attr(0770,root,www)' \
-  --dir /var/lib/php/php56/session 'attr(0770,root,www)' \
-  --dir /var/lib/php/php56/tmp 'attr(0770,root,www)' \
-  --dir /var/lib/php/php56/opcache 'attr(0770,root,www)' \
-  --dir /var/lib/php/php56/wsdlcache 'attr(0770,root,www)' \
-  --dir /var/log/php/php70/ 'attr(0770,root,www)' \
-  --dir /var/lib/php/php70/session 'attr(0770,root,www)' \
-  --dir /var/lib/php/php70/tmp 'attr(0770,root,www)' \
-  --dir /var/lib/php/php70/opcache 'attr(0770,root,www)' \
-  --dir /var/lib/php/php70/wsdlcache 'attr(0770,root,www)' \
-  --dir /var/log/php/php71/ 'attr(0770,root,www)' \
-  --dir /var/lib/php/php71/session 'attr(0770,root,www)' \
-  --dir /var/lib/php/php71/tmp 'attr(0770,root,www)' \
-  --dir /var/lib/php/php71/opcache 'attr(0770,root,www)' \
-  --dir /var/lib/php/php71/wsdlcache 'attr(0770,root,www)' \
-  > %{name}-%{version}-filelist
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}-%{version}-filelist
-%defattr(-,root,root)
-
-%pre
-
-%post
-
-%preun
-
-%changelog
-* Wed Jul 26 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.0-1.sme
-- Initial release
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/status smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/status
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/status 1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/status     2017-07-27 18:05:00.000000000 +0200
@@ -0,0 +1 @@
+enabled
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/type smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/type
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/type   1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php72-php-fpm/type       2017-07-27 18:05:00.000000000 +0200
@@ -0,0 +1 @@
+service
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/status smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/status
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/status 1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/status     2017-07-27 18:05:00.000000000 +0200
@@ -0,0 +1 @@
+enabled
diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/type smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/type
--- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/type   1970-01-01 01:00:00.000000000 +0100
+++ smeserver-php-fpm-0.1.1/root/etc/e-smith/db/configuration/defaults/php73-php-fpm/type       2017-07-27 18:05:00.000000000 +0200
@@ -0,0 +1 @@
+service