koozali
/
smeserver-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove hardcoded php version from the code 

Replace it at build time so it's easy to change
This commit is contained in:
Daniel Berteaud 2017-07-18 11:23:26 +02:00
parent 9d8dcb147c
commit f9da9e670f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/e-smith/templates/etc/e-smith/sql/init/dl
View File

@ -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

2
root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig15Dl
View File

@ -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
}
}

2
root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98Dl
View File

@ -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
}