Skip to content

Commit b543ea2

Browse files
author
Kristan Kenney
committed
Merge remote-tracking branch 'origin/minorfixes' into main
2 parents 36c3dfd + 78ef550 commit b543ea2

File tree

3 files changed

+60
-39
lines changed

3 files changed

+60
-39
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [ "$release" -eq 9 ]; then
3939
php$fpm_v-json php$fpm_v-mbstring php$fpm_v-opcache php$fpm_v-pspell
4040
php$fpm_v-readline php$fpm_v-xml vsftpd proftpd-basic bind9 exim4
4141
exim4-daemon-heavy clamav-daemon spamassassin dovecot-imapd
42-
dovecot-pop3d net-tools
42+
dovecot-pop3d net-tools
4343
mariadb-client mariadb-common mariadb-server postgresql
4444
postgresql-contrib phppgadmin mc flex whois rssh git idn zip
4545
sudo bc ftp lsof rrdtool quota e2fslibs bsdutils e2fsprogs curl
@@ -372,7 +372,7 @@ if [ -d /etc/netplan ] && [ -z "$force" ]; then
372372
echo
373373
echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
374374
echo
375-
check_result 1 "Unable to detect netplan configuration."
375+
check_result 1 "Unable to detect netplan configuration."
376376
fi
377377
fi
378378

@@ -424,7 +424,7 @@ install_welcome_message() {
424424
echo "========================================================================"
425425
echo
426426
echo "Thank you for downloading Hestia Control Panel! In a few moments,"
427-
echo "we will begin installing the following components on your server:"
427+
echo "we will begin installing the following components on your server:"
428428
echo
429429
}
430430

@@ -1097,15 +1097,15 @@ echo "THEME='dark'" >> $HESTIA/conf/hestia.conf
10971097
# Inactive session timeout
10981098
echo "INACTIVE_SESSION_TIMEOUT='60'" >> $HESTIA/conf/hestia.conf
10991099

1100-
# Allow users to always create domains even the are not the owner of the main domain
1100+
# Do not allow users to create subdomains when they don't own the domain
11011101
echo "ENFORCE_SUBDOMAIN_OWNERSHIP='yes'" >> $HESTIA/conf/hestia.conf
11021102

11031103
# Version & Release Branch
11041104
echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
11051105
echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
11061106

11071107
# Email notifications after upgrade
1108-
echo "UPGRADE_SEND_EMAIL='true'" >> $HESTIA/conf/hestia.conf
1108+
echo "UPGRADE_SEND_EMAIL='false'" >> $HESTIA/conf/hestia.conf
11091109
echo "UPGRADE_SEND_EMAIL_LOG='true'" >> $HESTIA/conf/hestia.conf
11101110

11111111
# Installing hosting packages
@@ -1199,13 +1199,13 @@ if [ "$apache" = 'yes' ]; then
11991199

12001200
mkdir -p /etc/apache2/conf.d
12011201
mkdir -p /etc/apache2/conf.d/domains
1202-
1202+
12031203
# Copy configuration files
12041204
cp -f $HESTIA_INSTALL_DIR/apache2/apache2.conf /etc/apache2/
12051205
cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-available/hestia-status.conf
12061206
cp -f /etc/apache2/mods-available/status.load /etc/apache2/mods-available/hestia-status.load
12071207
cp -f $HESTIA_INSTALL_DIR/logrotate/apache2 /etc/logrotate.d/
1208-
1208+
12091209
# Enable needed modules
12101210
a2enmod rewrite > /dev/null 2>&1
12111211
a2enmod suexec > /dev/null 2>&1
@@ -1323,7 +1323,7 @@ if [ "$proftpd" = 'yes' ]; then
13231323
echo "127.0.0.1 $servername" >> /etc/hosts
13241324
cp -f $HESTIA_INSTALL_DIR/proftpd/proftpd.conf /etc/proftpd/
13251325
cp -f $HESTIA_INSTALL_DIR/proftpd/tls.conf /etc/proftpd/
1326-
1326+
13271327
update-rc.d proftpd defaults > /dev/null 2>&1
13281328
systemctl start proftpd >> $LOG
13291329
check_result $? "proftpd start failed"
@@ -1343,10 +1343,10 @@ if [ "$mysql" = 'yes' ]; then
13431343
if [ $memory -gt 3900000 ]; then
13441344
mycnf="my-large.cnf"
13451345
fi
1346-
1346+
13471347
# Remove symbolic link
13481348
rm -f /etc/mysql/my.cnf
1349-
1349+
13501350
# Configuring MariaDB
13511351
cp -f $HESTIA_INSTALL_DIR/mysql/$mycnf /etc/mysql/my.cnf
13521352
mysql_install_db >> $LOG
@@ -1383,34 +1383,34 @@ if [ "$mysql" = 'yes' ]; then
13831383

