| 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 |
jpp |
1.2 |
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 |
| 29 |
|
|
--- smeserver-denyhosts-2.9.old/root/etc/e-smith/templates/etc/denyhosts.conf/LOCK_FILE 2008-04-22 11:07:15.000000000 -0400 |
| 30 |
|
|
+++ smeserver-denyhosts-2.9/root/etc/e-smith/templates/etc/denyhosts.conf/LOCK_FILE 2021-03-15 15:59:38.605000000 -0400 |
| 31 |
|
|
@@ -1 +1 @@ |
| 32 |
|
|
-LOCK_FILE = /var/lock/subsys/denyhosts |
| 33 |
|
|
+LOCK_FILE = /var/run/denyhosts.pid |
| 34 |
jpp |
1.1 |
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 |
| 35 |
|
|
--- smeserver-denyhosts-2.9.old/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd 2008-04-22 13:30:23.000000000 -0400 |
| 36 |
|
|
+++ smeserver-denyhosts-2.9/root/etc/e-smith/templates-custom/etc/hosts.allow/sshd 1969-12-31 19:00:00.000000000 -0500 |
| 37 |
|
|
@@ -1,4 +0,0 @@ |
| 38 |
|
|
-{ |
| 39 |
|
|
- $OUT = $DB->hosts_allow_spec('sshd'); |
| 40 |
|
|
- $OUT .= " EXCEPT /etc/hosts.deny_ssh" if ($denyhosts{'status'} || 'disabled') eq "enabled"; |
| 41 |
|
|
-} |
| 42 |
|
|
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 |
| 43 |
|
|
--- smeserver-denyhosts-2.9.old/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 1969-12-31 19:00:00.000000000 -0500 |
| 44 |
jpp |
1.2 |
+++ smeserver-denyhosts-2.9/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 2021-03-15 15:59:01.282000000 -0400 |
| 45 |
jpp |
1.3 |
@@ -0,0 +1,8 @@ |
| 46 |
jpp |
1.1 |
+[Service] |
| 47 |
|
|
+ExecStartPre= |
| 48 |
|
|
+ExecStartPre=/sbin/e-smith/service-status denyhosts |
| 49 |
jpp |
1.3 |
+TimeoutStartSec=300 |
| 50 |
|
|
+Restart=always |
| 51 |
jpp |
1.1 |
+ |
| 52 |
|
|
+[Install] |
| 53 |
|
|
+WantedBy=sme-server-target |
Parent Directory
| 
Revision Log
| 
Revision Graph
