Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:baudehlo/Haraka

Conflicts:
	tests/rfc1869.js
  • Loading branch information...
commit 312268b049daf42e19e12c9be7083972bb89b1e6 2 parents 80b2976 + ff38515
@baudehlo authored
Showing with 4,153 additions and 642 deletions.
  1. +3 −4 README.md
  2. +25 −3 TODO
  3. +9 −0 UPGRADE
  4. +10 −0 bin/haraka
  5. +18 −5 config.js
  6. +2 −0  config/auth_vpopmaild.ini
  7. +5 −0 config/bounce.ini
  8. +20 −0 config/connect.geoip.ini
  9. +8 −0 config/connect.p0f.ini
  10. +30 −0 config/data.headers.ini
  11. +7 −0 config/delay_deny.ini
  12. +70 −0 config/dkim/dkim_key_gen.sh
  13. +70 −3 config/extra-tlds
  14. +12 −0 config/graph.ini
  15. +98 −0 config/karma.ini
  16. +1 −0  config/mail_from.is_resolvable.ini
  17. +0 −1  config/mail_from.is_resolvable.timeout
  18. +1 −1  config/plugins
  19. +8 −0 config/rcpt_to.qmail_deliverable.ini
  20. +38 −0 config/spamassassin.ini
  21. +125 −2 config/three-level-tlds
  22. +144 −13 config/top-level-tlds
  23. +703 −2 config/two-level-tlds
  24. +44 −12 configfile.js
  25. +65 −4 connection.js
  26. +19 −2 docs/Config.md
  27. +8 −8 docs/Connection.md
  28. +23 −13 docs/CoreConfig.md
  29. +2 −2 docs/Header.md
  30. +46 −0 docs/Logging_API.md
  31. +1 −1  docs/Net_Utils.md
  32. +9 −5 docs/Outbound.md
  33. +16 −16 docs/Plugins.md
  34. +13 −13 docs/Transaction.md
  35. +1 −1  docs/plugins/aliases.md
  36. +1 −1  docs/plugins/auth/auth_ldap.md
  37. +1 −1  docs/plugins/auth/auth_proxy.md
  38. +18 −0 docs/plugins/auth/auth_vpopmaild.js
  39. +5 −5 docs/plugins/auth/flat_file.md
  40. +2 −2 docs/plugins/avg.md
  41. +1 −1  docs/plugins/block_me.md
  42. +23 −0 docs/plugins/bounces.md
  43. +5 −5 docs/plugins/clamd.md
  44. +69 −0 docs/plugins/connect.geoip.md
  45. +48 −0 docs/plugins/connect.p0f.md
  46. +11 −11 docs/plugins/connect.rdns_access.md
  47. +3 −3 docs/plugins/daemonize.md
  48. +24 −0 docs/plugins/data.headers.md
  49. +2 −0  docs/plugins/data.nomsgid.md
  50. +2 −0  docs/plugins/data.noreceived.md
  51. +3 −1 docs/plugins/data.rfc5322_header_checks.md
  52. +4 −4 docs/plugins/data.uribl.md
  53. +16 −0 docs/plugins/delay_deny.md
  54. +61 −38 docs/plugins/dkim_sign.md
  55. +4 −4 docs/plugins/dnsbl.md
  56. +5 −5 docs/plugins/dnswl.md
  57. +3 −3 docs/plugins/early_talker.md
  58. +14 −4 docs/plugins/graph.md
  59. +7 −7 docs/plugins/helo.checks.md
  60. +111 −0 docs/plugins/karma.md
  61. +1 −1  docs/plugins/log.syslog.md
  62. +13 −13 docs/plugins/lookup_rdns.strict.md
  63. +11 −11 docs/plugins/mail_from.access.md
  64. +4 −4 docs/plugins/mail_from.blocklist.md
  65. +3 −3 docs/plugins/mail_from.is_resolvable.md
  66. +1 −1  docs/plugins/mail_from.nobounces.md
  67. +3 −3 docs/plugins/max_unrecognized_commands.md
  68. +6 −6 docs/plugins/messagesniffer.md
  69. +1 −1  docs/plugins/process_title.md
  70. +1 −1  docs/plugins/queue/quarantine.md
  71. +5 −5 docs/plugins/queue/smtp_forward.md
  72. +5 −5 docs/plugins/queue/smtp_proxy.md
  73. +9 −9 docs/plugins/rate_limit.md
  74. +13 −13 docs/plugins/rcpt_to.access.md
  75. +4 −4 docs/plugins/rcpt_to.blocklist.md
  76. +3 −3 docs/plugins/rcpt_to.in_host_list.md
  77. +2 −2 docs/plugins/rcpt_to.max_count.md
  78. +14 −0 docs/plugins/rcpt_to.qmail_deliverable.md
  79. +4 −4 docs/plugins/rdns.regexp.md
  80. +3 −3 docs/plugins/relay_acl.md
  81. +1 −1  docs/plugins/relay_all.md
  82. +4 −4 docs/plugins/relay_force_routing.md
  83. +2 −2 docs/plugins/reseed_rng.md
  84. +56 −19 docs/plugins/spamassassin.md
  85. +8 −8 docs/plugins/spf.md
  86. +1 −1  docs/plugins/toobusy.md
  87. +2 −2 docs/tutorials/Migrating_from_v1_to_v2.md
  88. +2 −2 docs/tutorials/SettingUpOutbound.md
  89. +2 −0  messagestream.js
  90. +34 −16 outbound.js
  91. +1 −1  package.json
  92. +1 −1  plugins.js
  93. +3 −0  plugins/auth/auth_base.js
  94. +70 −0 plugins/auth/auth_vpopmaild.js
  95. +2 −0  plugins/auth/flat_file.js
  96. +75 −0 plugins/bounce.js
  97. +147 −0 plugins/connect.geoip.js
  98. +243 −0 plugins/connect.p0f.js
  99. +118 −0 plugins/data.headers.js
  100. +5 −1 plugins/data.nomsgid.js
  101. +5 −1 plugins/data.noreceived.js
  102. +6 −2 plugins/data.rfc5322_header_checks.js
  103. +152 −0 plugins/delay_deny.js
  104. +116 −44 plugins/dkim_sign.js
  105. +37 −50 plugins/graph.js
  106. +409 −0 plugins/karma.js
  107. +25 −28 plugins/lookup_rdns.strict.js
  108. +1 −1  plugins/mail_from.is_resolvable.js
  109. +7 −0 plugins/mail_from.nobounces.js
  110. +5 −18 plugins/queue/smtp_forward.js
  111. +10 −0 plugins/queue/smtp_proxy.js
  112. +3 −0  plugins/rcpt_to.max_count.js
  113. +107 −0 plugins/rcpt_to.qmail_deliverable.js
  114. +3 −0  plugins/rdns.regexp.js
  115. +4 −1 plugins/relay_acl.js
  116. +7 −12 plugins/relay_force_routing.js
  117. +225 −123 plugins/spamassassin.js
  118. +5 −0 plugins/spf.js
  119. +5 −3 rfc1869.js
  120. +25 −2 smtp_client.js
  121. +9 −1 tests/rfc1869.js
  122. +7 −0 utils.js