13841384
# Unpack files
13851385
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
1386-
1386+
13871387
# Create folders
13881388
mkdir -p /usr/share/phpmyadmin
13891389
mkdir -p /etc/phpmyadmin
1390-
mkdir -p /etc/phpmyadmin/conf.d/
1390+
mkdir -p /etc/phpmyadmin/conf.d/
13911391
mkdir /usr/share/phpmyadmin/tmp
1392-
1392+
13931393
# Configuring Apache2 for PHPMYADMIN
13941394
if [ "$apache" = 'yes' ]; then
13951395
cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/phpmyadmin/
13961396
ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
13971397
fi
1398-
1398+
13991399
# Overwrite old files
14001400
cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
1401-
1401+
14021402
# Create copy of config file
14031403
cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
14041404
mkdir -p /var/lib/phpmyadmin/tmp
14051405
chmod 777 /var/lib/phpmyadmin/tmp
1406-
1406+
14071407
# Set config and log directory
14081408
sed -i "s|define('CONFIG_DIR', ROOT_PATH);|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
14091409
sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
14101410

14111411
# Create temporary folder and change permission
14121412
chmod 777 /usr/share/phpmyadmin/tmp
1413-
1413+
14141414
# Generate blow fish
14151415
blowfish=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)
14161416
sed -i "s|%blowfish_secret%|$blowfish|" /etc/phpmyadmin/config.inc.php
@@ -1644,11 +1644,12 @@ fi
16441644
# Configure API #
16451645
#----------------------------------------------------------#
16461646

1647-
echo "API='yes'" >> $HESTIA/conf/hestia.conf
1648-
if [ "$api" != "yes" ]; then
1647+
if [ "$api" = "yes" ]; then
1648+
echo "API='yes'" >> $HESTIA/conf/hestia.conf
1649+
echo "API_ALLOWED_IP='127.0.0.1'" >> $HESTIA/conf/hestia.conf
1650+
else
16491651
$HESTIA/bin/v-change-sys-api disable
16501652
fi
1651-
echo "API_ALLOWED_IP='127.0.0.1'" >> $HESTIA/conf/hestia.conf
16521653

16531654
#----------------------------------------------------------#
16541655
# Configure Admin User #
@@ -1815,7 +1816,7 @@ echo -e "\n"
18151816
# Sending notification to admin email
18161817
echo -e "Congratulations!
18171818
1818-
You have successfully installed Hestia Control Panel on your server.
1819+
You have successfully installed Hestia Control Panel on your server.
18191820
18201821
Ready to get started? Log in using the following credentials:
18211822

‎install/hst-install-ubuntu.sh‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ echo
562562
if [ "$nginx" = 'yes' ]; then
563563
echo "[ * ] NGINX"
564564
echo "deb [arch=amd64] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
565-
apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1
565+
apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1
566566
fi
567567

568568
# Installing sury PHP repo
@@ -1130,15 +1130,15 @@ echo "THEME='dark'" >> $HESTIA/conf/hestia.conf
11301130
# Inactive session timeout
11311131
echo "INACTIVE_SESSION_TIMEOUT='60'" >> $HESTIA/conf/hestia.conf
11321132

1133-
# Allow users to always create domains even the are not the owner of the main domain
1133+
# Do not allow users to create subdomains when they don't own the domain
11341134
echo "ENFORCE_SUBDOMAIN_OWNERSHIP='yes'" >> $HESTIA/conf/hestia.conf
11351135

11361136
# Version & Release Branch
11371137
echo "VERSION='${HESTIA_INSTALL_VER}'" >> $HESTIA/conf/hestia.conf
11381138
echo "RELEASE_BRANCH='release'" >> $HESTIA/conf/hestia.conf
11391139

11401140
# Email notifications after upgrade
1141-
echo "UPGRADE_SEND_EMAIL='true'" >> $HESTIA/conf/hestia.conf
1141+
echo "UPGRADE_SEND_EMAIL='false'" >> $HESTIA/conf/hestia.conf
11421142
echo "UPGRADE_SEND_EMAIL_LOG='true'" >> $HESTIA/conf/hestia.conf
11431143

