Implement dhparam as install file instead generation.

Author: ScIT-Raphael

install/deb/ssl/dhparam.pem

@@ -0,0 +1,13 @@
+-----BEGIN DH PARAMETERS-----
+MIICCAKCAgEA+tQGpIebOZgTRfzeJO8V08AKJxjIEPl+ks2s0kVcYEYn7XhoqV9p
+vMxYxSz+3gavaKD42tbxbru01MZhi6PAhvWZn1pUgdUFTDPv6Suq/zQuNvxEx/p4
+/TvfQ+6IqWcPFjGZb6lmnR4v592joEmTaps6Uqv2PDqCgZoeLDqVSsqWRotFbFWa
+mHCFU/5RsSyUAPhuH9lk0UOnK+rkQulppZsAKNLMUBSoNGg+OjYbvcRq8WMQIx8H
+Or8i9lZa12UFfr3ui5I7Y29aARh4M8WTtWKAxoDp6N8ENT3hXqgEm4cIVmHOgFDZ
+SvWvsV/6ghDpYIOgiatKauQPd2wXkZ/95yeO2JxyYS9rGK4a10QICsB/Jj5j/1i8
+yimrllUs5UW8BjmkRTYQPFtvZzrYUoSohSazz7r5Q7/K/Nh40Tb+SgGvQqMxTolL
+nTR2kP8DDpTIar/E2B1fDM+yk07hMmKlTOP+nFmJtcq61rM79kQfpsG4mxIX2sxR
+el6qP5ng8NQG648aL9OnaUgisLpz1ll6cL7rXHExxEiFgb667F+uKVYJ31d0KyBE
+6zrb7iIr5l1q+/vIxIu3QvOfH43+lAV/XHaNP1YvrCkTmkihBAeHt74x5uZRalg3
+3qci/XOL0h6i5YW3s7Yem1tqy04P2XYVfmfr4KzzNjOFAQwADKm7G3sCAQI=
+-----END DH PARAMETERS-----

install/hst-install-debian.sh

@@ -1104,21 +1104,8 @@ if [ "$nginx" = 'yes' ]; then
         done
     fi
 
-    # Generating dhparam.
-    echo "(*) Enabling HTTPS Strict Transport Security (HSTS) support,"
-    echo -n "    this will take some time. Please wait..."
-    openssl dhparam 4096 -out /etc/ssl/dhparam.pem > /dev/null 2>&1 &
-    BACK_PID=$!
-
-    # Check if package installation is done, print a spinner
-    spin_i=1
-    while kill -0 $BACK_PID > /dev/null 2>&1 ; do
-        printf "\b${spinner:spin_i++%${#spinner}:1}"
-        sleep 0.5
-    done
-
-    # Do a blank echo to get the \n back
-    echo
+    # Install dhparam.
+    cp -f $HESTIA/install/deb/ssl/dhparam.pem /etc/ssl
 
     # Update dns servers in nginx.conf
     dns_resolver=$(cat /etc/resolv.conf | grep -i '^nameserver' | cut -d ' ' -f2 | tr '\r\n' ' ' | xargs)

install/hst-install-ubuntu.sh

@@ -1083,21 +1083,8 @@ if [ "$nginx" = 'yes' ]; then
         done
     fi
 
-    # Generating dhparam.
-    echo "(*) Enabling HTTPS Strict Transport Security (HSTS) support,"
-    echo -n "    this will take some time. Please wait..."
-    openssl dhparam 4096 -out /etc/ssl/dhparam.pem > /dev/null 2>&1 &
-    BACK_PID=$!
-
-    # Check if package installation is done, print a spinner
-    spin_i=1
-    while kill -0 $BACK_PID > /dev/null 2>&1 ; do
-        printf "\b${spinner:spin_i++%${#spinner}:1}"
-        sleep 0.5
-    done
-
-    # Do a blank echo to get the \n back
-    echo
+    # Install dhparam.
+    cp -f $HESTIA/install/deb/ssl/dhparam.pem /etc/ssl
 
     # Update dns servers in nginx.conf
     dns_resolver=$(cat /etc/resolv.conf | grep -i '^nameserver' | cut -d ' ' -f2 | tr '\r\n' ' ' | xargs)

install/upgrade/0.9.8-29.sh

@@ -1,37 +1,41 @@
 #!/bin/bash
 
+# define vars
+HESTIA="/usr/local/hestia"
+hestiacp="$HESTIA/install/deb"
+
 # load hestia.conf
 source $HESTIA/conf/hestia.conf
 
+# load hestia main functions
+source /usr/local/hestia/func/main.sh
+
 # Initialize backup directory
 mkdir -p $HESTIA_BACKUP/templates/
 mkdir -p $HESTIA_BACKUP/packages/
 
-# load hestia main functions
-source /usr/local/hestia/func/main.sh
 
 echo "(*) Upgrading to Hestia Control Panel v$VERSION..."
 
 # Generating dhparam.
 if [ ! -e /etc/ssl/dhparam.pem ]; then
     echo "(*) Enabling HTTPS Strict Transport Security (HSTS) support"
-    echo -n "    This will take some time, please wait..."
-    openssl dhparam 4096 -out /etc/ssl/dhparam.pem > /dev/null 2>&1 &
-    BACK_PID=$!
 
-    # Check if package installation is done, print a spinner
-    spin_i=1
-    while kill -0 $BACK_PID > /dev/null 2>&1 ; do
-        printf "\b${spinner:spin_i++%${#spinner}:1}"
-        sleep 0.5
-    done
+    # Backup existing conf
+    mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.bak
 
-    # Do a blank echo to get the \n back
-    echo
+    # Copy new nginx config
+    cp -f $hestiacp/nginx/nginx.conf /etc/nginx/
+
+    # Copy dhparam
+    cp -f $hestiacp/ssl/dhparam.pem /etc/ssl/
 
     # Update dns servers in nginx.conf
     dns_resolver=$(cat /etc/resolv.conf | grep -i '^nameserver' | cut -d ' ' -f2 | tr '\r\n' ' ' | xargs)
     sed -i "s/1.0.0.1 1.1.1.1/$dns_resolver/g" /etc/nginx/nginx.conf
+
+    # Restart nginx service
+    service nginx restart >/dev/null 2>&1
 fi
 
 # Update default page templates