- rel 2; use ini from package (which is better maintained than our own list)

diff --git a/check_rbl.ini b/check_rbl.ini
deleted file mode 100644 (file)
index 79187f8..0000000
--- a/check_rbl.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[rbl]
-server=dnsbl.ahbl.org
-server=cbl.abuseat.org
-server=dnsbl.cyberlogic.net
-server=bl.deadbeef.com
-server=spamtrap.drbl.drand.net
-server=spamsources.fabel.dk
-server=0spam.fusionzero.com
-server=mail-abuse.blacklist.jippg.org
-server=korea.services.net
-server=spamguard.leadmon.net
-server=ix.dnsbl.manitu.net
-server=relays.nether.net
-server=dnsbl.njabl.org
-server=bhnc.njabl.org
-server=no-more-funn.moensted.dk
-server=rbl.orbitrbl.com
-server=psbl.surriel.com
-server=dyna.spamrats.com
-server=noptr.spamrats.com
-server=spam.spamrats.com
-; this keeps all zones of sorbs excl. spam
-server=dnsbl.sorbs.net
-server=spam.dnsbl.sorbs.net
-server=bl.spamcannibal.org
-server=bl.spamcop.net
-server=pbl.spamhaus.org
-server=sbl.spamhaus.org
-server=xbl.spamhaus.org
-server=ubl.unsubscore.com
-server=dnsbl-1.uceprotect.net
-server=dnsbl-2.uceprotect.net
-server=dnsbl-3.uceprotect.net
-server=db.wpbl.info
-server=access.redhawk.org
-server=blacklist.sci.kun.nl
-server=bl.technovision.dk
-server=dnsbl.kempt.net
-server=dnsbl.solid.net
-server=dul.ru
-server=forbidden.icm.edu.pl
-server=hil.habeas.com
-server=rbl.schulte.org
-server=sbl-xbl.spamhaus.org
-
-; these are rather slow
-;server=bl.csma.biz
-;server=sbl.csma.biz

diff --git a/nagios-plugin-check_rbl.spec b/nagios-plugin-check_rbl.spec
index 1645b57c488635458ebc63c8d1f170bfd0d6df69..f2dbc1dcfd7ba39865604cd294c530781acd1cb4 100644 (file)
--- a/nagios-plugin-check_rbl.spec
+++ b/nagios-plugin-check_rbl.spec
@@ -6,13 +6,12 @@
 Summary:       Nagios plugin to check if an server is blacklisted in RBL servers
 Name:          nagios-plugin-%{plugin}
 Version:       1.5.7
-Release:       1
+Release:       2
 License:       GPL v3
 Group:         Networking
 Source0:       https://github.com/matteocorti/check_rbl/releases/download/v%{version}/%{plugin}-%{version}.tar.gz
 # Source0-md5: 601b72ef3c63e5343a4eef84ed174590
 Source1:       %{plugin}.cfg
-Source2:       %{plugin}.ini
 URL:           https://github.com/matteocorti/check_rbl/wiki
 BuildRequires: perl-ExtUtils-MakeMaker >= 6.42
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -52,7 +51,8 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.ini
+
+install check_rbl.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.ini
 
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/check_rbl/.packlist