Browse Source

Adjust fm if conditions.

Raphael Schneeberger 5 years ago
parent
commit
16c8e79b4b

+ 2 - 4
install/hst-install-debian.sh

@@ -1681,10 +1681,8 @@ fi
 #                  Configure FileManager                   #
 #----------------------------------------------------------#
 
-if [ "$nginx" = 'yes' ]; then
-    echo "(*) Configuring Filegator FileManager..."
-    source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
-fi
+echo "(*) Configuring Filegator FileManager..."
+source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
 
 
 #----------------------------------------------------------#

+ 2 - 4
install/hst-install-ubuntu.sh

@@ -1636,10 +1636,8 @@ fi
 #                  Configure FileManager                   #
 #----------------------------------------------------------#
 
-if [ "$nginx" = 'yes' ]; then
-    echo "(*) Configuring Filegator FileManager..."
-    source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
-fi
+echo "(*) Configuring Filegator FileManager..."
+source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
 
 
 #----------------------------------------------------------#

+ 1 - 1
install/upgrade/versions/latest.sh

@@ -79,7 +79,7 @@ if [ "$WEB_SYSTEM" = "apache2" ]; then
 fi
 
 # Install Filegator FileManager during upgrade
-if [ -e "/etc/nginx/nginx.conf" ]; then
+if [ ! -e "$HESTIA/web/fm/configuration.php" ]; then
     echo "(*) Configuring Filegator FileManager..."
     source HESTIA_INSTALL_DIR/filemanager/install-fm.sh > /dev/null 2>&1
 fi