Skip to content

Commit 210d199

Browse files
author
Kristan Kenney
authored
Merge pull request hestiacp#1776 from jaapmarcus/fix/install-errors
Fix multiple issues with installer and mail domains
2 parents 7e86227 + fb72c06 commit 210d199

File tree

5 files changed

+71
-65
lines changed

5 files changed

+71
-65
lines changed

‎bin/v-delete-mail-domain‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ fi
7575

7676
# Delete webmail configuration if it exists
7777
if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
78-
$BIN/v-delete-mail-domain-webmail $user $domain 'yes'
78+
if [ ! -z "$IMAP_SYSTEM" ]; then
79+
$BIN/v-delete-mail-domain-webmail $user $domain 'yes'
80+
fi
7981
fi
8082

8183
#----------------------------------------------------------#

‎install/hst-install-debian.sh‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,31 @@ rm /tmp/hst.pem
12011201
# Install dhparam.pem
12021202
cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl
12031203

1204+
# Deleting old admin user
1205+
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1206+
chattr -i /home/admin/conf > /dev/null 2>&1
1207+
userdel -f admin > /dev/null 2>&1
1208+
chattr -i /home/admin/conf > /dev/null 2>&1
1209+
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1210+
rm -f /tmp/sess_* > /dev/null 2>&1
1211+
fi
1212+
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1213+
groupdel admin > /dev/null 2>&1
1214+
fi
1215+
1216+
# Enable sftp jail
1217+
echo "[ * ] Enable SFTP jail..."
1218+
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1219+
check_result $? "can't enable sftp jail"
1220+
1221+
# Adding Hestia admin account
1222+
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1223+
check_result $? "can't create admin user"
1224+
$HESTIA/bin/v-change-user-shell admin nologin
1225+
$HESTIA/bin/v-change-user-role admin admin
1226+
$HESTIA/bin/v-change-user-language admin $lang
1227+
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1228+
12041229
#----------------------------------------------------------#
12051230
# Configure Nginx #
12061231
#----------------------------------------------------------#
@@ -1695,34 +1720,9 @@ else
16951720
fi
16961721

16971722
#----------------------------------------------------------#
1698-
# Configure Admin User #
1723+
# Configure IP #
16991724
#----------------------------------------------------------#
17001725

1701-
# Deleting old admin user
1702-
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1703-
chattr -i /home/admin/conf > /dev/null 2>&1
1704-
userdel -f admin > /dev/null 2>&1
1705-
chattr -i /home/admin/conf > /dev/null 2>&1
1706-
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1707-
rm -f /tmp/sess_* > /dev/null 2>&1
1708-
fi
1709-
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1710-
groupdel admin > /dev/null 2>&1
1711-
fi
1712-
1713-
# Enable sftp jail
1714-
echo "[ * ] Enable SFTP jail..."
1715-
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1716-
check_result $? "can't enable sftp jail"
1717-
1718-
# Adding Hestia admin account
1719-
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1720-
check_result $? "can't create admin user"
1721-
$HESTIA/bin/v-change-user-shell admin nologin
1722-
$HESTIA/bin/v-change-user-role admin admin
1723-
$HESTIA/bin/v-change-user-language admin $lang
1724-
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1725-
17261726
# Roundcube permissions fix
17271727
if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
17281728
if [ ! -d "/var/log/roundcube" ]; then

‎install/hst-install-ubuntu.sh‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,32 @@ fi
12351235
# Install dhparam.pem
12361236
cp -f $HESTIA_INSTALL_DIR/ssl/dhparam.pem /etc/ssl
12371237

1238+
# Deleting old admin user
1239+
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1240+
chattr -i /home/admin/conf > /dev/null 2>&1
1241+
userdel -f admin > /dev/null 2>&1
1242+
chattr -i /home/admin/conf > /dev/null 2>&1
1243+
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1244+
rm -f /tmp/sess_* > /dev/null 2>&1
1245+
fi
1246+
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1247+
groupdel admin > /dev/null 2>&1
1248+
fi
1249+
1250+
# Enable sftp jail
1251+
echo "[ * ] Enable SFTP jail..."
1252+
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1253+
check_result $? "can't enable sftp jail"
1254+
1255+
# Adding Hestia admin account
1256+
echo "[ * ] Create admin account..."
1257+
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1258+
check_result $? "can't create admin user"
1259+
$HESTIA/bin/v-change-user-shell admin nologin
1260+
$HESTIA/bin/v-change-user-role admin admin
1261+
$HESTIA/bin/v-change-user-language admin $lang
1262+
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1263+
12381264

12391265
#----------------------------------------------------------#
12401266
# Configure Nginx #
@@ -1716,35 +1742,9 @@ fi
17161742

17171743

17181744
#----------------------------------------------------------#
1719-
# Configure Admin User #
1745+
# Configure IP #
17201746
#----------------------------------------------------------#
17211747

1722-
# Deleting old admin user
1723-
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
1724-
chattr -i /home/admin/conf > /dev/null 2>&1
1725-
userdel -f admin > /dev/null 2>&1
1726-
chattr -i /home/admin/conf > /dev/null 2>&1
1727-
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1728-
rm -f /tmp/sess_* > /dev/null 2>&1
1729-
fi
1730-
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
1731-
groupdel admin > /dev/null 2>&1
1732-
fi
1733-
1734-
# Enable sftp jail
1735-
echo "[ * ] Enable SFTP jail..."
1736-
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1737-
check_result $? "can't enable sftp jail"
1738-
1739-
# Adding Hestia admin account
1740-
echo "[ * ] Create admin account..."
1741-
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
1742-
check_result $? "can't create admin user"
1743-
$HESTIA/bin/v-change-user-shell admin nologin
1744-
$HESTIA/bin/v-change-user-role admin admin
1745-
$HESTIA/bin/v-change-user-language admin $lang
1746-
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
1747-
17481748
# Configuring system IPs
17491749
$HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
17501750

‎web/add/mail/index.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@
9595
}
9696
}
9797

98-
if (empty($_POST['v_webmail'])) {
99-
if (empty($_SESSION['error_msg'])) {
100-
exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
101-
check_return_code($return_var,$output);
102-
unset($output);
98+
if (!empty($_SESSION['IMAP_SYSTEM']) && !empty($_SESSION['WEBMAIL_SYSTEM'])) {
99+
if (empty($_POST['v_webmail'])) {
100+
if (empty($_SESSION['error_msg'])) {
101+
exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
102+
check_return_code($return_var,$output);
103+
unset($output);
104+
}
103105
}
104106
}
105107

‎web/edit/mail/index.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,14 @@
236236
}
237237
}
238238

239-
if (empty($_POST['v_webmail'])) {
240-
if (empty($_SESSION['error_msg'])) {
241-
exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
242-
check_return_code($return_var,$output);
243-
$v_webmail = "";
244-
unset($output);
239+
if (!empty($_SESSION['IMAP_SYSTEM']) && !empty($_SESSION['WEBMAIL_SYSTEM'])) {
240+
if (empty($_POST['v_webmail'])) {
241+
if (empty($_SESSION['error_msg'])) {
242+
exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
243+
check_return_code($return_var,$output);
244+
$v_webmail = "";
245+
unset($output);
246+
}
245247
}
246248
}
247249

0 commit comments

Comments
 (0)