Skip to content

Commit a295f69

Browse files
jshajsha
committed
Merge pull request EFForg#2367 from J0WI/NLnet-Labs
fix EFForg#2327
2 parents f8f6368 + 96f6198 commit a295f69

2 files changed

Lines changed: 15 additions & 17 deletions

File tree

‎src/chrome/content/rules/NLnet-Labs-cacert.xml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
<ruleset name="NLnet Labs CACert" platform="cacert">
2+
<target host="behemoth.nlnetlabs.nl"/>
3+
<target host="blogs.nlnetlabs.nl"/>
24

3-
<target host="net-dns.org"/>
4-
<target host="www.net-dns.org"/>
5-
<target host="nlnetlabs.nl"/>
6-
<target host="*.nlnetlabs.nl"/>
7-
8-
<rule from="^http://(www\.)?net-dns\.org/"
9-
to="https://$1net-dns.org/"/>
10-
11-
<rule from="^http://(open\.|www\.)?nlnetlabs\.nl/"
12-
to="https://$1nlnetlabs.nl/"/>
13-
5+
<rule from="^http:"
6+
to="https:"/>
147
</ruleset>

‎src/chrome/content/rules/NLnet-Labs.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
<!--
22
Other NLnet Labs rulesets:
33
4+
- NLnet-Labs-cacert.xml
45
- Unbound.net.xml
56
67
78
^opendnssec.org doesn't exist.
89
10+
Refused:
11+
- sane.nlnetlabs.nl
912
-->
1013
<ruleset name="NLnet Labs">
11-
12-
<!-- Direct rewrites:
13-
-->
14+
<target host="net-dns.org"/>
15+
<target host="www.net-dns.org"/>
16+
<target host="nlnetlabs.nl"/>
17+
<target host="www.nlnetlabs.nl"/>
18+
<target host="dicht.nlnetlabs.nl"/>
19+
<target host="git.nlnetlabs.nl"/>
20+
<target host="open.nlnetlabs.nl"/>
21+
<target host="unbound.nlnetlabs.nl"/>
1422
<target host="svn.opendnssec.org"/>
1523
<target host="wiki.opendnssec.org"/>
1624
<target host="www.opendnssec.org"/>
1725

18-
1926
<securecookie host="^wiki\.opendnssec\.org$" name=".*"/>
2027

21-
2228
<rule from="^http:"
2329
to="https:" />
24-
2530
</ruleset>

0 commit comments

Comments
 (0)