11441144
# Installing hosting packages
@@ -1411,51 +1411,51 @@ fi
14111411
if [ "$mysql" = 'yes' ]; then
14121412
# Display upgrade information
14131413
echo "[ * ] Installing phpMyAdmin version v$pma_v..."
1414-
1414+
14151415
# Download latest phpmyadmin release
14161416
wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
1417-
1417+
14181418
# Unpack files
14191419
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
1420-
1420+
14211421
# Create folders
14221422
mkdir -p /usr/share/phpmyadmin
14231423
mkdir -p /etc/phpmyadmin
1424-
mkdir -p /etc/phpmyadmin/conf.d/
1424+
mkdir -p /etc/phpmyadmin/conf.d/
14251425
mkdir /usr/share/phpmyadmin/tmp
1426-
1426+
14271427
# Configuring Apache2 for PHPMYADMIN
14281428
if [ "$apache" = 'yes' ]; then
14291429
cp -f $HESTIA_INSTALL_DIR/pma/apache.conf /etc/phpmyadmin/
14301430
ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
14311431
fi
1432-
1432+
14331433
# Overwrite old files
14341434
cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
1435-
1435+
14361436
# Create copy of config file
14371437
cp -f $HESTIA_INSTALL_DIR/phpmyadmin/config.inc.php /etc/phpmyadmin/
14381438
mkdir -p /var/lib/phpmyadmin/tmp
14391439
chmod 777 /var/lib/phpmyadmin/tmp
1440-
1440+
14411441
# Set config and log directory
14421442
sed -i "s|define('CONFIG_DIR', ROOT_PATH);|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
14431443
sed -i "s|define('TEMP_DIR', ROOT_PATH . 'tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
1444-
1444+
14451445
# Create temporary folder and change permission
14461446
chmod 777 /usr/share/phpmyadmin/tmp
14471447

14481448
# Generate blow fish
14491449
blowfish=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)
14501450
sed -i "s|%blowfish_secret%|$blowfish|" /etc/phpmyadmin/config.inc.php
1451-
1451+
14521452
# Clean Up
14531453
rm -fr phpMyAdmin-$pma_v-all-languages
14541454
rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
1455-
1455+
14561456
echo "DB_PMA_ALIAS='phpmyadmin'" >> $HESTIA/conf/hestia.conf
14571457
$HESTIA/bin/v-change-sys-db-alias 'pma' "phpmyadmin"
1458-
1458+
14591459
# Special thanks to Pavel Galkin (https://skurudo.ru)
14601460
# https://github.com/skurudo/phpmyadmin-fixer
14611461
source $HESTIA_INSTALL_DIR/phpmyadmin/pma.sh > /dev/null 2>&1
@@ -1669,11 +1669,13 @@ fi
16691669
# Configure API #
16701670
#----------------------------------------------------------#
16711671

1672-
echo "API='yes'" >> $HESTIA/conf/hestia.conf
1673-
if [ "$api" != "yes" ]; then
1672+
if [ "$api" = "yes" ]; then
1673+
echo "API='yes'" >> $HESTIA/conf/hestia.conf
1674+
echo "API_ALLOWED_IP='127.0.0.1'" >> $HESTIA/conf/hestia.conf
1675+
else
16741676
$HESTIA/bin/v-change-sys-api disable
16751677
fi
1676-
echo "API_ALLOWED_IP='127.0.0.1'" >> $HESTIA/conf/hestia.conf
1678+
16771679

16781680
#----------------------------------------------------------#
16791681
# Configure Admin User #

‎install/upgrade/versions/1.4.0.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,21 @@ if [ -f /etc/apt/sources.list.d/postgresql.list ]; then
105105
echo "[ * ] Updating PostgreSQL repository..."
106106
sed -i 's|deb https://apt.postgresql.org/pub/repos/apt/|deb [arch=amd64] https://apt.postgresql.org/pub/repos/apt/|g' /etc/apt/sources.list.d/postgresql.list
107107
fi
108+
109+
# New configuration value for enforcing subdomain ownership
110+
check=$(cat $HESTIA/conf/hestia.conf | grep 'ENFORCE_SUBDOMAIN_OWNERSHIP');
111+
if [ -z "$check" ]; then
112+
echo "[ * ] Setting ENFORCE_SUBDOMAIN_OWNERSHIP to no"
113+
echo "ENFORCE_SUBDOMAIN_OWNERSHIP='no'" >> $HESTIA/conf/hestia.conf
114+
fi
115+
116+
# New API feature to set allowed IPs
117+
if [ "$api" = "yes" ]; then
118+
check=$(cat $HESTIA/conf/hestia.conf | grep 'API_ALLOWED_IP');
119+
if [ -z "$check" ]; then
120+
echo "[ * ] Setting API_ALLOWED_IP to allow-all"
121+
echo "API_ALLOWED_IP='allow-all'" >> $HESTIA/conf/hestia.conf
122+
fi
123+
else
124+
$HESTIA/bin/v-change-sys-api disable
125+
fi

0 commit comments

Comments
 (0)