beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lookup php-fpm package in case something goes wrong

Browse source
This commit is contained in:
earnolmartin 2019-04-12 10:45:19 -06:00
parent cde4cfac80
commit 4289762236
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ehcp/ehcpforceupdate.sh
View file

@ -1334,8 +1334,18 @@ function CheckPreReqs(){
# Normal
aptgetInstall nginx
# Install PHP-FPM which can be tricky evidently...
installPHPFPM
}
function installPHPFPM(){
aptgetInstall php5-fpm
aptgetInstall php-fpm
phpfpmversionsFromCache=$(apt-cache search "fpm" | grep "php" | grep "\-fpm" | awk '{print $1}')
for version in "$phpfpmversionsFromCache" ; do
aptgetInstall "$version"
done
}
function addConfDFolder(){

8
ehcp/install_lib.php
View file

@ -1237,6 +1237,14 @@ function install_nginx_webserver(){
// Install nginx stuff
aptget(array('nginx','php5-fpm','php-fpm','php5-cgi','php-cgi')); # apt-get install nginx php5-fpm php5-cgi
// Detect php-fpm specific verison in case above fails
$phpFPMVersions = shell_exec("apt-cache search 'fpm' | grep 'php' | grep '\-fpm' | awk '{print \$1}'");
$arrayOfPHPFPM = array_filter(explode(PHP_EOL, $phpFPMVersions));
if(isset($arrayOfPHPFPM) && is_array($arrayOfPHPFPM) && count($arrayOfPHPFPM)){
aptget($arrayOfPHPFPM);
}
copy("$mydir/etc/nginx/mime.types","/etc/nginx/mime.types");
// Stop and disable services