Skip to content

Commit 9d7bace

Browse files
jshajsha
committed
Merge pull request EFForg#1152 from jsha/reenable-wikimedia
Re-enable wikimedia rule
2 parents 0596954 + f6370fe commit 9d7bace

File tree

1 file changed

+54
-25
lines changed

1 file changed

+54
-25
lines changed

‎src/chrome/content/rules/Wikimedia.xml‎

Lines changed: 54 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://wikimedia.ca/ => https://wikimedia.ca/: (60, 'SSL certificate problem: self signed certificate')
4-
Fetch error: http://www.wikimedia.ca/ => https://wikimedia.ca/: (60, 'SSL certificate problem: self signed certificate')
5-
Fetch error: http://icinga.wmflabs.org/ => https://icinga.wmflabs.org/: (6, 'Could not resolve host: icinga.wmflabs.org')
62
Wikipedia and other Wikimedia Foundation wikis previously had no real HTTPS support, and
73
URLs had to be rewritten to https://secure.wikimedia.org/$wikitype/$language/ . This is no
84
longer the case, see https://blog.wikimedia.org/2011/10/03/native-https-support-enabled-for-all-wikimedia-foundation-wikis/ ,
@@ -35,7 +31,7 @@ Fetch error: http://icinga.wmflabs.org/ => https://icinga.wmflabs.org/: (6, 'Cou
3531
* Secured by us
3632
3733
-->
38-
<ruleset name="Wikimedia" default_off='failed ruleset test'>
34+
<ruleset name="Wikimedia">
3935

4036
<target host="enwp.org" />
4137
<target host="frwp.org" />
@@ -46,7 +42,18 @@ Fetch error: http://icinga.wmflabs.org/ => https://icinga.wmflabs.org/: (6, 'Cou
4642
<target host="*.wikimedia.org" />
4743
<exclusion pattern="^http://(?:apt|cs|cz|parsoid-lb\.eqiad|status|torrus|ubuntu)\.wikimedia\.org" />
4844
<!-- https://mail1.eff.org/pipermail/https-everywhere-rules/2012-June/001189.html -->
45+
<test url="http://apt.wikimedia.org" />
46+
<test url="http://cs.wikimedia.org" />
47+
<test url="http://cz.wikimedia.org" />
48+
<test url="http://parsoid-lb.eqiad.wikimedia.org" />
49+
<test url="http://status.wikimedia.org" />
50+
<test url="http://torrus.wikimedia.org" />
51+
<test url="http://ubuntu.wikimedia.org" />
52+
4953
<exclusion pattern="^http://lists\.wikimedia\.org/pipermail(?:$|/)" />
54+
<test url="http://lists.wikimedia.org/pipermail" />
55+
<test url="http://lists.wikimedia.org/pipermail/" />
56+
5057
<target host="wikimediafoundation.org" />
5158
<target host="www.wikimediafoundation.org" />
5259

@@ -70,9 +77,34 @@ Fetch error: http://icinga.wmflabs.org/ => https://icinga.wmflabs.org/: (6, 'Cou
7077
<target host="wiktionary.org" />
7178
<target host="*.wiktionary.org" />
7279

73-
<!-- Wikimedia chapters -->
74-
<target host="wikimedia.ca" />
75-
<target host="www.wikimedia.ca" />
80+
<test url="http://en.wikibooks.org" />
81+
<test url="http://en.wikinews.org" />
82+
<test url="http://en.wikipedia.org" />
83+
<test url="http://en.wikiquote.org" />
84+
<test url="http://en.wikisource.org" />
85+
<test url="http://en.wikiversity.org" />
86+
<test url="http://en.wikivoyage.org" />
87+
<test url="http://en.wiktionary.org" />
88+
<test url="http://de.wikibooks.org" />
89+
<test url="http://de.wikinews.org" />
90+
<test url="http://de.wikipedia.org" />
91+
<test url="http://de.wikiquote.org" />
92+
<test url="http://de.wikisource.org" />
93+
<test url="http://de.wikiversity.org" />
94+
<test url="http://de.wikivoyage.org" />
95+
<test url="http://de.wiktionary.org" />
96+
<test url="http://ru.wikibooks.org" />
97+
<test url="http://ru.wikinews.org" />
98+
<test url="http://ru.wikipedia.org" />
99+
<test url="http://ru.wikiquote.org" />
100+
<test url="http://ru.wikisource.org" />
101+
<test url="http://ru.wikiversity.org" />
102+
<test url="http://ru.wikivoyage.org" />
103+
<test url="http://ru.wiktionary.org" />
104+
105+
<test url="http://www.wikidata.org" />
106+
<test url="http://www.wikimedia.org" />
107+
<test url="http://www.wikimediafoundation.org" />
76108

77109
<!-- Wikimedia Tool Labs -->
78110
<target host="tools.wmflabs.org" />
@@ -98,35 +130,32 @@ Fetch error: http://icinga.wmflabs.org/ => https://icinga.wmflabs.org/: (6, 'Cou
98130

99131
<rule from="^http://noboard\.chapters\.wikimedia\.org/"
100132
to="https://noboard-chapters.wikimedia.org/" />
133+
<test url="http://noboard.chapters.wikimedia.org/" />
101134

102-
<rule from="^http://(?:dataset2|download|sitemap)\.wikimedia\.org/"
135+
<rule from="^http://(?:download|sitemap)\.wikimedia\.org/"
103136
to="https://dumps.wikimedia.org/" />
137+
<test url="http://download.wikimedia.org/" />
138+
<test url="http://sitemap.wikimedia.org/" />
104139

105140
<rule from="^http://links\.email\.donate\.wikimedia\.org/"
106141
to="https://www.links.mkt41.net/" />
142+
<test url="http://links.email.donate.wikimedia.org/" />
107143

108-
<rule from="^http://(?:labs-ns[01]|virt0)\.wikimedia\.org/"
144+
<rule from="^http://labs-ns0\.wikimedia\.org/"
109145
to="https://wikitech.wikimedia.org/" />
146+
<test url="http://labs-ns0.wikimedia.org/" />
110147

111148
<rule from="^http://arbcom\.(de|en|fi|nl)\.wikipedia\.org/"
112149
to="https://arbcom-$1.wikipedia.org/" />
150+
<test url="http://arbcom.de.wikipedia.org/" />
151+
<test url="http://arbcom.en.wikipedia.org/" />
152+
<test url="http://arbcom.fi.wikipedia.org/" />
153+
<test url="http://arbcom.nl.wikipedia.org/" />
113154

114155
<rule from="^http://download\.wikipedia\.org/"
115156
to="https://dumps.wikimedia.org/" />
157+
<test url="http://download.wikipedia.org/" />
116158

117-
<rule from="^http://wg\.en\.wikipedia\.org/"
118-
to="https://wg-en.wikipedia.org/" />
119-
120-
<rule from="^http://([^@:/]+\.)?wik(ibooks|idata|imedia|inews|ipedia|iquote|isource|iversity|ivoyage|tionary)\.org/"
121-
to="https://$1wik$2.org/" />
122-
123-
<rule from="^http://(?:www\.)?wikimedia\.ca/"
124-
to="https://wikimedia.ca/" />
125-
126-
<rule from="^http://(www\.)?wikimediafoundation\.org/"
127-
to="https://$1wikimediafoundation.org/" />
128-
129-
<rule from="^http://([^@:/]+)\.wmflabs\.org/"
130-
to="https://$1.wmflabs.org/" />
131-
159+
<rule from="^http:"
160+
to="https:" />
132161
</ruleset>

0 commit comments

Comments
 (0)