From f9da9e670febf89b583df796693281b01de77e01 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 18 Jul 2017 11:23:26 +0200
Subject: [PATCH] Remove hardcoded php version from the code Replace it at
 build time so it's easy to change

---
 root/etc/e-smith/templates/etc/e-smith/sql/init/dl                      | 2 +-
 .../etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15Dl | 2 +-
 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/dl b/root/etc/e-smith/templates/etc/e-smith/sql/init/dl
index ef01c61..784c4b0 100644
--- a/root/etc/e-smith/templates/etc/e-smith/sql/init/dl
+++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/dl
@@ -11,7 +11,7 @@ if [ ! -d /var/lib/mysql/$db ]; then
         /usr/bin/mysql -e 'create database $db'
         /usr/bin/mysql $db < $dbstruct
 else
-        su -s /bin/bash - www -c "cd /usr/share/dl/include/scripts && /usr/bin/php56 ./dbupgrade.php"
+        su -s /bin/bash - www -c "cd /usr/share/dl/include/scripts && /usr/bin/php__PHP_VERSION__ ./dbupgrade.php"
 fi
 
 /usr/bin/mysql <<EOF
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15Dl b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15Dl
index 92d9039..ca8543e 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15Dl
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15Dl
@@ -3,7 +3,7 @@ if ($fastcgi_mod eq 'mod_fastcgi'){
   $OUT .=<<_EOF;
 Action phpdl-fastcgi /php-cgi-bin/phpdl-wrapper
 Alias /php-cgi-bin/phpdl-wrapper /var/www/php-cgi-bin/phpdl-wrapper
-FastCgiExternalServer /var/www/php-cgi-bin/phpdl-wrapper -socket /var/run/php-fpm/php56-dl.sock -pass-header Authorization -idle-timeout 120
+FastCgiExternalServer /var/www/php-cgi-bin/phpdl-wrapper -socket /var/run/php-fpm/php__PHP_VERSION__-dl.sock -pass-header Authorization -idle-timeout 120
 _EOF
 }
 }
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl
index 4518cda..1fecfa1 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl
@@ -43,7 +43,7 @@ _EOF
   elsif ($fascgi_mod eq 'mod_proxy_fcgi'){
     $php =<<'_EOF';
      <FilesMatch \.php$>
-         SetHandler "proxy:unix:/var/run/php-fpm/php56-dl.sock|fcgi://localhost"
+         SetHandler "proxy:unix:/var/run/php-fpm/php__PHP_VERSION__-dl.sock|fcgi://localhost"
      </FilesMatch>
 _EOF
   }