smeserver-denyhosts/contribs10/smeserver-denyhosts-2.9-sme10Initial.patch

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-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 01:02:35.658000000 -0400
@@ -0,0 +1,7 @@
+[Service]
+ExecStartPre=
+ExecStartPre=/bin/rm -f /var/lock/subsys/denyhosts
+ExecStartPre=/sbin/e-smith/service-status denyhosts
+
+[Install]
+WantedBy=sme-server-target
1	jpp	1.1	diff -Nur --no-dereference smeserver-denyhosts-2.9.old/createlinks smeserver-denyhosts-2.9/createlinks
2			--- smeserver-denyhosts-2.9.old/createlinks 2008-04-22 10:51:07.000000000 -0400
3			+++ smeserver-denyhosts-2.9/createlinks 2021-03-15 01:10:42.489000000 -0400
4			@@ -4,14 +4,20 @@
5
6			panel_link("denyhosts", "manager");
7
8			-service_link_enhanced("denyhosts", "S01", "7");
9			-
10			safe_symlink('restart', "root/etc/e-smith/events/conf-denyhosts/services2adjust/denyhosts");
11
12			foreach $file (
13			qw(/var/lib/denyhosts/allowed-hosts /etc/hosts.allow /etc/denyhosts.conf))
14			{
15			- templates2events($file, qw(bootstrap-console-save conf-denyhosts));
16			+ templates2events($file, qw(bootstrap-console-save conf-denyhosts smeserver-denyhosts-update));
17			}
18
19			+my $event= "smeserver-denyhosts-update";
20			+event_link("systemd-reload", $event, "89");
21			+event_link("systemd-default", $event, "88");
22			+safe_symlink('restart', "root/etc/e-smith/events/$event/services2adjust/denyhosts");
23			+event_link("navigation-conf", $event, "80");
24			+
25			+
26			+
27			exit 0;
28			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
29			--- smeserver-denyhosts-2.9.old/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd 2008-04-22 13:30:23.000000000 -0400
30			+++ smeserver-denyhosts-2.9/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd 1969-12-31 19:00:00.000000000 -0500
31			@@ -1,4 +0,0 @@
32			-{
33			- $OUT = $DB->hosts_allow_spec('sshd');
34			- $OUT .= " EXCEPT /etc/hosts.deny_ssh" if ($denyhosts{'status'} \|\| 'disabled') eq "enabled";
35			-}
36			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
37			--- smeserver-denyhosts-2.9.old/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 1969-12-31 19:00:00.000000000 -0500
38			+++ smeserver-denyhosts-2.9/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 2021-03-15 01:02:35.658000000 -0400
39			@@ -0,0 +1,7 @@
40			+[Service]
41			+ExecStartPre=
42			+ExecStartPre=/bin/rm -f /var/lock/subsys/denyhosts
43			+ExecStartPre=/sbin/e-smith/service-status denyhosts
44			+
45			+[Install]
46			+WantedBy=sme-server-target