YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Also propagate ssh port on fail2ban config

Browse source
This commit is contained in:
Alexandre Aubin 2021-04-15 12:22:21 +02:00
parent fc818cc6a7
commit 37c0825eed
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/hooks/conf_regen/52-fail2ban
View file

@ -2,6 +2,8 @@
set -e set -e
. /usr/share/yunohost/helpers
do_pre_regen() { do_pre_regen() {
pending_dir=$1 pending_dir=$1
@ -13,7 +15,9 @@ do_pre_regen() {
cp yunohost.conf "${fail2ban_dir}/filter.d/yunohost.conf" cp yunohost.conf "${fail2ban_dir}/filter.d/yunohost.conf"
cp jail.conf "${fail2ban_dir}/jail.conf" cp jail.conf "${fail2ban_dir}/jail.conf"
cp yunohost-jails.conf "${fail2ban_dir}/jail.d/"
export ssh_port="$(yunohost settings get 'security.ssh.port')"
ynh_render_template "yunohost-jails.conf" "${fail2ban_dir}/jail.d/yunohost-jails.conf"
} }
do_post_regen() { do_post_regen() {

1
data/templates/fail2ban/yunohost-jails.conf
View file

@ -1,4 +1,5 @@
[sshd] [sshd]
port = {{ssh_port}}
enabled = true enabled = true
[nginx-http-auth] [nginx-http-auth]

7
src/yunohost/settings.py
View file

@ -387,13 +387,18 @@ def reconfigure_nginx(setting_name, old_value, new_value):
regen_conf(names=["nginx"]) regen_conf(names=["nginx"])
@post_change_hook("security.ssh.port")
@post_change_hook("security.ssh.compatibility") @post_change_hook("security.ssh.compatibility")
def reconfigure_ssh(setting_name, old_value, new_value): def reconfigure_ssh(setting_name, old_value, new_value):
if old_value != new_value: if old_value != new_value:
regen_conf(names=["ssh"]) regen_conf(names=["ssh"])
@post_change_hook("security.ssh.port")
def reconfigure_ssh_and_fail2ban(setting_name, old_value, new_value):
if old_value != new_value:
regen_conf(names=["ssh", "fail2ban"])
@post_change_hook("smtp.allow_ipv6") @post_change_hook("smtp.allow_ipv6")
@post_change_hook("smtp.relay.host") @post_change_hook("smtp.relay.host")
@post_change_hook("smtp.relay.port") @post_change_hook("smtp.relay.port")