View
7 README.md
@@ -49,7 +49,7 @@ code in Haraka, or maybe someone has already written this plugin.
Plugins are already provided for running mail through SpamAssassin, checking
for known bad HELO patterns, checking DNS Blocklists, and watching for
-violators of the SMTP protocol via the "early_talker" plugin.
+violators of the SMTP protocol via the "early\_talker" plugin.
Furthermore Haraka comes with a simple plugin called "graph" which shows you
real-time charts of which plugins rejected the most mail, allowing you to
@@ -90,9 +90,8 @@ And it will run.
However the big thing you want to do next is to edit the `config/plugins`
file. This determines what plugins run in Haraka, and controls the overall
behaviour of the server. By default the server is setup to receive mails for
-domains in `host_list` and deliver them via `qmail-queue`. Queueing to
-qmail is likely not what you need unless you have qmail installed, so this is
-likely the first thing you want to change.
+domains in `host_list` and deliver them via `smtp-forward`. Configure the
+destination in `config/smtp_forward.ini`.
Each plugin has documentation available via `haraka -h plugins/<name>`.
Look there for information about how each plugin is configured, edit your
View
28 TODO
@@ -1,19 +1,41 @@
-- Rate Limiting for outbound mail (there's a branch for this but it's incomplete)
- Milter support
- Ability to modify the body of email (e.g add a banner)
- Create a config file for each of the core shipping configs, so people have something as a baseline
- IMAP server (long shot for now)
- Plugins to copy from Qpsmtpd:
- - bogus_bounce (checks bounces have one recipient and no return-path)
- dspam
- greylisting
- - karma?
- virus/*
Outbound improvements
+ - Rate Limiting (there's a branch for this but it's incomplete)
- Provide better command line tools for manipulating/inspecting the queue
- Add the ability to force a run on a specific queue file or destination domain
- Make retry times configurable (handle RFC requirements for 5 days and DSN queued warnings)
- Limit concurrency by domain
- Disable deliveries for a domain
- Pool connections by domain/MX
+
+Plugin behavior changes
+ - in SpamAssassin plugin, change default behavior of 'legacy' status header.
+ Presently, when undefined, legacy is used. Legacy support should be changed to
+ only when requested, with a sunset date.
+
+Remove the following deprecated plugins
+ - rdns.regexp
+ - data.nomsgid
+ - data.noreceived
+ - data.rfc5322_header_checks
+ - daemonize
+ - mail_from.nobounces
+
+Rename the following plugins
+ - toobusy -> connect.toobusy
+ - attachment -> data.attachment
+ - avg -> data.avg
+ - clamd -> data.clamd
+ - spamassassin -> data.spamassassin
+ - spf -> mail_from.spf
+
+Move the following plugins:
+ - test_queue -> queue/test_queue
View
9 UPGRADE
@@ -0,0 +1,9 @@
+
+2013.12.27
+
+new plugin: data.headers
+
+ deprecates data.rfc5322_header_checks.js
+ deprecates data.noreceived.js
+ deprecates data.nomsgid.js
+
View
10 bin/haraka
@@ -344,6 +344,16 @@ else if (parsed.qempty) {
}
else if (parsed.configs) {
var haraka_path = path.join(base, 'haraka.js');
+
+ var base_dir = process.argv[3];
+ var err_msg = "Did you install a Haraka config? (haraka -i " + base_dir +")";
+ if ( !fs.existsSync(base_dir) )
+ fail( "No such directory: " + base_dir + "\n" + err_msg );
+
+ var smtp_ini = path.join(base_dir,'config','smtp.ini');
+ if ( !fs.existsSync( smtp_ini ) )
+ fail( "No smtp.ini at: " + smtp_ini + "\n" + err_msg );
+
process.argv[1] = haraka_path;
process.env.HARAKA = parsed.configs;
require(haraka_path);
View
23 config.js
@@ -7,14 +7,27 @@ var config = exports;
var config_path = process.env.HARAKA ? path.join(process.env.HARAKA, 'config') : path.join(__dirname, './config');
-config.get = function(name, type, cb) {
- if (type === 'nolog') {
- type = arguments[2]; // deprecated - TODO: remove later
+/* Ways this can be called:
+config.get('thing');
+config.get('thing', type);
+config.get('thing', cb);
+config.get('thing', type, cb);
+config.get('thing', type, options);
+config.get('thing', type, cb, options);
+*/
+config.get = function(name, type, cb, options) {
+ if (typeof type == 'function') {
+ options = cb;
+ cb = type;
+ type = 'value';
+ }
+ if (typeof cb != 'function') {
+ options = cb;
+ cb = null;
}
-
type = type || 'value';
var full_path = path.resolve(config_path, name);
- var results = configloader.read_config(full_path, type, cb);
+ var results = configloader.read_config(full_path, type, cb, options);
// Pass arrays by value to prevent config being modified accidentally.
if (Array.isArray(results)) {
View
2  config/auth_vpopmaild.ini
@@ -0,0 +1,2 @@
+host=127.0.0.6
+port=89
View
5 config/bounce.ini
@@ -0,0 +1,5 @@
+; reject all bounce messages (generally not a good idea)
+reject_all=0
+
+; reject bounces that are not RFC compliant (likely faked)
+reject_invalid=1
View
20 config/connect.geoip.ini
@@ -0,0 +1,20 @@
+; public_ip: the public IP address of *this* mail server
+; if your mail server is not bound to a public IP, you'll have to provide
+; this for distance calculations to work.
+; public_ip=
+
+; show_city: show city data in logs and headers
+; note: city data is less accurate than country
+show_city=1
+
+; show_region: show regional data (US states, CA provinces, etc..)
+show_region=1
+
+; enable distance calculations. If you don't use the distance, leave it
+; disabled to save few CPU cycles.
+calc_distance=0
+
+; if calculating distance, an additional 'too_far' key in the geoip
+; connection note can be set to true if the distance exceeds the limit (in
+; kilometers). A suggested use for that data is the karma plugin.
+;too_far=4000
View
8 config/connect.p0f.ini
@@ -0,0 +1,8 @@
+
+; where the p0f socket is found
+; default: socket_path=/tmp/.p0f_socket
+socket_path=/tmp/.p0f_socket
+
+; add_header, add a message header with a p0f summary
+; default: X-Haraka-p0f
+add_header=X-Haraka-p0f
View
30 config/data.headers.ini
@@ -0,0 +1,30 @@
+; configuration for data.headers plugin
+
+; Requiring a date header will cause the loss of valid mail. The JavaMail
+; sender used by some banks, photo processing services, health insurance
+; companies, bounce senders, and others send messages without a Date header.
+;
+; If you can afford to reject some valid mail, please do enforce this, and
+; encourage mailers toward RFC adherence. Otherwise, do not require Date.
+
+; Headers that MUST be present (RFC 5322)
+; required=From,Date ; <-- RFC 5322 compliant
+required=From,Date
+
+; Received
+; If you have no outbound, add 'Received' to the required list for an
+; aggressive anti-spam measure. It works because all real mail relays will
+; add a `Received` header. It may false positive on some bulk mail that
+; uses a custom tool to send, but this appears to be fairly rare.
+
+; If the date header is present, and future and/or past days are
+; defined, it will be validated. 0 = disabled
+date_future_days=2
+date_past_days=15
+
+
+; Headers that MUST be unique if present (RFC 5322)
+; singular=Date,From,Sender,Reply-To,To,Cc,Bcc,Message-Id,In-Reply-To,References,Subject (RFC 5322)
+singular=Date,From,Sender,Reply-To,To,Cc,Bcc,Message-Id,In-Reply-To,References,Subject
+
+
View
7 config/delay_deny.ini
@@ -0,0 +1,7 @@
+
+; excluded plugins: a list of denials that are to be excluded (ie, all the immediate rejection)
+; Examples: <plugin>
+; <plugin>:<hook>
+; <plugin>:<hook>:<function name>
+;
+;excluded_plugins=spf,lookup_rdns_strict
View
70 config/dkim/dkim_key_gen.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+usage() {
+ echo " usage: $0 <example.com> [haraka username]"
+ echo " "
+ exit
+}
+
+if [ -z $1 ];
+then
+ usage
+fi
+
+DOMAIN=$1
+SMTPD=$2
+if [ -z $SMTPD ];
+then
+ SMTPD="www"
+fi
+
+# create a directory for each DKIM signing domain
+mkdir -p $DOMAIN
+cd $DOMAIN
+
+# The selector can be any value that is a valid DNS label
+# create in the common format: mmmYYYY (apr2014)
+date '+%h%Y' | tr "[:upper:]" "[:lower:]" > selector
+
+# generate private and public keys
+# key length considerations
+# The minimum recommended key length for short duration keys (ones that
+# will be replaced within a few months) is 1024. If you are unlikely to
+# rotate your keys frequently, choose 2048, at the expense of more CPU.
+openssl genrsa -out private 2048
+chmod 400 private
+openssl rsa -in private -out public -pubout
+
+# make it really easy to publish the public key in DNS
+# by creating a file named 'dns', with instructions
+cat > dns <<EO_DKIM_DNS
+
+Add this TXT record to the $DOMAIN DNS zone.
+
+`cat selector | tr -d "\n"`._domainkey TXT "v=DKIM1;p=`grep -v -e '^-' public | tr -d "\n"`"
+
+Tell the world that the ONLY mail servers that send mail from this domain are DKIM signed and/or bear our MX and A records.
+
+With SPF:
+
+ SPF "v=spf1 mx a -all"
+ TXT "v=spf1 mx a -all"
+
+With DMARC:
+
+_dmarc TXT "v=DMARC1; p=reject; adkim=s; aspf=r; rua=mailto:dmarc-feedback@$DOMAIN; ruf=mailto:dmarc-feedback@$DOMAIN; pct=100"
+
+With DomainKeys (deprecated)
+
+_domainkey TXT "o=-; t=y; r=postmaster@$DOMAIN"
+
+For more information about DKIM and SPF policy, the documentation within each plugin contains a longer discussion and links to more detailed information:
+
+ haraka -h dkim_sign
+ haraka -h spf
+
+
+EO_DKIM_DNS
+
+cd ..
+#chown -R $SMTPD:$SMTPD $DOMAIN
View
73 config/extra-tlds
@@ -1,4 +1,3 @@
-# update from http://rss.uribl.com/hosters/hosters.txt
110mb.com
150m.com
163.to
@@ -8,6 +7,7 @@
9k.com
addr.com
altervista.org
+amazonaws.com
angelfire.com
appspot.com
asso.ws
@@ -20,12 +20,45 @@ bay.livefilestore.com
be.tc
bg.tc
biz.tm
+biz.ua
blog.com
blog.de
blog.friendster.com
blog.ru
blog4ever.com
+blogger.ca
+blogger.cf
+blogger.ch
+blogger.co.id
+blogger.co.il
+blogger.com.au
+blogger.com.co
+blogger.com.my
+blogger.com.pe
+blogger.com.ph
+blogger.cv
+blogger.jp
+blogger.pl
+blogger.re
+blogger.se
+blogspot.ca
+blogspot.co.nz
+blogspot.co.uk
blogspot.com
+blogspot.com.ar
+blogspot.com.au
+blogspot.com.br
+blogspot.com.es
+blogspot.cv
+blogspot.de
+blogspot.fr
+blogspot.in
+blogspot.it
+blogspot.jp
+blogspot.mx
+blogspot.pt
+blogspot.re
+blogspot.se
blu.livefilestore.com
br.tc
bravehost.com
@@ -40,8 +73,8 @@ ch.pn
chat.ru
chez.com
cjb.net
-clickbank.net
cloud.prohosting.com
+cloudfront.net
cn.pn
co.at.lv
co.at.pn
@@ -51,6 +84,7 @@ co.cc
co.kg
co.uk.pn
com.au.pn
+com.de
com.sapo.pt
com.vc
corp.st
@@ -60,6 +94,7 @@ de.lv
de.pn
de.tc
dk.tc
+dns2go.com
do.sapo.pt
docs.google.com
dyndns-at-home.com
@@ -77,9 +112,12 @@ dyndns-web.com
dyndns-wiki.com
dyndns-work.com
dyndns.biz
+dyndns.dk
dyndns.info
dyndns.org
dyndns.tv
+dyndns.ws
+emltrk.com
en.alibaba.com
es.pn
es.tc
@@ -93,6 +131,7 @@ fr.tc
free.fr
freehostia.com
freeservercity.com
+fromru.su
front.ru
funpic.de
fx.to
@@ -103,6 +142,7 @@ gigazu.net
gmxhome.de
go.com
go.ro
+gob.ar
gob.ve
googlegroups.com
googlepages.com
@@ -119,6 +159,7 @@ home.ro
home.sapo.pt
homeip.net
homepage.t-online.de
+hop.clickbank.net
host.sk
hostevo.com
hotbox.ru
@@ -132,6 +173,7 @@ id.ru
idoo.com
iespana.es
ifrance.com
+in.net
int.tc
interia.pl
interii.pl
@@ -143,23 +185,30 @@ iwebsource.com
jimdo.com
jino-net.ru
jp.pn
+jpn.com
kickme.to
kimsufi.com
kr.tc
+krovatka.su
kwik.to
land.ru
+leadpages.net
livejournal.com
mail.ru
mail15.su
mail2k.ru
mail333.su
mine.nu
+mobile.web.tr
mooo.com
multiply.com
mx.tc
+mydyndns.org
+mygbiz.com
myvnc.com
na.by
narod.ru
+nazwa.pl
neostrada.pl
net.tc
net.vc
@@ -170,6 +219,13 @@ nextmail.ru
nightmail.ru
ning.com
nm.ru
+no-ip.biz
+no-ip.ca
+no-ip.co.uk
+no-ip.com
+no-ip.info
+no-ip.net
+no-ip.org
no.sapo.pt
no.tc
notlong.com
@@ -185,6 +241,7 @@ perso.tc
ph.tc
pisem.su
pl.tc
+pochta.com
pochta.ru
pochtamt.ru
pop3.ru
@@ -193,19 +250,23 @@ pro.tc
proboards.com
profile.live.com
prserv.net
+qip.ru
qld.edu.au
rbcmail.ru
+re.it
redirectme.net
republika.pl
rm.ru
ru.tc
-s3.amazonaws.com
sakura.ne.jp
sapo.pt
se.tc
selfip.com
selfip.net
+sendgrid.org
servebbs.com
+servebeer.com
+serveblog.net
serveftp.com
shop.co
shutterfly.com
@@ -226,6 +287,8 @@ th.tc
to.it
tripod.com
tumblr.com
+ucoz.com
+ucoz.net
ucoz.ru
uk.pn
uk.to
@@ -236,6 +299,7 @@ url.st
us.pn
us.tc
us.to
+user.icpnet.pl
vv.cc
we.bs
web-soft.ru
@@ -246,11 +310,14 @@ webcindario.com
webs.com
weebly.com
whsites.net
+wix.com
wordpress.com
wz.cz
x.fc2.com
xanga.com
xf.cz
xorg.pl
+yolasite.com
z8.ru
+zapto.org
zmail.ru
View
12 config/graph.ini
@@ -0,0 +1,12 @@
+; the filename the SQLite database is stored in
+; can be a file name or :memory:
+;db_file=:memory:
+db_file=graphlog.db
+
+; The port to listen on for http. Default: `8080`.
+http_addr=127.0.0.1
+http_port=8080
+
+; Regular expression to match plugins to ignore for logging.
+; Default: `queue|graph|relay`
+ignore_re=`queue|graph|relay`
View
98 config/karma.ini
@@ -0,0 +1,98 @@
+;
+; good: get a karma score greater than the positive connection limit
+; bad: achieve a karma score lower than the negative connection limit
+;
+; how many days to penalize bad senders
+penalty_days = 1
+
+; each IPs karma history is expired after this many days
+; Note: this value is refreshed upon each connection. Frequent
+; senders karma may never expire.
+expire_days = 60
+
+
+; Redis is our super-lightweight key/value store
+[redis]
+server_ip = 127.0.0.1
+server_port = 6379
+
+
+; concurrency limits. Limit how many concurrent connections an IP can make.
+; Caution: Using this *and* the rate_limit plugin may produce unexpected
+; results. Use one or the other.
+; Comment out this block of settings to disable
+[concurrency]
+bad=1
+neutral=2
+good=10
+
+; delay excess connections this many seconds before disconnecting
+disconnect_delay=10
+
+; maximum number of recipients allowed
+[recipients]
+bad=1
+neutral=5
+good=20
+
+
+[thresholds]
+; Be conservative to avoid false positives!
+; the threshold below which a connection is considered bad
+negative=-3
+; score at which a connection is considered good
+positive=2
+
+; karma history = good - bad connections. To achieve a negative score,
+; senders must send more bad than good messages. Is it worth getting
+; 5 spam and 2 ham? Adjust this knob accordingly.
+history_negative=-3
+
+
+[spammy_tlds]
+; award negative karma to spammy TLDs
+; caution, awarding karma > msg_negative_limit may blacklist that TLD
+info=-4
+biz=-3
+pw=-4
+;tw=-3
+;cl=-2
+;br=-2
+;fr=-2
+;be=-2
+;jp=-2
+;no=-2
+;se=-2
+;sg=-2
+
+; karma can award points based on other plugins results.
+; the key is a note to inspect and the value is a karma award
+;
+; Connection and transaction notes are checked by default. Use a transaction
+; prefix to only check the transaction note.
+;
+; karma awards can be positive or negative.
+;
+; Any true value in the specified note will match. If that's not sufficient,
+; a pattern can be specified with an @ postfix. The note value will be
+; matched case insensitively.
+[awards]
+relaying=1
+notes.auth_user=2
+notes.fcrdns.fcrdns.length=1
+notes.rdns_access@white=1
+
+notes.fcrdns.no_rdns=-2
+notes.fcrdns.ip_in_rdns=-1
+notes.spamassassin.flag@Yes=-2
+notes.bounce@invalid=-3
+
+; SPF results: 3=Fail, 4=SoftFail, 6=Temperror, 7=Permerror
+notes.spf_helo@3=-2
+notes.spf_helo@4=-1
+notes.spf_helo@6=-1
+notes.spf_helo@7=-1
+notes.spf_mail_result@3=-2
+notes.spf_mail_result@4=-1
+notes.spf_mail_result@6=-1
+notes.spf_mail_result@7=-1
View
1  config/mail_from.is_resolvable.ini
@@ -1,3 +1,4 @@
timeout=30
allow_mx_ip=0
reject_no_mx=1
+re_bogus_ip=/^(?:0\.0\.0\.0|255\.255\.255\.255|127\.)/
View
1  config/mail_from.is_resolvable.timeout
@@ -1 +0,0 @@
-0
View
2  config/plugins
@@ -7,7 +7,7 @@
dnsbl
# Check mail headers are valid
-data.rfc5322_header_checks
+data.headers
# block mail from some known bad HELOs - see config/helo.checks.ini for configuration
helo.checks
View
8 config/rcpt_to.qmail_deliverable.ini
@@ -0,0 +1,8 @@
+; the IP address of the host running qmail_deliverable
+; default: host=127.0.0.1
+host=127.0.0.1
+
+; the TCP port qmail_deliverabled is listening on, default 8998
+port=8998
+
+
View
38 config/spamassassin.ini
@@ -0,0 +1,38 @@
+; How does Haraka connect to the SpamAssassin spamd daemon?
+; TCP/IP: 127.0.0.1:783
+; socket: /var/run/spamd/spamd.sock
+spamd_socket=127.0.0.1:783
+
+; the username we tell spamd the message is to (default: default)
+;spamd_user=first-recipient (see docs)
+;spamd_user=
+
+; messages larger than this are not scored by SA
+max_size=500000
+
+; Munge the subject of messages with a score higher than..
+; munge_subject_threshold=5
+subject_prefix=*** SPAM ***
+
+; what to do with incoming messages with X-Spam-* headers
+; options are: rename, drop, keep
+old_headers_action=rename
+
+; use the SpamAssassin 3.0+ syntax in X-Spam-Status header
+; modern: No, score=0.8 required=8.0 tests=...
+; legacy: No, hits=0.8 required=8.0 tests=...
+modern_status_syntax=1
+
+; Reject all messages with more than this many hits
+; reject_threshold=10
+
+; when a connection has relay privileges, the rejection limit
+; relay_reject_threshold=7
+
+; How long should we wait for SpamAssassin to answer the socket
+; in seconds (default: 30)
+;connect_timeout=
+
+; How long should we wait for a result from SpamAssassin
+; in seconds (default: 300)
+;results_timeout=
View
127 config/three-level-tlds
@@ -1,11 +1,30 @@
-# updates from http://george.surbl.org/three-level-tlds
act.edu.au
act.gov.au
+am.gov.br
bay.livefilestore.com
+best.lt.ua
+best.volyn.ua
blog.friendster.com
+blog33.fc2.com
+blogger.co.id
+blogger.co.il
+blogger.com.au
+blogger.com.co
+blogger.com.my
+blogger.com.pe
+blogger.com.ph
+blogspot.co.il
+blogspot.co.nz
+blogspot.co.uk
+blogspot.com.ar
+blogspot.com.au
+blogspot.com.br
+blogspot.com.es
+blogspot.com.tr
blu.livefilestore.com
bo.nordland.no
bo.telemark.no
+ceeonline.co.in
city.chiba.jp
city.fukuoka.jp
city.hiroshima.jp
@@ -28,13 +47,19 @@ co.at.pn
co.at.tc
co.uk.pn
co.uk.tc
+co.uk.tt
com.au.ms
com.au.pn
com.au.tc
+com.ne.kr
com.sapo.pt
do.sapo.pt
docs.google.com
+dothome.co.kr
+elitesingles.co.uk
en.alibaba.com
+ge.co.it
+go.gov.br
groups.live.com
gs.aa.no
gs.ah.no
@@ -59,14 +84,75 @@ gs.va.no
gs.vf.no
heroy.more-og-romsdal.no
heroy.nordland.no
+home.dyndns.org
home.sapo.pt
homepage.t-online.de
-lkd.co.im
+hop.clickbank.net
+hpu.edu.cn
+ig.com.br
+k12.ak.us
+k12.al.us
+k12.ar.us
+k12.as.us
+k12.az.us
+k12.ca.us
+k12.co.us
+k12.ct.us
+k12.dc.us
+k12.de.us
+k12.fl.us
+k12.ga.us
+k12.gu.us
+k12.ia.us
+k12.id.us
+k12.il.us
+k12.in.us
+k12.ks.us
+k12.ky.us
+k12.la.us
+k12.ma.us
+k12.md.us
+k12.me.us
+k12.mi.us
+k12.mn.us
+k12.mo.us
+k12.ms.us
+k12.mt.us
+k12.nc.us
+k12.nd.us
+k12.ne.us
+k12.nh.us
+k12.nj.us
+k12.nm.us
+k12.nv.us
+k12.ny.us
+k12.oh.us
+k12.ok.us
+k12.or.us
+k12.pa.us
+k12.pr.us
+k12.ri.us
+k12.sc.us
+k12.tn.us
+k12.tx.us
+k12.ut.us
+k12.va.us
+k12.vi.us
+k12.vt.us
+k12.wa.us
+k12.wi.us
+k12.wv.us
+k12.wy.us
+lima-city.de
ltd.co.im
me.uk.tc
metro.tokyo.jp
+mg.gov.br
+mobile.web.tr
nes.akershus.no
nes.buskerud.no
+net.work.za
+no-ip.co.uk
no.sapo.pt
nsw.edu.au
nsw.gov.au
@@ -78,6 +164,7 @@ os.hedmark.no
os.hordaland.no
pa.gov.pl
paginas.sapo.pt
+perso.neuf.fr
perso.sfr.fr
plc.co.im
po.gov.pl
@@ -131,22 +218,49 @@ privat.t-online.de
profile.live.com
qld.edu.au
qld.gov.au
+qzone.qq.com
+rj.gov.br
+rr.gov.br
+s3-ap-northeast-1.amazonaws.com
+s3-ap-southeast-1.amazonaws.com
+s3-ap-southeast-2.amazonaws.com
+s3-eu-west-1.amazonaws.com
+s3-fips-us-gov-west-1.amazonaws.com
+s3-sa-east-1.amazonaws.com
+s3-us-gov-west-1.amazonaws.com
+s3-us-west-1.amazonaws.com
+s3-us-west-2.amazonaws.com
+s3-website-ap-northeast-1.amazonaws.com
+s3-website-ap-southeast-1.amazonaws.com
+s3-website-ap-southeast-2.amazonaws.com
+s3-website-eu-west-1.amazonaws.com
+s3-website-sa-east-1.amazonaws.com
+s3-website-us-east-1.amazonaws.com
+s3-website-us-gov-west-1.amazonaws.com
+s3-website-us-west-1.amazonaws.com
+s3-website-us-west-2.amazonaws.com
+s3.amazonaws.com
sa.edu.au
sa.gov.au
sakura.ne.jp
sande.more-og-romsdal.no
sande.vestfold.no
+shop.conn.tw
skydrive.live.com
so.gov.pl
+sp.gov.br
spaces.live.com
spaces.msn.com
sr.gov.pl
starostwo.gov.pl
tas.edu.au
tas.gov.au
+uel.ac.uk
ug.gov.pl
um.gov.pl
upow.gov.pl
+us3.list-manage2.com
+user.icpnet.pl
uw.gov.pl
valer.hedmark.no
valer.ostfold.no
@@ -157,3 +271,12 @@ wa.gov.au
web.aplus.net
web.fc2.com
web.officelive.com
+wimbp.lodz.pl
+win.iu.nl
+wozaonline.co.za
+xn--b-5ga.nordland.no
+xn--b-5ga.telemark.no
+xn--hery-ira.nordland.no
+xn--hery-ira.xn--mre-og-romsdal-qqb.no
+xn--vler-qoa.hedmark.no
+xn--vler-qoa.xn--stfold-9xa.no
View
157 config/top-level-tlds
@@ -1,11 +1,12 @@
-# http://data.iana.org/TLD/tlds-alpha-by-domain.txt
-# Version 2011092901, Last Updated Fri Sep 30 14:07:01 2011 UTC
+# Version 2014020601, Last Updated Fri Feb 7 07:07:01 2014 UTC
AC
+ACADEMY
AD
AE
AERO
AF
AG
+AGENCY
AI
AL
AM
@@ -22,67 +23,114 @@ AW
AX
AZ
BA
+BARGAINS
BB
BD
BE
+BERLIN
BF
BG
BH
BI
+BIKE
BIZ
BJ
+BLUE
BM
BN
BO
+BOUTIQUE
BR
BS
BT
+BUILD
+BUILDERS
+BUZZ
BV
BW
BY
BZ
CA
+CAB
+CAMERA
+CAMP
+CAREERS
CAT
+CATERING
CC
CD
+CENTER
+CEO
CF
CG
CH
+CHEAP
CI
CK
CL
+CLEANING
+CLOTHING
+CLUB
CM
CN
CO
+CODES
+COFFEE
COM
+COMMUNITY
+COMPANY
+COMPUTER
+CONSTRUCTION
+CONTRACTORS
+COOL
COOP
CR
+CRUISES
CU
CV
+CW
CX
CY
CZ
+DANCE
+DATING
DE
+DEMOCRAT
+DIAMONDS
+DIRECTORY
DJ
DK
DM
DO
+DOMAINS
DZ
EC
EDU
+EDUCATION
EE
EG
+EMAIL
+ENTERPRISES
+EQUIPMENT
ER
ES
+ESTATE
ET
EU
+EVENTS
+EXPERT
+EXPOSED
+FARM
FI
FJ
FK
+FLIGHTS
+FLORIST
FM
FO
FR
GA
+GALLERY
GB
GD
GE
@@ -90,21 +138,29 @@ GF
GG
GH
GI
+GIFT
GL
+GLASS
GM
GN
GOV
GP
GQ
GR
+GRAPHICS
GS
GT
GU
+GUITARS
+GURU
GW
GY
HK
HM
HN
+HOLDINGS
+HOLIDAY
+HOUSE
HR
HT
HU
@@ -112,9 +168,12 @@ ID
IE
IL
IM
+IMMOBILIEN
IN
INFO
+INSTITUTE
INT
+INTERNATIONAL
IO
IQ
IR
@@ -125,10 +184,14 @@ JM
JO
JOBS
JP
+KAUFEN
KE
KG
KH
KI
+KIM
+KITCHEN
+KIWI
KM
KN
KP
@@ -137,20 +200,28 @@ KW
KY
KZ
LA
+LAND
LB
LC
LI
+LIGHTING
+LIMO
+LINK
LK
LR
LS
LT
LU
+LUXURY
LV
LY
MA
+MANAGEMENT
+MARKETING
MC
MD
ME
+MENU
MG
MH
MIL
@@ -160,6 +231,8 @@ MM
MN
MO
MOBI
+MODA
+MONASH
MP
MQ
MR
@@ -173,6 +246,7 @@ MX
MY
MZ
NA
+NAGOYA
NAME
NC
NE
@@ -180,6 +254,7 @@ NET
NF
NG
NI
+NINJA
NL
NO
NP
@@ -187,62 +262,97 @@ NR
NU
NZ
OM
+ONL
ORG
PA
+PARTNERS
PE
PF
PG
PH
+PHOTO
+PHOTOGRAPHY
+PHOTOS
+PICS
+PINK
PK
PL
+PLUMBING
PM
PN
+POST
PR
PRO
+PROPERTIES
PS
PT
PW
PY
QA
RE
+RECIPES
+RED
+RENTALS
+REPAIR
+REPORT
+RICH
RO
RS
RU
+RUHR
RW
SA
SB
SC
SD
SE
+SEXY
SG
SH
+SHIKSHA
+SHOES
SI
+SINGLES
SJ
SK
SL
SM
SN
SO
+SOCIAL
+SOLAR
+SOLUTIONS
SR
ST
SU
+SUPPORT
SV
+SX
SY
+SYSTEMS
SZ
+TATTOO
TC
TD
+TECHNOLOGY
TEL
TF
TG
TH
+TIENDA
+TIPS
TJ
TK
TL
TM
TN
TO
+TODAY
+TOKYO
+TOOLS
TP
TR
+TRAINING
TRAVEL
TT
TV
@@ -251,62 +361,83 @@ TZ
UA
UG
UK
+UNO
US
UY
UZ
VA
VC
VE
+VENTURES
VG
VI
+VIAJES
VN
+VOTING
+VOYAGE
VU
+WANG
+WATCH
+WED
WF
+WIEN
+WORKS
WS
-XN--0ZWM56D
-XN--11B5BS3A9AJ6G
+XN--3BST00M
+XN--3DS443G
XN--3E0B707E
XN--45BRJ9C
-XN--80AKHBYKNJ4F
+XN--55QW42G
+XN--55QX5D
+XN--6FRZ82G
+XN--6QQ986B3XL
+XN--80AO21A
+XN--80ASEHDB
+XN--80ASWG
XN--90A3AC
-XN--9T4B11YI5A
XN--CLCHC0EA0B2G2A9GCD
-XN--DEBA0AD
+XN--FIQ228C5HS
+XN--FIQ64B
XN--FIQS8S
XN--FIQZ9S
XN--FPCRJ9C3D
XN--FZC2C9E2C
-XN--G6W251D
XN--GECRJ9C
XN--H2BRJ9C
-XN--HGBK6AJ7F53BBA
-XN--HLCJ6AYA9ESC7A
+XN--IO0A7I
+XN--J1AMH
XN--J6W193G
-XN--JXALPDLP
-XN--KGBECHTV
XN--KPRW13D
XN--KPRY57D
+XN--L1ACC
XN--LGBBAT1AD8J
+XN--MGB9AWBF
+XN--MGBA3A4F16A
XN--MGBAAM7A8H
XN--MGBAYH7GPA
XN--MGBBH1A71E
XN--MGBC0A9AZCG
XN--MGBERP4A5D4AR
+XN--MGBX4CD0AB
+XN--NGBC5AZD
XN--O3CW4H
XN--OGBPF8FL
XN--P1AI
XN--PGBS0DH
+XN--Q9JYB4C
XN--S9BRJ9C
+XN--UNUP4Y
XN--WGBH1C
XN--WGBL6A
XN--XKC2AL3HYE2A
XN--XKC2DL3A5EE0H
XN--YFRO4I67O
XN--YGBI2AMMX
-XN--ZCKZAH
+XN--ZFR164B
XXX
YE
YT
ZA
ZM
+ZONE
ZW
View
705 config/two-level-tlds
@@ -1,21 +1,48 @@
-# update from http://george.surbl.org/two-level-tlds
0.bg
+0fees.net
1.bg
+100megsfree5.com
110mb.com
+123oferty.pl
150m.com
163.to
+1accesshost.com
1blu.de
+1dumb.com
+1gb.ru
+1x.com
2.bg
2000.hu
+20fr.com
+22web.org
+24hr.com
+25u.com
+2waky.com
+3-a.net
3.bg
+3dn.ru
+3dxtras.com
+3gb.biz
4.bg
+4dq.com
+4mydomain.com
+4pu.com
+4u.com
5.bg
+50webs.com
+5ballov.ru
+5gbfree.com
+5u.com
6.bg
6a.org
6bone.pl
+6te.net
7.bg
+70948.com
8.bg
9.bg
+96.lt
+9966.org
9k.com
a.bg
a.se
@@ -78,11 +105,13 @@ aca.pro
academy.museum
accident-investigation.aero
accident-prevention.aero
+acmetoy.com
act.au
ad.jp
addr.com
adm.br
adult.ht
+adultdns.net
adv.br
adygeya.ru
ae.org
@@ -131,6 +160,8 @@ alderney.gg
alessandria.it
alesund.no
algard.no
+allowed.org
+almostmy.com
alstahaug.no
alt.na
alt.za
@@ -155,6 +186,7 @@ amur.ru
amursk.ru
amusement.aero
an.it
+anahuac.mx
ancona.it
and.museum
andasuolo.no
@@ -172,12 +204,14 @@ aoste.it
ap.it
appspot.com
aq.it
+aqserv.com
aquarium.museum
aquila.it
ar.com
ar.it
ar.us
arboretum.museum
+arcadepages.com
archaeological.museum
archaeology.museum
architecture.museum
@@ -189,6 +223,7 @@ arkhangelsk.ru
army.mil
arna.no
arq.br
+arredemo.org
art.br
art.do
art.dz
@@ -200,6 +235,7 @@ artcenter.museum
artdeco.museum
arteducation.museum
artgallery.museum
+artit.com
arts.co
arts.museum
arts.nf
@@ -210,6 +246,7 @@ as.us
ascoli-piceno.it
ascolipiceno.it
aseral.no
+askadresi.net
asker.no
askim.no
askoy.no
@@ -233,6 +270,7 @@ asso.km
asso.ma
asso.mc
asso.re
+asso.st
asso.ws
association.aero
association.museum
@@ -245,10 +283,12 @@ at.pn
at.tc
at.tf
at.tt
+at.ua
ath.cx
atlanta.museum
atm.pl
ato.br
+atwebpages.com
au.com
au.ms
au.pn
@@ -265,6 +305,8 @@ austin.museum
australia.museum
austrheim.no
author.aero
+authorizeddns.net
+authorizeddns.us
auto.pl
automotive.museum
av.it
@@ -274,12 +316,14 @@ averoy.no
aviation.museum
avocat.fr
avoues.fr
+ax.lt
axis.museum
az.us
b.bg
b.se
ba.it
babia-gora.pl
+backdrop.jp
badaddja.no
badajoz.museum
baghdad.museum
@@ -321,6 +365,7 @@ bearalvahki.no
beardu.no
beauxarts.museum
bedzin.pl
+bee.pl
beeldengeluid.museum
beiarn.no
bel.tr
@@ -338,6 +383,7 @@ berkeley.museum
berlevag.no
berlin.museum
bern.museum
+besaba.com
beskidy.pl
bg.it
bg.tc
@@ -351,6 +397,8 @@ bielawa.pl
biella.it
bieszczady.pl
bievat.no
+bigheadhosting.net
+bij.pl
bilbao.museum
bill.museum
bindal.no
@@ -368,11 +416,13 @@ biz.ki
biz.ly
biz.mv
biz.mw
+biz.nf
biz.nr
biz.om
biz.pk
biz.pl
biz.pr
+biz.st
biz.tj
biz.tm
biz.tr
@@ -383,13 +433,50 @@ bj.cn
bjarkoy.no
bjerkreim.no
bjugn.no
+bl.ee
bl.it
bl.uk
blog.br
+blog.cat
blog.com
blog.ru
blog4ever.com
+blogger.ca
+blogger.cf
+blogger.ch
+blogger.cv
+blogger.jp
+blogger.pl
+blogger.re
+blogger.se
+blogspot.ae
+blogspot.be
+blogspot.ca
+blogspot.ch
+blogspot.co
blogspot.com
+blogspot.cv
+blogspot.cz
+blogspot.de
+blogspot.fi
+blogspot.fr
+blogspot.gr
+blogspot.hu
+blogspot.ie
+blogspot.in
+blogspot.it
+blogspot.jp
+blogspot.kr
+blogspot.mx
+blogspot.nl
+blogspot.pt
+blogspot.re
+blogspot.ro
+blogspot.ru
+blogspot.se
+blogspot.sg
+blogspot.sk
+blueberrywave.com
bmd.br
bn.it
bo.it
@@ -402,6 +489,7 @@ bolzano.it
bomlo.no
bonn.museum
boston.museum
+bot.nu
botanical.museum
botanicalgarden.museum
botanicgarden.museum
@@ -417,6 +505,7 @@ brandywinevalley.museum
brasil.museum
bravehost.com
bravepages.com
+bravesites.com
bremanger.no
brescia.it
brindisi.it
@@ -438,7 +527,9 @@ bryne.no
bs.it
bu.no
budejju.no
+bugs3.com
building.museum
+builtfree.org
burghof.museum
buryatia.ru
bus.museum
@@ -446,6 +537,26 @@ busan.kr
bushey.museum
by.ru
bydgoszcz.pl
+byethost.com
+byethost1.com
+byethost10.com
+byethost11.com
+byethost12.com
+byethost13.com
+byethost14.com
+byethost15.com
+byethost16.com
+byethost17.com
+byethost18.com
+byethost2.com
+byethost24.com
+byethost3.com
+byethost4.com
+byethost5.com
+byethost6.com
+byethost7.com
+byethost8.com
+byethost9.com
bygland.no
bykle.no
bytom.pl
@@ -454,6 +565,7 @@ bz.it
c.bg
c.la
c.se
+ca.im
ca.it
ca.na
ca.pn
@@ -471,6 +583,7 @@ campobasso.it
can.br
can.museum
canada.museum
+canywhere.net
capebreton.museum
cargo.aero
carrier.museum
@@ -484,10 +597,12 @@ catania.it
catanzaro.it
catering.aero
cb.it
+cba.pl
cbg.ru
cc.bh
cc.cc
cc.na
+cccampaigns.net
cci.fr
ce.it
ce.ms
@@ -499,9 +614,12 @@ ch.lv
ch.pn
ch.tc
ch.tf
+ch.ua
ch.vu
chambagri.fr
championship.aero
+changeip.net
+changeip.org
charter.aero
chat.ru
chattanooga.museum
@@ -512,12 +630,15 @@ cherkassy.ua
chernigov.ua
chernovtsy.ua
chesapeakebay.museum
+chez.com
chiba.jp
chicago.museum
+chickenkiller.com
chieti.it
children.museum
childrens.museum
childrensgarden.museum
+chips.jp
chiropractic.museum
chirurgiens-dentistes.fr
chita.ru
@@ -528,6 +649,7 @@ chungbuk.kr
chungnam.kr
chuvashia.ru
cieszyn.pl
+ciki.me
cim.br
cincinnati.museum
cinema.museum
@@ -541,13 +663,20 @@ civilwar.museum
cjb.net
ck.ua
cl.it
+clan.su
+cleansite.us
+click.org
clickbank.net
clinton.museum
clock.museum
+cloudaccess.net
club.aero
club.tw
+cmetoy.com
cmw.ru
+cn.co
cn.com
+cn.im
cn.it
cn.ms
cn.pn
@@ -566,8 +695,10 @@ co.bw
co.cc
co.ci
co.ck
+co.cm
co.cr
co.cu
+co.de
co.dk
co.ee
co.fk
@@ -589,10 +720,14 @@ co.lc
co.ls
co.ma
co.me
+co.mp
co.mu
co.mw
co.mz
co.na
+co.nf
+co.nr
+co.nu
co.nz
co.om
co.pn
@@ -615,6 +750,7 @@ co.us
co.uz
co.ve
co.vi
+co.vu
co.yu
co.za
co.zm
@@ -656,10 +792,12 @@ com.bz
com.cd
com.ch
com.ci
+com.cm
com.cn
com.co
com.cu
com.cy
+com.de
com.dm
com.do
com.dz
@@ -724,6 +862,7 @@ com.ng
com.ni
com.np
com.nr
+com.nu
com.om
com.pa
com.pe
@@ -769,12 +908,16 @@ com.vn
com.vu
com.ws
com.ye
+com.zm
communication.museum
communications.museum
community.museum
como.it
+compress.to
computer.museum
computerhistory.museum
+comuf.com
+comyr.com
conf.au
conf.lv
conference.aero
@@ -784,8 +927,10 @@ consultant.aero
consulting.aero
contemporary.museum
contemporaryart.museum
+continent.kz
control.aero
convent.museum
+coolpage.biz
coop.br
coop.ht
coop.km
@@ -801,10 +946,13 @@ costume.museum
council.aero
countryestate.museum
county.museum
+cp.cx
cpa.pro
cq.cn
cr.it
+crabdance.com
crafts.museum
+craftx.biz
cranbrook.museum
creation.museum
cremona.it
@@ -812,18 +960,19 @@ crew.aero
cri.nz
crimea.ua
crotone.it
+cry.com
cs.it
csiro.au
ct.it
ct.us
cu.cc
+cuccfree.com
cul.na
cultural.museum
culturalcenter.museum
culture.museum
cuneo.it
cv.ua
-cw.cm
cx.cc
cyber.museum
cymru.museum
@@ -832,6 +981,7 @@ cz.cc
cz.it
cz.tc
cz.tf
+cz.tl
czeladz.pl
czest.pl
d.bg
@@ -841,11 +991,22 @@ daejeon.kr
dagestan.ru
dali.museum
dallas.museum
+dalnet.ca
+dasfree.com
database.museum
davvenjarga.no
davvesiida.no
dc.us
+ddns.info
+ddns.me
+ddns.me.uk
+ddns.ms
+ddns.name
+ddns.net
+ddns.us
+ddns01.com
ddr.museum
+de.be
de.com
de.ki
de.lv
@@ -854,11 +1015,13 @@ de.net
de.pn
de.tc
de.tf
+de.tl
de.tt
de.us
de.vu
deatnu.no
decorativearts.museum
+dedibox.fr
defense.tn
delaware.museum
delmenhorst.museum
@@ -870,32 +1033,90 @@ design.museum
detroit.museum
dgca.aero
dielddanuorri.no
+digitalzones.com
dinosaur.museum
discovery.museum
+diskstation.me
divtasvuodna.no
divttasvuotna.no
dk.org
dk.tc
dk.tt
dlugoleka.pl
+dmdelivery.net
dn.ua
dnepropetrovsk.ua
dni.us
+dns-dns.com
+dns-stuff.com
dns.be
+dns.biz
+dns.info
+dns.mobi
+dns.ms
+dns.name
+dns.us
+dns04.com
+dns05.com
+dns1.us
+dns53.biz
+dnsapi.info
+dnsd.info
+dnsd.me
+dnsdynamic.com
+dnsdynamic.net
+dnset.com
+dnsfor.me
+dnsget.org
+dnsrd.com
+do.am
dolls.museum
donetsk.ua
donna.no
donostia.museum
+dontexist.com
dovre.no
dp.ua
dpn.br
+dq.com
dr.na
dr.tr
drammen.no
drangedal.no
+dreamhosters.com
drobak.no
+dsmtp.com
dudinka.ru
+dumb.com
+dumb1.com
durham.museum
+dynalias.org
+dynamic-dns.net
+dynamicdns.me.uk
+dynamicdns.org.uk
+dyndns-at-home.com
+dyndns-at-work.com
+dyndns-blog.com
+dyndns-free.com
+dyndns-home.com
+dyndns-ip.com
+dyndns-mail.com
+dyndns-office.com
+dyndns-pics.com
+dyndns-remote.com
+dyndns-server.com
+dyndns-web.com
+dyndns-wiki.com
+dyndns-work.com
+dyndns.biz
+dyndns.dk
+dyndns.info
+dyndns.org
+dyndns.pro
+dyndns.tv
+dyndns.ws
+dynet.com
+dynssl.com
dyroy.no
e-burg.ru
e-famoso.it
@@ -905,13 +1126,17 @@ e12.ve
e164.arpa
eastafrica.museum
eastcoast.museum
+eb2a.com
+ebatesrule.net
ebiz.tw
ecn.br
+eco.br
ed.ao
ed.ci
ed.cr
ed.jp
ed.pw
+edenvale.info
edu.ac
edu.af
edu.ai
@@ -987,6 +1212,7 @@ edu.ml
edu.mm
edu.mn
edu.mo
+edu.mp
edu.mt
edu.mv
edu.mw
@@ -1043,11 +1269,13 @@ edu.ws
edu.ye
edu.yu
edu.za
+edu.zm
educ.ar
education.museum
educational.museum
educator.aero
edunet.tn
+efound.com
egersund.no
egyptian.museum
ehime.jp
@@ -1062,6 +1290,7 @@ ekloges.cy
elblag.pl
elburg.museum
elk.pl
+ellclassics.com
elvendrell.museum
elverum.no
embaixada.st
@@ -1069,6 +1298,8 @@ embroidery.museum
emergency.aero
en.it
encyclopedic.museum
+endofinternet.net
+endsmtp.com
enebakk.no
eng.br
eng.pro
@@ -1082,11 +1313,15 @@ entertainment.aero
entomology.museum
environment.museum
environmentalconservation.museum
+envy.nu
+epac.to
epilepsy.museum
equipment.aero
ernet.in
erotica.hu
erotika.hu
+erveuser.com
+erveusers.com
es.kr
es.pn
es.tc
@@ -1096,11 +1331,15 @@ esp.br
essex.museum
est.pr
estate.museum
+esy.es
etc.br
ethnology.museum
eti.br
etne.no
etnedal.no
+etos.com
+etradesystem.de
+ettrials.com
eu.com
eu.im
eu.int
@@ -1108,21 +1347,31 @@ eu.org
eu.tc
eu.tf
eu.tt
+eu5.org
eun.eg
euro.tm
evenassi.no
evenes.no
evje-og-hornnes.no
+exactpages.com
exchange.aero
exeter.museum
exhibition.museum
+exidude.com
experts-comptables.fr
express.aero
extra.hu
+exvm.com
+exvn.com
+exxxy.biz
+ez.lv
+ezua.com
f.bg
f.se
+fagms.net
fam.pk
family.museum
+faqserv.com
far.br
fareast.ru
farm.museum
@@ -1130,10 +1379,14 @@ farmequipment.museum
farmers.museum
farmstead.museum
farsund.no
+fartit.com
fauske.no
fax.nr
fc.it
+fc2.com
+fcpages.com
fe.it
+fe100.net
fed.us
federation.aero
fedje.no
@@ -1176,10 +1429,15 @@ fl.us
fla.no
flakstad.no
flanders.museum
+flashserv.net
flatanger.no
flekkefjord.no
flesberg.no
flight.aero
+flink.com
+flinkup.com
+flinkup.net
+flinkup.org
flog.br
flora.no
florence.it
@@ -1202,6 +1460,7 @@ forum.hu
fosnes.no
fot.br
foundation.museum
+fr.cr
fr.it
fr.ms
fr.nf
@@ -1215,9 +1474,21 @@ frankfurt.museum
franziskaner.museum
fredrikstad.no
free.fr
+freeddns.com
+freehomepage.asia
freehostia.com
+freehostyou.com
+freeiz.com
freemasonry.museum
+freeoda.co
+freeoda.com
freeservercity.com
+freestuff.eu
+freetcp.com
+freetzi.com
+freevar.com
+freevnn.com
+freezoy.com
frei.no
freiburg.museum
freight.aero
@@ -1226,11 +1497,17 @@ frog.museum
frogn.no
froland.no
from.hr
+fromru.su
front.ru
frosinone.it
frosta.no
froya.no
fst.br
+ftp.sh
+ftp1.biz
+ftp21.net
+ftpaccess.cc
+ftpserver.biz
fuel.aero
fukui.jp
fukuoka.jp
@@ -1251,6 +1528,7 @@ ga.us
gaivuotna.no
gallery.museum
galsa.no
+game-server.cc
game.tw
games.hu
gamvik.no