diff -Nur --no-dereference smeserver-denyhosts-2.9.old/createlinks smeserver-denyhosts-2.9/createlinks --- smeserver-denyhosts-2.9.old/createlinks 2008-04-22 10:51:07.000000000 -0400 +++ smeserver-denyhosts-2.9/createlinks 2021-03-15 01:10:42.489000000 -0400 @@ -4,14 +4,20 @@ panel_link("denyhosts", "manager"); -service_link_enhanced("denyhosts", "S01", "7"); - safe_symlink('restart', "root/etc/e-smith/events/conf-denyhosts/services2adjust/denyhosts"); foreach $file ( qw(/var/lib/denyhosts/allowed-hosts /etc/hosts.allow /etc/denyhosts.conf)) { - templates2events($file, qw(bootstrap-console-save conf-denyhosts)); + templates2events($file, qw(bootstrap-console-save conf-denyhosts smeserver-denyhosts-update)); } +my $event= "smeserver-denyhosts-update"; +event_link("systemd-reload", $event, "89"); +event_link("systemd-default", $event, "88"); +safe_symlink('restart', "root/etc/e-smith/events/$event/services2adjust/denyhosts"); +event_link("navigation-conf", $event, "80"); + + + exit 0; diff -Nur --no-dereference smeserver-denyhosts-2.9.old/root/etc/e-smith/templates/etc/denyhosts.conf/LOCK_FILE smeserver-denyhosts-2.9/root/etc/e-smith/templates/etc/denyhosts.conf/LOCK_FILE --- smeserver-denyhosts-2.9.old/root/etc/e-smith/templates/etc/denyhosts.conf/LOCK_FILE 2008-04-22 11:07:15.000000000 -0400 +++ smeserver-denyhosts-2.9/root/etc/e-smith/templates/etc/denyhosts.conf/LOCK_FILE 2021-03-15 15:59:38.605000000 -0400 @@ -1 +1 @@ -LOCK_FILE = /var/lock/subsys/denyhosts +LOCK_FILE = /var/run/denyhosts.pid diff -Nur --no-dereference smeserver-denyhosts-2.9.old/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd smeserver-denyhosts-2.9/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd --- smeserver-denyhosts-2.9.old/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd 2008-04-22 13:30:23.000000000 -0400 +++ smeserver-denyhosts-2.9/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ -{ - $OUT = $DB->hosts_allow_spec('sshd'); - $OUT .= " EXCEPT /etc/hosts.deny_ssh" if ($denyhosts{'status'} || 'disabled') eq "enabled"; -} diff -Nur --no-dereference smeserver-denyhosts-2.9.old/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf smeserver-denyhosts-2.9/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf --- smeserver-denyhosts-2.9.old/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-denyhosts-2.9/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 2021-03-15 15:59:01.282000000 -0400 @@ -0,0 +1,8 @@ +[Service] +ExecStartPre= +ExecStartPre=/sbin/e-smith/service-status denyhosts +TimeoutStartSec=300 +Restart=always + +[Install] +WantedBy=sme-server-target