Skip to content

Commit 7896a77

Browse files
author
Kristan Kenney
committed
Improvements to upgrade scripts
- Reduce number of service restarts - Set DNS resolvers during upgrade for hestia-nginx (internal web server). - Clean up section from hst_autocompile.sh
1 parent c5fa227 commit 7896a77

File tree

3 files changed

+44
-11
lines changed

3 files changed

+44
-11
lines changed

install/upgrade/restart.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ for v in `ls /etc/php/`; do
3333
$BIN/v-restart-service php$v-fpm $restart
3434
fi
3535
done
36+
if [ ! -z $FTP_SYSTEM ]; then
37+
$BIN/v-restart-ftp $restart
38+
fi
3639

3740
# Restart SSH daemon and Hestia Control Panel service
3841
$BIN/v-restart-service ssh $restart

install/upgrade/versions/1.0.5.sh

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/sh
2+
3+
# Hestia Control Panel upgrade script for target version 1.0.5
4+
5+
#######################################################################################
6+
####### Place additional commands below. #######
7+
#######################################################################################
8+
9+
# Set default theme
10+
if [ -z $THEME ]; then
11+
echo "(*) Enabling support for themes..."
12+
$BIN/v-change-sys-theme default
13+
fi
14+
15+
# Replace dhparam 1024 with dhparam 4096
16+
echo "(*) Installing 4096-bit SSL security certificate..."
17+
mv /etc/ssl/dhparam.pem $HESTIA_BACKUP/conf/
18+
cp -rf $HESTIA/install/deb/ssl/dhparam.pem /etc/ssl/
19+
chmod 600 /etc/ssl/dhparams.pem
20+
21+
# Enhance Vsftpd security
22+
echo "(*) Modifying Vsftpd SSL configuration..."
23+
cp -rf /etc/vsftpd.conf $HESTIA_BACKUP/conf/
24+
sed -i "s|ssl_tlsv1=YES|ssl_tlsv1=NO|g" /etc/vsftpd.conf
25+
26+
# Enhance Dovecot security
27+
echo "(*) Modifying Dovecot SSL configuration..."
28+
mv /etc/dovecot/conf.d/10-ssl.conf $HESTIA_BACKUP/conf/
29+
cp -rf $HESTIA/install/deb/dovecot/10-ssl.conf /etc/dovecot/conf.d/
30+
31+
# Update DNS resolvers in hestia-nginx's configuration
32+
echo "(*) Updating DNS resolvers for Hestia Internal Web Server..."
33+
dns_resolver=$(cat /etc/resolv.conf | grep -i '^nameserver' | cut -d ' ' -f2 | tr '\r\n' ' ' | xargs)
34+
for ip in $dns_resolver; do
35+
if [[ $ip =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
36+
resolver="$ip $resolver"
37+
fi
38+
done
39+
if [ ! -z "$resolver" ]; then
40+
sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
41+
fi

src/hst_autocompile.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -287,17 +287,6 @@ if [ "$NGINX_B" = true ] ; then
287287
else
288288
cp $BUILD_DIR/hestiacp-$branch/src/deb/nginx/nginx.conf "usr/local/hestia/nginx/conf/nginx.conf"
289289
fi
290-
291-
# Update dns servers in nginx.conf
292-
dns_resolver=$(cat /etc/resolv.conf | grep -i '^nameserver' | cut -d ' ' -f2 | tr '\r\n' ' ' | xargs)
293-
for ip in $dns_resolver; do
294-
if [[ $ip =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
295-
resolver="$ip $resolver"
296-
fi
297-
done
298-
if [ ! -z "$resolver" ]; then
299-
sed -i "s/1.0.0.1 1.1.1.1/$resolver/g" /usr/local/hestia/nginx/conf/nginx.conf
300-
fi
301290

302291
# copy binary
303292
cp usr/local/hestia/nginx/sbin/nginx usr/local/hestia/nginx/sbin/hestia-nginx

0 commit comments

Comments
 (0)