Skip to content

Commit d1dd117

Browse files
J0WIjeremyn
J0WI
authored and
jeremyn
committed
[Migros] separate and add hosts (EFForg#6939)
* [Migros] separate micasa.ch and add Chocolatfrey * separate Doitgarden.ch.xml * add more hosts related to migros * add ^ to www redirect and more migrol hosts * split up rulesets * typos * exclude dev.m-connect.ch * avoid negative exclusion * consistent filename * typo * code style
1 parent 4ff63d7 commit d1dd117

18 files changed

+331
-54
lines changed

‎src/chrome/content/rules/Chocolatfrey.ch.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
Mismatch:
5+
- b2b.chocolatfrey.ch
6+
- tafelraten.chocolatfrey.ch
7+
8+
- (www\.)?chocolatfrey.com
9+
- b2b.chocolatfrey.com
10+
-->
11+
<ruleset name="Chocolatfrey.ch">
12+
<target host="chocolatfrey.ch" />
13+
<target host="www.chocolatfrey.ch" />
14+
15+
<target host="myfrey.ch" />
16+
<target host="www.myfrey.ch" />
17+
18+
<rule from="^http:" to="https:" />
19+
</ruleset>

‎src/chrome/content/rules/Doitgarden.ch.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
Nonfunctional hosts in doit-garden-migros.ch:
5+
- doitgarden.ch (m,r)
6+
- www.doitgarden.ch (r)
7+
8+
- doit-garden-migros.ch (m)
9+
- www.doit-garden-migros.ch (m)
10+
- nl.doit-garden-migros.ch (m)
11+
12+
m: mismatch
13+
r: HTTP redirect
14+
-->
15+
<ruleset name="Doitgarden.ch (partial)">
16+
<target host="cdn1.doitgarden.ch" />
17+
<target host="cdn2.doitgarden.ch" />
18+
19+
<rule from="^http:" to="https:" />
20+
</ruleset>

‎src/chrome/content/rules/Exlibris.ch.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
HTTP redirect:
5+
- m.exlibris.ch
6+
7+
Mismatch:
8+
- imgsoft.exlibris.ch
9+
-->
10+
<ruleset name="Exlibris.ch">
11+
<target host="exlibris.ch" />
12+
<target host="www.exlibris.ch" />
13+
14+
<rule from="^http:" to="https:" />
15+
</ruleset>

src/chrome/content/rules/hotelplan.xml renamed to src/chrome/content/rules/Hotelplan.ch.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
2-
For other Migros coverage, see migros.xml.
2+
For other Migros coverage, see Migros.xml.
33
-->
4-
<ruleset name="Hotelplan" default_off="redirects to http">
4+
<ruleset name="Hotelplan.ch" default_off="redirects to http">
55
<target host="hotelplan.ch"/>
66
<target host="www.hotelplan.ch"/>
77
<target host="travelhouse.ch"/>

‎src/chrome/content/rules/Interhome.ch.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
Mismatch:
5+
- ^interhome.ch
6+
7+
Refused:
8+
- blog.interhome.ch
9+
-->
10+
<ruleset name="Interhome.ch">
11+
<target host="interhome.ch" />
12+
<target host="www.interhome.ch" />
13+
14+
15+
<rule from="^http://interhome\.ch/"
16+
to="https://www.interhome.ch/"/>
17+
<rule from="^http:" to="https:" />
18+
</ruleset>

‎src/chrome/content/rules/M-Fanshop.ch.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
-->
4+
<ruleset name="M-Fanshop.ch">
5+
<target host="m-fanshop.ch" />
6+
<target host="www.m-fanshop.ch" />
7+
8+
<rule from="^http:" to="https:" />
9+
</ruleset>

‎src/chrome/content/rules/Melectronics.ch.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
Mismatch:
5+
- ^melectronics.ch
6+
-->
7+
<ruleset name="Melectronics.ch">
8+
<target host="melectronics.ch" />
9+
<target host="www.melectronics.ch" />
10+
11+
<rule from="^http://melectronics\.ch/"
12+
to="https://www.melectronics.ch/"/>
13+
<rule from="^http:" to="https:" />
14+
</ruleset>

‎src/chrome/content/rules/Micasa.ch.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
HTTP redirect:
5+
- www.micasa.ch (static resources are working)
6+
7+
Mismatch:
8+
- ^micasa.ch
9+
- myhome.micasa.ch
10+
-->
11+
<ruleset name="Micasa.ch (partial)">
12+
<target host="www.micasa.ch"/>
13+
<target host="cdn1.micasa.ch"/>
14+
<target host="cdn2.micasa.ch"/>
15+
<target host="cdn3.micasa.ch"/>
16+
<target host="cdn4.micasa.ch"/>
17+
18+
<exclusion pattern="^http://www\.micasa\.ch/$" />
19+
20+
<test url="http://www.micasa.ch/de/localizations.js" />
21+
<test url="http://www.micasa.ch/js/micasa.js" />
22+
<test url="http://www.micasa.ch/medias/sys_master/8860298117150.jpg" />
23+
<test url="http://www.micasa.ch/static/templates/micasa/resources/js/stats/confWrapper.json" />
24+
<test url="http://www.micasa.ch/static/templates/micasa/resources/stylesheets/images/logos/migros.png" />
25+
<test url="http://www.micasa.ch/static/templates/micasa/resources/stylesheets/screen.css" />
26+
<test url="http://www.micasa.ch/static/templates/shared/resources/stylesheets/fonts/helveticaneue-condensed-bold.woff" />
27+
<test url="http://www.micasa.ch/static/templates/shared/resources/stylesheets/images/m.svg" />
28+
29+
<rule from="^http://www\.micasa\.ch/([\.\-/%\w]+)\.(css|jpg|js|json|png|svg|woff)$"
30+
to="https://www.micasa.ch/$1.$2" />
31+
<rule from="^http://cdn([1-4])\.micasa\.ch/"
32+
to="https://cdn$1.micasa.ch/" />
33+
</ruleset>

‎src/chrome/content/rules/Migrol.ch.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!--
2+
For other Migros coverage, see Migros.xml.
3+
4+
Mismatch:
5+
- ^migrol.ch
6+
- ^migrolcard.ch
7+
- ^migrol-heizoel.ch
8+
- ^mazout-migrol.ch
9+
- ^migrol-olio-combustibile.ch
10+
-->
11+
<ruleset name="Migrol.ch">
12+
<target host="migrol.ch" />
13+
<target host="www.migrol.ch" />
14+
<target host="b2b.migrol.ch" />
15+
<target host="websvc.migrol.ch" />
16+
17+
<target host="migrolcard.ch" />
18+
<target host="www.migrolcard.ch" />
19+
20+
<target host="migrol-heizoel.ch" />
21+
<target host="www.migrol-heizoel.ch" />
22+
<target host="migrol-olio-combustibile.ch" />
23+
<target host="www.migrol-olio-combustibile.ch" />
24+
<target host="mazout-migrol.ch" />
25+
<target host="www.mazout-migrol.ch" />
26+
27+
<securecookie host="^b2b\.migrol\.ch" name=".+"/>
28+
29+
<rule from="^http://migrol\.ch/"
30+
to="https://www.migrol.ch/"/>
31+
<rule from="^http://migrolcard\.ch/"
32+
to="https://www.migrolcard.ch/"/>
33+
<rule from="^http://migrol-heizoel\.ch/"
34+
to="https://www.migrol-heizoel.ch/"/>
35+
<rule from="^http://migrol-olio-combustibile\.ch/"
36+
to="https://www.migrol-olio-combustibile.ch/"/>
37+
<rule from="^http://mazout-migrol\.ch/"
38+
to="https://www.mazout-migrol.ch/"/>
39+
<rule from="^http:" to="https:" />
40+
</ruleset>

src/chrome/content/rules/migros-bank.xml renamed to src/chrome/content/rules/Migros-Bank.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
For other Migros coverage, see migros.xml.
2+
For other Migros coverage, see Migros.xml.
33
44
Mismatch:
55
- blog.bancamigros.ch

0 commit comments

Comments
 (0)