Browse Source

Implement better handling for php fpm installation conditions.

Raphael Schneeberger 7 years ago
parent
commit
be69edcd5d
2 changed files with 18 additions and 2 deletions
  1. 9 1
      install/hst-install-debian.sh
  2. 9 1
      install/hst-install-ubuntu.sh

+ 9 - 1
install/hst-install-debian.sh

@@ -643,6 +643,7 @@ rm -rf $HESTIA > /dev/null 2>&1
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 if [ "$multiphp" = 'yes' ]; then
 if [ "$multiphp" = 'yes' ]; then
+    fpm_added=false
     for v in "${multiphp_v[@]}"; do
     for v in "${multiphp_v[@]}"; do
         if [ "$v" = "$fpm_v" ]; then
         if [ "$v" = "$fpm_v" ]; then
             fpm_added=true
             fpm_added=true
@@ -656,9 +657,16 @@ if [ "$multiphp" = 'yes' ]; then
         fi
         fi
         software="$software $mph"
         software="$software $mph"
     done
     done
+    if [ "$fpm_added" = false ]; then
+        fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
+             php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
+             php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
+             php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
+        software="$software $fpm"
+    fi
 fi
 fi
 
 
-if [ "$phpfpm" = 'yes' ] || [ "$fpm_added" ]; then
+if [ "$phpfpm" = 'yes' ]; then
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip

+ 9 - 1
install/hst-install-ubuntu.sh

@@ -610,6 +610,7 @@ rm -rf $HESTIA > /dev/null 2>&1
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 if [ "$multiphp" = 'yes' ]; then
 if [ "$multiphp" = 'yes' ]; then
+    fpm_added=false
     for v in "${multiphp_v[@]}"; do
     for v in "${multiphp_v[@]}"; do
         if [ "$v" = "$fpm_v" ]; then
         if [ "$v" = "$fpm_v" ]; then
             fpm_added=true
             fpm_added=true
@@ -623,9 +624,16 @@ if [ "$multiphp" = 'yes' ]; then
         fi
         fi
         software="$software $mph"
         software="$software $mph"
     done
     done
+    if [ "$fpm_added" = false ]; then
+        fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
+             php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
+             php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
+             php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
+        software="$software $fpm"
+    fi
 fi
 fi
 
 
-if [ "$phpfpm" = 'yes' ] || [ "$fpm_added" ]; then
+if [ "$phpfpm" = 'yes' ]; then
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip