/[smeserver]/rpms/e-smith-nutUPS/sme9/e-smith-nutUPS-2.4.0.Listen_Local_Network.patch
ViewVC logotype

Contents of /rpms/e-smith-nutUPS/sme9/e-smith-nutUPS-2.4.0.Listen_Local_Network.patch

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


Revision 1.5 - (show annotations) (download)
Tue Feb 3 18:09:37 2015 UTC (9 years, 3 months ago) by stephdl
Branch: MAIN
CVS Tags: e-smith-nutUPS-2_4_0-7_el6_sme, e-smith-nutUPS-2_4_0-8_el6_sme, e-smith-nutUPS-2_4_0-9_el6_sme, e-smith-nutUPS-2_4_0-6_el6_sme, HEAD
Changes since 1.4: +14 -0 lines
* Tue Feb 03 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-6.sme
- Creation Admin Privilege for use of upscmd & upsrw [SME: 8826]
- Remove obsolete directives {allowfrom} [SME: 8793]

1 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/db/configuration/defaults/nut/access e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/db/configuration/defaults/nut/access
2 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/db/configuration/defaults/nut/access 1970-01-01 01:00:00.000000000 +0100
3 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/db/configuration/defaults/nut/access 2015-01-24 10:12:37.561073849 +0100
4 @@ -0,0 +1 @@
5 +localhost
6 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/hosts.allow/upsd e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/hosts.allow/upsd
7 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/hosts.allow/upsd 1970-01-01 01:00:00.000000000 +0100
8 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/hosts.allow/upsd 2015-01-25 23:20:13.356915837 +0100
9 @@ -0,0 +1,3 @@
10 +{
11 + $DB->hosts_allow_spec('nut','nut');
12 +}
13 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/services/30Nut e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/services/30Nut
14 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/services/30Nut 1970-01-01 01:00:00.000000000 +0100
15 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/services/30Nut 2015-01-22 11:15:15.714961712 +0100
16 @@ -0,0 +1,3 @@
17 +#Nut Service
18 +nut 3493/tcp # Network UPS Tools
19 +nut 3493/udp # Network UPS Tools
20 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.conf/10Listen_Local_Network e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.conf/10Listen_Local_Network
21 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.conf/10Listen_Local_Network 1970-01-01 01:00:00.000000000 +0100
22 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.conf/10Listen_Local_Network 2015-01-25 23:19:27.179391036 +0100
23 @@ -0,0 +1,6 @@
24 +{
25 +my $access = $nut{access} || 'localhost';
26 +
27 +$OUT .= "LISTEN 127.0.0.1";
28 +$OUT .= "\nLISTEN $LocalIP" if ($access eq 'private');
29 +}
30 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.conf/20ACL e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.conf/20ACL
31 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.conf/20ACL 2015-01-22 08:59:03.647593780 +0100
32 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.conf/20ACL 1970-01-01 01:00:00.000000000 +0100
33 @@ -1,3 +0,0 @@
34 -ACL all 0.0.0.0/0
35 -ACL localhost 127.0.0.1/32
36 -ACL localnet { "$InternalInterface{Network}/$InternalInterface{Netmask}" }
37 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.conf/40ACCESS e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.conf/40ACCESS
38 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.conf/40ACCESS 2015-01-22 08:59:03.647593780 +0100
39 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.conf/40ACCESS 1970-01-01 01:00:00.000000000 +0100
40 @@ -1,3 +0,0 @@
41 -ACCEPT localhost
42 -ACCEPT localnet
43 -REJECT all
44 diff -Nur e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.users/monitor e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.users/monitor
45 --- e-smith-nutUPS-2.4.0.old8793/root/etc/e-smith/templates/etc/ups/upsd.users/monitor 2015-01-22 08:59:03.645593434 +0100
46 +++ e-smith-nutUPS-2.4.0.bz8793/root/etc/e-smith/templates/etc/ups/upsd.users/monitor 2015-02-03 18:00:48.194594585 +0100
47 @@ -1,10 +1,8 @@
48 [upsmaster]
49 password = { $nut{MasterPass} }
50 - allowfrom = localhost
51 upsmon master
52
53 [upsslave]
54 password = { $nut{SlavePass} }
55 - allowfrom = localhost localnet
56 upsmon slave
57

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed