|
50 | 50 | flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota |
51 | 51 | e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils |
52 | 52 | bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl |
53 | | - unrar-free vim-common acl sysstat" |
| 53 | + unrar-free vim-common acl sysstat rsyslog" |
54 | 54 | fi |
55 | 55 |
|
56 | 56 | # Defining help function |
@@ -1314,12 +1314,12 @@ fi |
1314 | 1314 |
|
1315 | 1315 |
|
1316 | 1316 | #----------------------------------------------------------# |
1317 | | -# Update phpMyAdmin # |
| 1317 | +# Configure phpMyAdmin # |
1318 | 1318 | #----------------------------------------------------------# |
1319 | 1319 |
|
1320 | 1320 | if [ "$mysql" = 'yes' ]; then |
1321 | 1321 | # Display upgrade information |
1322 | | - echo "Upgrade phpMyAdmin to v$pma_v..." |
| 1322 | + echo "Installing phpMyAdmin version v$pma_v..." |
1323 | 1323 |
|
1324 | 1324 | # Download latest phpmyadmin release |
1325 | 1325 | wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz |
@@ -1580,6 +1580,12 @@ if [ "$fail2ban" = 'yes' ]; then |
1580 | 1580 | fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) |
1581 | 1581 | sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local |
1582 | 1582 | fi |
| 1583 | + if [ ! -e /var/log/auth.log ]; then |
| 1584 | + # Debian workaround: auth logging was moved to systemd |
| 1585 | + touch /var/log/auth.log |
| 1586 | + chmod 640 /var/log/auth.log |
| 1587 | + chown root:adm /var/log/auth.log |
| 1588 | + fi |
1583 | 1589 | update-rc.d fail2ban defaults |
1584 | 1590 | service fail2ban start |
1585 | 1591 | check_result $? "fail2ban start failed" |
@@ -1625,16 +1631,16 @@ if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then |
1625 | 1631 | groupdel admin > /dev/null 2>&1 |
1626 | 1632 | fi |
1627 | 1633 |
|
| 1634 | +# Enable sftp jail |
| 1635 | +$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1 |
| 1636 | +check_result $? "can't enable sftp jail" |
| 1637 | + |
1628 | 1638 | # Adding Hestia admin account |
1629 | 1639 | $HESTIA/bin/v-add-user admin $vpass $email default System Administrator |
1630 | 1640 | check_result $? "can't create admin user" |
1631 | 1641 | $HESTIA/bin/v-change-user-shell admin nologin |
1632 | 1642 | $HESTIA/bin/v-change-user-language admin $lang |
1633 | 1643 |
|
1634 | | -# Enable sftp jail |
1635 | | -$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1 |
1636 | | -check_result $? "can't enable sftp jail" |
1637 | | - |
1638 | 1644 | # Roundcube permissions fix |
1639 | 1645 | if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then |
1640 | 1646 | if [ ! -d "/var/log/roundcube" ]; then |
|
1646 | 1652 | # Configuring system IPs |
1647 | 1653 | $HESTIA/bin/v-update-sys-ip > /dev/null 2>&1 |
1648 | 1654 |
|
1649 | | -# Get main ip |
| 1655 | +# Get main IP |
1650 | 1656 | ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) |
1651 | 1657 | local_ip=$ip |
1652 | 1658 |
|
|
0 commit comments