From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 16 Aug 2019 15:33:47 +0000 (+0100)
Subject: [Rework] Kill 2tld.inc
X-Git-Tag: 2.0~403
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3aa4d38cf467c95b571d6c79ca2dad2e058e098d;p=rspamd.git

[Rework] Kill 2tld.inc
---

diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index 79e87455a..1af0c5fb4 100644
--- a/centos/rspamd.spec
+++ b/centos/rspamd.spec
@@ -217,7 +217,6 @@ fi
 %dir %{rspamd_pluginsdir}
 %dir %{rspamd_wwwdir}
 %dir %{_libdir}/rspamd
-%config(noreplace) %{rspamd_confdir}/2tld.inc
 %config(noreplace) %{rspamd_confdir}/surbl-whitelist.inc
 %config(noreplace) %{rspamd_confdir}/spf_dkim_whitelist.inc
 %config(noreplace) %{rspamd_confdir}/dmarc_whitelist.inc
diff --git a/conf/2tld.inc b/conf/2tld.inc
deleted file mode 100644
index 45a963119..000000000
--- a/conf/2tld.inc
+++ /dev/null
@@ -1,821 +0,0 @@
-0000host.com
-000webhost.com
-007sites.com
-007webpro.com
-00author.com
-00bp.com
-00it.com
-00server.com
-00trek.com
-012webpages.com
-0505mb.com
-0805.ru
-0buckhost.com
-0catch.com
-0fees.net
-0golf.com
-0moola.com
-0pi.com
-10001mb.com
-100free.com
-100freemb.com
-100mb.com
-100webspace.net
-101freehost.com
-10fast.net
-110mb.com
-1111mb.com
-125mb.com
-12gbfree.com
-150m.com
-18.lc
-1asphost.com
-1freewebspace.com
-1gb.ru
-1hwy.com
-1majorhost.com
-1sta.com
-1sweethost.com
-1.vg
-1x.net
-20fr.com
-20ii.com
-20is.com
-20m.com
-20to.com
-21r.ru
-22web.net
-247ihost.com
-24.lc
-250free.com
-275mb.com
-2.ag
-2.je
-2.ly
-2u-2.com
-3000mb.com
-30mb.com
-3d.lc
-3dn.ru
-3eu.ru
-3-hosting.net
-4all.ru
-4.je
-4mg.com
-4sql.net
-4t.com
-501megs.com
-50megs.com
-50webs.com
-55fast.com
-5gbfree.com
-5nxs.com
-5u.com
-6bone.pl
-6.je
-6te.net
-700up.com
-70mb.ru
-741.com
-789mb.com
-7.je
-890m.com
-8.je
-8k.com
-8m.com
-8m.net
-911mb.com
-99inch.com
-9cy.com
-9gb.de
-9.je
-a1free.net
-abkhazia.su
-about.lc
-access.to
-ac.ng
-act.gov.au
-aecru.org
-aeroport.ci
-agava.ru
-aget.ru
-aiq.ru
-alfaspace.net
-all.lc
-al.ru
-altervista.org
-angelcities.com
-angelfire.com
-anschauen.in
-arcadepages.com
-armenia.su
-ar.nf
-ashgabad.su
-asia.gp
-as.no
-at.cr
-at.lv
-atspace.biz
-atspace.com
-atspace.name
-atspace.org
-atspace.us
-at.st
-at.ua
-auto.lc
-aw3.de
-awardspace.biz
-awardspace.com
-azerbaijan.su
-b2b.lc
-b4site.com
-badland.com
-bappy.com
-batcave.net
-bebto.com
-belgorod.su
-beplaced.ru
-berlin.tl
-bilder.lc
-bilder.net
-bip.ru
-bizmail.ru
-biz.ps
-biz.ua
-biz.uz
-blogindo.net
-blog.lc
-blog-nn.ru
-bl.uk
-boom.ru
-bos.ru
-bravehost.com
-brinkster.net
-builtfree.org
-bukhara.su
-bund.in
-byethost10.com
-byethost11.com
-byethost12.com
-byethost13.com
-byethost14.com
-byethost15.com
-byethost16.com
-byethost17.com
-byethost18.com
-byethost24.com
-byethost2.com
-byethost3.com
-byethost4.com
-byethost5.com
-byethost6.com
-byethost7.com
-byethost8.com
-byethost9.com
-byethost.com
-by.ru
-byteact.com
-ca.nf
-cantv.net
-center.tl
-chat.dj
-chat.ru
-cheeb.com
-chimkent.su
-ch.kg
-ch.st
-cileni.com
-city.tl
-ciy.de
-cl4n.org
-clandomain.de
-clandomain.org
-clan.lc
-clan.mn
-clan.su
-clubfx.ru
-club.lc
-cn.nf
-co.cc
-codingclub.ru
-co.gp
-com1.ru
-community.lc
-com.nu
-cool.hn
-cool.lc
-coolpage.biz
-cs-clan.org
-csiro.au
-cwx.ru
-da.cx
-datadiri.com
-dax.ru
-de.cg
-deep-ice.com
-de.gd
-de.gp
-de.ht
-de.im
-de.ki
-dem.ru
-de.pl
-design.tl
-deutschland.nu
-dex1.com
-dezigner.ru
-digitalzones.com
-dnevnik.ru
-dnip.net
-do.am
-domain.lc
-download.ac
-download.sh
-dr.ag
-dreamstation.com
-dtn.ru
-dvd.lc
-e2e.ru
-east-kazakhstan.su
-ecard.ru
-eclub.lv
-email.su
-enacre.net
-english.lc
-envy.nu
-epage.ru
-eqo.de
-esel.in
-es.gp
-eu.cr
-eu.gg
-eu.gp
-eu.ki
-eu.nu
-eur.lc
-euro.lc
-europa.lc
-europtrade.ru
-euro.ru
-ex6.ru
-exnet.su
-faithweb.com
-far.ru
-fatal.ru
-fatfreehost.com
-fbhosting.com
-fbi.ru
-fcpages.com
-ffx.ru
-filme.lc
-firm.nu
-fk.gs
-flf.li
-flirten.info
-flirt.lc
-fora.pl
-forever.kz
-forum24.ru
-forum.lc
-fotos.lc
-fr33webhost.com
-frageon.net
-free.bg
-freebitty.com
-freecities.com
-free.cr
-freehomepage.com
-freehost10.com
-freehostia.com
-freehosting.net
-freehostingz.com
-freehostonline.com
-freehostpage.com
-freehostplace.com
-freehostpro.com
-freehostspace.com
-freehostyou.com
-free.lc
-freepage.ru
-freeservers.com
-free-site-host.com
-freesite.org
-freetzi.com
-freewaywebhost.com
-freeweb7.com
-free-web-hosting.biz
-freewebhostingpro.com
-free-webhosts.com
-freewebpage.org
-freewebpages.org
-freewebspace.com
-freewhost.com
-freezoka.com
-freezona.ru
-fr.gp
-fromru.com
-fromru.su
-front.ru
-fun.gg
-fws1.com
-fxcity.ru
-fx-club.org
-fxf.ru
-game.lc
-gaming.lc
-ganja.ru
-georgia.su
-gigcities.com
-gigsweb.com
-gilde.in
-glooby.net
-gmbh.tw
-gmxhome.de
-gn8.net
-go9.ru
-goa.ru
-gobot.com
-googlegroups.com
-gorodok.net
-go.ru
-gov.gg
-gov.im
-gov.je
-gov.mt
-gq.nu
-gratis.lc
-greatnow.com
-greenline.ru
-gr.kg
-guest.de
-guests.de
-h10.ru
-h11.ru
-h12.ru
-h14.ru
-h15.ru
-h16.ru
-h17.ru
-h18.ru
-h1.ru
-h2m.ru
-h5.ru
-hase.in
-hash.ru
-hexe.in
-hit.bg
-ho11.com
-hocom.by
-hocomua.ru
-hoha.ru
-home.lc
-homepage.cx
-homepage.lc
-homestead.com
-hophost.net
-hop.ru
-hopto.org
-hostaim.com
-hostia.ru
-hostingisus.com
-hostonfly.ru
-host-page.com
-hostq.ru
-hostwq.net
-hotbox.ru
-hoter.ru
-hot.lc
-hotmail.ru
-hotusa.org
-ho.ua
-hp.lc
-htmlplanet.com
-hu2.ru
-hu.kg
-hund.in
-hut1.ru
-hut2.ru
-hut.ru
-hy.cz
-i8.com
-ibnsites.com
-ic.cz
-icr38.net
-id.ru
-iespana.es
-ifastnet.com
-ifolder.ru
-ifrance.com
-iifree.net
-ilovethis.ru
-imess.net
-indiegroup.com
-i-nets.ru
-infobox.ru
-info.nu
-infos.cx
-infos.lc
-infostore.org
-inlocal.ru
-in.nf
-interia.pl
-internet.ly
-int.ps
-intwayblog.net
-intway.info
-io.ua
-iplot.ru
-irc.pl
-isgreat.org
-itgo.com
-it.gp
-itrello.com
-iwarp.com
-iwebsource.com
-izypage.net
-jambyl.su
-jet.uk
-jimdo.com
-jino-net.ru
-jino.ru
-jixx.de
-jixx.net
-job.ec
-joolo.com
-judiciary.uk
-justfree.com
-jvl.com
-k12.nd.us
-k12.sd.us
-k12.wv.us
-k1.cx
-karacol.su
-karaganda.su
-kogaryu.com
-komi.su
-kostenlos.lc
-kr3w.de
-krovatka.net
-krovatka.su
-kustanai.su
-kwikphp.com
-kzet.ru
-l4n.org
-land.ru
-lbgo.com
-lgg.ru
-lib.wv.us
-liebe.lc
-links.lc
-logmail.ru
-lookingat.us
-lpchat.com
-lu.kg
-lycos.es
-lydo.org
-maclenet.com
-mail15.com
-mail2k.ru
-mail333.com
-mail.ht
-mangyshlak.su
-mbone.pl
-md6.ru
-md8.ru
-me.ly
-memebot.com
-metastock.ru
-mindnmagick.com
-mirohost.net
-mitglieder.in
-mobi.ps
-mod.uk
-mokoginta.net
-mosreg.ru
-movillink.com
-moy.su
-mp3.cr
-mp3.gp
-mpeg3.ru
-musik.cx
-musik.lc
-m.vu
-my1.ru
-my-age.net
-mybyte.ru
-myfreewebhost.org
-mylivepage.ru
-myweb.io
-na.by
-nagakute.aichi.jp
-name.ac
-name.vg
-name.vu
-narod2.ru
-narod.ru
-navoi.su
-nazwa.pl
-net23.net
-net84.net
-netfast.org
-netfirms.com
-netfreehost.com
-netsolhost.com
-netz.tl
-newmail.ru
-nextmail.ru
-ngo.pl
-nichost.ru
-nic.im
-nic.uk
-nightmail.ru
-nl.gp
-nl.kg
-nls.uk
-nm.ru
-nofeehost.com
-noneto.com
-north-kazakhstan.su
-notlong.com
-now.lc
-npx.de
-nrg.ru
-nt.gov.au
-nutzworld.net
-nxt.ru
-oceansfree.com
-o-f.com
-okis.ru
-ok.ru
-omp9.com
-on-4.com
-onecoolhost.com
-onepage.ru
-onep.ru
-on.lc
-online.cr
-online.gp
-online.tc
-onlymail.ru
-orc.ru
-orgfree.com
-org.pg.
-ourprofile.us
-ownspace.org
-p0.ru
-page.by
-parliament.uk
-party.lc
-pc.lc
-photos.lc
-php0h.com
-php0h.net
-php1h.com
-phreak.ru
-pips.ru
-pisem.net
-pisem.su
-pixi.ru
-planet.tl
-plazma.ru
-pochtamt.ru
-pochta.org
-pochta.ru
-politik.in
-polubomu.ru
-pop3.ru
-portal.lc
-privat.lc
-pro.ac
-programist.ru
-prohosting.com
-prohosts.org
-pro.ly
-promural.ru
-promzone.ru
-pro.vg
-proxycheker.ru
-psend.com
-pskov.ru
-pt.kg
-pud.ru
-quake.ru
-qu.am
-quotaless.com
-qwerty.in
-qwerty.su
-r2.ru
-rbcmail.ru
-reghosting.com
-republika.pl
-rubas.ru
-ru.gg
-ru.nf
-ruprom.net
-ru.ru
-russian.ru
-rx.ru
-s5.com
-samomu.ru
-sapo.pt
-sbn.bz
-sch.gg
-sch.je
-scriptmania.com
-sdsmt.edu
-search.gp
-seite24.eu
-seite.asia
-seite.com
-seite.cz
-seite.es
-seite.im
-seite.in
-seite.info
-seite.li
-seite.lt
-seite.lv
-seite.name
-seite.pl
-seite.ru
-seite.sc
-seite.st
-seite.vc
-se.nf
-server.gg
-server.tl
-servetown.com
-service.lc
-servik.com
-se-ua.net
-share.lc
-shop.fm
-shopping.cr
-shopping.hn
-siedlce.pl
-sinfree.net
-site40.net
-site50.net
-site88.net
-siteburg.com
-sitecity.ru
-siteedit.ru
-siteedit.su
-sitehome.ru
-sitesfree.com
-sitesled.com
-sk6.ru
-sk6.ru
-sms.cr
-smtp.ru
-space.lc
-sphosting.com
-sport.dj
-sppages.com
-sprinterweb.net
-sp.ru
-sshn.se
-start.lc
-stsland.ru
-students.ru
-student.su
-subs.ru
-supercharts.ru
-swiftphp.com
-szm.com
-t35.com
-takizawa.iwate.jp
-tashkent.su
-te4m.de
-team.cx
-team.tl
-tecbox.com
-tekcities.com
-terapad.com
-termez.su
-test.lc
-teufel.in
-thelan.info
-times.lv
-tipp.cz
-top8.com
-topcities.com
-topfreewebhosting.com
-topf.ru
-top.lc
-top.tc
-tora.ru
-totalh.com
-tripod.com
-tselinograd.su
-tu1.ru
-tu2.ru
-turkish.lc
-tushino.com
-tut.su
-tv.gg
-tvheaven.com
-tw1.ru
-uadom.net
-ucoz.com
-ucoz.de
-ucoz.es
-ucoz.hu
-ucoz.kz
-ucoz.lv
-ucoz.net
-ucoz.org
-ucoz.ru
-ucoz.ua
-ueuo.com
-ufanet.ru
-uk.cr
-uk.nf
-ukrbiz.net
-uk.st
-undonet.com
-urlaub.lc
-urllogs.com
-url-site.com
-ur.ru
-usafreespace.com
-usa.gg
-usenet.pl
-user.lc
-us.gg
-us.ly
-us.nf
-us.st
-valuehost.ru
-vdelo.ru
-vdsite.ru
-vettepics.com
-vhost4free.com
-vio.ru
-vipcentr.ru
-vipshop.ru
-vip.su
-viptop.ru
-virtuale.org
-vi-rus.ru
-voten.in
-vo.uz
-vov.ru
-vze.com
-vz.lc
-w6.ru
-wallst.ru
-wapn.ru
-wbs.cz
-web1000.com
-web44.net
-webasyst.net
-web-box.ru
-web.com
-web.gg
-webhost.ru
-webng.com
-we.bs
-webs.com
-webservis.ru
-welt.tl
-wen.ru
-wiki.lc
-wmsite.ru
-worldbreak.com
-world.mu
-wowex.ru
-wtcsites.com
-wz.cz
-x53.ru
-x5x.ru
-x9.eu
-xaker.ru
-xak.ru
-xam.su
-x.gg
-xl.lc
-xost.ru
-xphost.org
-xx.lc
-xxl.lc
-ya.com
-yadviga.ru
-yakutia.su
-yard.ru
-yeahost.com
-yj.ae
-yoll.net
-you.lc
-yourfreehosting.net
-z16.ru
-z8.ru
-zmail.ru
-zomi.net
-zoomshare.com
-z-photo.ru
-zx9.de
-zxq.net
-zymichost.com
-zzl.org
-zzn.com
diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 15c04d40f..bc7f47791 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -19,11 +19,6 @@ surbl {
     "${DBDIR}/surbl-whitelist.inc.local",
     "fallback+file://${CONFDIR}/surbl-whitelist.inc"
   ];
-  exceptions = [
-    "https://maps.rspamd.com/rspamd/2tld.inc.zst",
-    "${DBDIR}/2tld.inc.local",
-    "fallback+file://${CONFDIR}/2tld.inc"
-  ];
 
   rules {
     "SURBL_MULTI" {