[Yandex] Remove exclusions, fix order

MB · MB · commit ca1bec713434 · 2015-03-21T15:00:00.000Z
diff --git a/src/chrome/content/rules/Yandex.xml b/src/chrome/content/rules/Yandex.xml
@@ -151,9 +151,6 @@
 
 	Partially covered subdomains:
 
-		- (www.)? ¹
-		- beta ¹
-		- buki ¹
 		- (www.)?video *
 
 	¹ Some pages redirect to http
@@ -162,6 +159,7 @@
 
 	Fully covered subdomains:
 
+		- (www.)?
 		- (www.)?academy
 		- (www.)?adresa
 		- (www.)?atlas
@@ -236,6 +234,7 @@
 			- bar
 			- bayan
 			- beta.bayan
+			- beta
 
 			- blogs
 			- m.blogs
@@ -246,6 +245,7 @@
 			- browsers
 			- bs
 			- bs-meta
+			- buki
 			- business-maps
 			- calendar
 			- widgets.calendar
@@ -504,11 +504,6 @@
 		<!--exclusion pattern="^http://(android-us\.apps|us\.apps|m\.auto|family|interactive-answers|op)\.yandex\.ru/$" /-->
 		<!--exclusion pattern="^http://market\.yandex\.ru/($|\?clid=|search\.xml)" /-->
 		<exclusion pattern="^http://uslugi\.yandex\.ru/($|arr\.png|index\.css)" />
-		<!--exclusion pattern="^http://(beta|www)\.yandex\.ru/($|postcards/$)" /-->
-		<!--
-			Exceptions:
-					-->
-		<exclusion pattern="^http://(?:beta\.|buki\.|www\.)?yandex\.ru/+(?!404\.html|(?:all|captcha|captchaimg|cycounter|images|people|promo|redir|security|showcaptcha|video|yandsearch)(?:$|[?/])|favicon\.ico)" />
 		<!--
 			Rather than enumerating domains that support SSL,
 			we enable SSL for all services and then exclude those
@@ -636,12 +631,12 @@ w
 	<rule from="^http://(www\.)?(academy|adresa|atlas|ewents|[ei]vents?|export|fotki|internet|karti|maps|(?:beta|constructor|m|n|router-quality)\.maps|master|metro|mshad|music|maps\.pda|pogoda|prefetch-maps|probki|research|site|startups|tech|tv|video|weather|yaca)\.yandex\.ru/"
 		to="https://$1$2.yandex.ru/" />
 
-	<rule from="^http://(?:www\.)?([^.]+)\.yandex\.ru/"
-		to="https://$1.yandex.ru/" />
-
 	<rule from="^http://((?:\d\.downloader\.disk|sandbox\.api\.maps|www)\.)?yandex\.ru/"
 		to="https://$1yandex.ru/" />
 
+	<rule from="^http://(?:www\.)?([^.]+)\.yandex\.ru/"
+		to="https://$1.yandex.ru/" />
+
 	<!--	Here we can enable 4+ level domains with a single regexp,
 		but I've never seen any domains more that 4 levels deep
 		in Yandex network, so I wouldn't enable them now -
diff --git a/utils/ruleset-coverage-whitelist.txt b/utils/ruleset-coverage-whitelist.txt
@@ -14343,7 +14343,7 @@ aee4181ef38efe6f09c7c39f2d36554bf8666ace9b1d308738546a5ec841d7c0  Yandex.com.ua.
 944bcf41c31b5740835eeadff14e17719bbf9ab21be1ec23f774777da111306c  Yandex.net.xml
 0ae6d35db343a943f6c54011416bbe796435a13c894b5a719d1adc0dd29666e4  Yandex.st.xml
 ea65834f42b6c2bccf5972b45f3136ccbe0056ac13f706c9bfacf9bec64a5ecb  Yandex.ua.xml
-4df819d5e196c106e9d7aaaaafee840df3051da820db7af371e87a4d9c3417b7  Yandex.xml
+6bc2b7b943cb3ed8962adc030e978e1a45acfb4cf437757f1228b49107b06641  Yandex.xml
 7946c589ae21bebf72512b6aa0ca5647ba4fc3ec83a0a96821c3ee41273a05f3  Yannick.net.xml
 ec25f5a0500009683e53ea1ccb50d6d1eb03ee1c7c7f2603a62713b6e2d9949a  Yaprobki.ru.xml
 28a370e112f80d74aa3bfd8e462ad2d09cea7042d7acbcd02b884ce87e236485  Yard_Digital.com.xml
