Minor fixes

Author: Alexandros Ioannides

install/hst-install-ubuntu.sh

@@ -562,7 +562,7 @@ echo
 if [ "$nginx" = 'yes' ]; then
     echo "[ * ] NGINX"
     echo "deb [arch=amd64] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
-    apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1    
+    apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1
 fi
 
 # Installing sury PHP repo
@@ -1130,7 +1130,7 @@ echo "THEME='dark'" >> $HESTIA/conf/hestia.conf
 # Inactive session timeout
 echo "INACTIVE_SESSION_TIMEOUT='60'" >> $HESTIA/conf/hestia.conf
 
-# Allow users to always create domains even the are not the owner of the main domain
+# Do not allow users to create subdomains when they don't own the domain
 echo "ENFORCE_SUBDOMAIN_OWNERSHIP='yes'" >> $HESTIA/conf/hestia.conf
 
 # Version & Release Branch
@@ -1411,51 +1411,51 @@ fi
 if [ "$mysql" = 'yes' ]; then
     # Display upgrade information
     echo "[ * ] Installing phpMyAdmin version v$pma_v..."
-    
+
     # Download latest phpmyadmin release
     wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
-    
+
     # Unpack files
     tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
-    
+
     # Create folders
     mkdir -p  /usr/share/phpmyadmin
     mkdir -p /etc/phpmyadmin
-    mkdir -p /etc/phpmyadmin/conf.d/  
+    mkdir -p /etc/phpmyadmin/conf.d/
     mkdir /usr/share/phpmyadmin/tmp
-    
+
     # Configuring Apache2 for PHPMYADMIN
     if [ "$apache" = 'yes' ]; then
         cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/phpmyadmin/
         ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
     fi
-    
+
     # Overwrite old files
     cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
-    
+
     # Create copy of config file
     cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
     mkdir -p /var/lib/phpmyadmin/tmp
     chmod 777 /var/lib/phpmyadmin/tmp
-    
+
     # Set config and log directory
     sed -i "s|define('CONFIG_DIR', ROOT_PATH);|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
     sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
-    
+
     # Create temporary folder and change permission
     chmod 777 /usr/share/phpmyadmin/tmp
 
     # Generate blow fish
     blowfish=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)
     sed -i "s|%blowfish_secret%|$blowfish|" /etc/phpmyadmin/config.inc.php
-    
+
     # Clean Up
     rm -fr phpMyAdmin-$pma_v-all-languages
     rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
-    
+
     echo "DB_PMA_ALIAS='phpmyadmin'" >> $HESTIA/conf/hestia.conf
     $HESTIA/bin/v-change-sys-db-alias 'pma' "phpmyadmin"
-    
+
     # Special thanks to Pavel Galkin (https://skurudo.ru)
     # https://github.com/skurudo/phpmyadmin-fixer
     source $HESTIA_INSTALL_DIR/phpmyadmin/pma.sh > /dev/null 2>&1
@@ -1669,11 +1669,13 @@ fi
 #                       Configure API                      #
 #----------------------------------------------------------#
 
-echo "API='yes'" >> $HESTIA/conf/hestia.conf
-if [ "$api" != "yes" ]; then
+if [ "$api" = "yes" ]; then
+    echo "API='yes'" >> $HESTIA/conf/hestia.conf
+    echo "API_ALLOWED_IP='127.0.0.1'" >> $HESTIA/conf/hestia.conf
+else
     $HESTIA/bin/v-change-sys-api disable
 fi
-echo "API_ALLOWED_IP='127.0.0.1'" >> $HESTIA/conf/hestia.conf
+
 
 #----------------------------------------------------------#
 #                   Configure Admin User                   #