diff --git a/app/modules/ssh_connection.py b/app/modules/ssh_connection.py index 30de0198..197680be 100644 --- a/app/modules/ssh_connection.py +++ b/app/modules/ssh_connection.py @@ -5,7 +5,6 @@ from paramiko import SSHClient class SshConnection: def __init__(self, server_ip, ssh_port, ssh_user_name, ssh_user_password, ssh_enable, ssh_key_name=None): self.ssh = SSHClient() - self.ssh.load_system_host_keys() self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.server_ip = server_ip self.ssh_port = ssh_port @@ -17,7 +16,7 @@ class SshConnection: def __enter__(self): try: if self.ssh_enable == 1: - k = paramiko.pkey.load_private_key_file(self.ssh_key_name) + k = paramiko.RSAKey.from_private_key_file(self.ssh_key_name) self.ssh.connect( hostname=self.server_ip, port=self.ssh_port, diff --git a/config_other/fail2ban/jail.d/roxy-wi.conf b/config_other/fail2ban/jail.d/roxy-wi.conf index cd80c58c..dec342b2 100644 --- a/config_other/fail2ban/jail.d/roxy-wi.conf +++ b/config_other/fail2ban/jail.d/roxy-wi.conf @@ -3,7 +3,7 @@ enabled = true filter = roxy-wi port = http,https action = iptables[name=roxy-wi, port=https, protocol=tcp] -logpath = /var/www/haproxy-wi/log/roxy-wi-*.log +logpath = /var/log/roxy-wi/roxy-wi-*.log findtime = 600 bantime = 600 maxretry = 2 diff --git a/config_other/requirements_deb.txt b/config_other/requirements_deb.txt index 12c0a856..aff1ff97 100644 --- a/config_other/requirements_deb.txt +++ b/config_other/requirements_deb.txt @@ -1,5 +1,4 @@ configparser>=3.5.0 -paramiko-ng>=2.5.0 pytz>=2017.3 pyTelegramBotAPI>=3.6.3 slack-sdk>=3.4.0 diff --git a/config_other/requirements_el8.txt b/config_other/requirements_el8.txt index 433760d2..5a7efa1e 100644 --- a/config_other/requirements_el8.txt +++ b/config_other/requirements_el8.txt @@ -2,7 +2,6 @@ configparser==3.5.0 pyTelegramBotAPI==3.6.3 networkx==2.1 matplotlib==2.1.2 -paramiko-ng>=2.5.0 slack-sdk>=3.4.0 peewee>=3.14.10 PyMySQL>=1.0.2 diff --git a/config_other/requirements_el9.txt b/config_other/requirements_el9.txt index 9d879de6..f3fe7801 100644 --- a/config_other/requirements_el9.txt +++ b/config_other/requirements_el9.txt @@ -2,7 +2,6 @@ configparser>=3.5.0 pyTelegramBotAPI>=3.6.3 networkx>=2.1 matplotlib>=2.1.2 -paramiko-ng>=2.5.0 slack-sdk>=3.4.0 peewee>=3.14.10 PyMySQL>=1.0.2