/[smecontribs]/rpms/smeserver-denyhosts/contribs10/smeserver-denyhosts-2.9-sme10Initial.patch
ViewVC logotype

Contents of /rpms/smeserver-denyhosts/contribs10/smeserver-denyhosts-2.9-sme10Initial.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.3 - (show annotations) (download)
Mon Mar 15 21:26:41 2021 UTC (3 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-denyhosts-2_9-20_el7_sme, smeserver-denyhosts-2_9-17_el7_sme, smeserver-denyhosts-2_9-19_el7_sme, smeserver-denyhosts-2_9-14_el7_sme, smeserver-denyhosts-2_9-18_el7_sme, smeserver-denyhosts-2_9-15_el7_sme, smeserver-denyhosts-2_9-16_el7_sme, HEAD
Changes since 1.2: +3 -1 lines 
* Mon Mar 15 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.9-14.sme
- change pid file reference [SME: 11254]
- increase timeout  for the service file and restart always
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/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 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 +++ smeserver-denyhosts-2.9/root/usr/lib/systemd/system/denyhosts.service.d/49-koozali.conf 2021-03-15 15:59:01.282000000 -0400
45 @@ -0,0 +1,8 @@
46 +[Service]
47 +ExecStartPre=
48 +ExecStartPre=/sbin/e-smith/service-status denyhosts
49 +TimeoutStartSec=300
50 +Restart=always
51 +
52 +[Install]
53 +WantedBy=sme-server-target
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed