Просмотр исходного кода

Improve upgrade script routines

Kristan Kenney 6 лет назад
Родитель
Сommit
9710e08da6
3 измененных файлов с 2 добавлено и 32 удалено
  1. 1 0
      install/hst-install-ubuntu.sh
  2. 0 31
      install/upgrade/versions/1.0.3.sh
  3. 1 1
      src/hst_autocompile.sh

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

@@ -1163,6 +1163,7 @@ if [ "$nginx" = 'yes' ]; then
     done
     if [ ! -z "$resolver" ]; then
         sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /etc/nginx/nginx.conf
+        sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
     fi
 
     update-rc.d nginx defaults > /dev/null 2>&1

+ 0 - 31
install/upgrade/versions/1.0.3.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# Hestia Control Panel upgrade script for target version 1.0.3
-
-#######################################################################################
-#######                      Place additional commands below.                   #######
-#######################################################################################
-
-# Set default theme
-if [ -z $THEME ]; then
-    echo "(*) Enabling support for customizable themes and configuring default..."
-    $BIN/v-change-sys-theme default
-fi
-
-# Replace dhparam 1024 with dhparam 4096
-echo "(*) Updating dhparam to 4096-bit..."
-mv /etc/ssl/dhparam.pem $HESTIA_BACKUP/conf/
-cp -rf $HESTIA/install/deb/ssl/dhparam.pem /etc/ssl/
-systemctl reload nginx
-
-# Enhance Vsftpd security
-echo "(*) Enhancing Vsftpd security..."
-cp -rf /etc/vsftpd.conf $HESTIA_BACKUP/conf/
-sed -i "s|ssl_tlsv1=YES|ssl_tlsv1=NO|g" /etc/vsftpd.conf
-systemctl restart vsftpd
-
-# Enhance Dovecot security
-echo "(*) Enhancing Dovecot security..."
-mv /etc/dovecot/conf.d/10-ssl.conf $HESTIA_BACKUP/conf/
-cp -rf $HESTIA/install/deb/dovecot/10-ssl.conf /etc/dovecot/conf.d/
-systemctl restart dovecot

+ 1 - 1
src/hst_autocompile.sh

@@ -287,7 +287,7 @@ if [ "$NGINX_B" = true ] ; then
     else
       cp $BUILD_DIR/hestiacp-$branch/src/deb/nginx/nginx.conf "usr/local/hestia/nginx/conf/nginx.conf"
     fi
-
+        
     # copy binary
     cp usr/local/hestia/nginx/sbin/nginx usr/local/hestia/nginx/sbin/hestia-nginx