modules/filterserver/files/site.conf - Issue 29789575: #10517 - Update filter redirects for ZTE UME

Delta Between Two Patch Sets: modules/filterserver/files/site.conf

Issue 29789575: #10517 - Update filter redirects for ZTE UME (Closed)

Left Patch Set: Created May 25, 2018, 1:25 a.m.

Right Patch Set: Use better naming and avoid abbreviation Created May 28, 2018, 11:53 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 root /var/www/easylist;	1 root /var/www/easylist;

2 keepalive_timeout 0;	2 keepalive_timeout 0;

3 charset utf-8;	3 charset utf-8;

4 gzip_static on;	4 gzip_static on;

5 default_type text/plain;	5 default_type text/plain;

6	6

7 # http://hub.eyeo.com/issues/262	7 # http://hub.eyeo.com/issues/262

8 location /filters/easylist-min.txt	8 location /filters/easylist-min.txt

9 {	9 {

10 proxy_cache filters;	10 proxy_cache filters;

(...skipping 26 matching lines...) Expand all Loading...
37 }	37 }

38	38

39 ### http://hub.eyeo.com/issues/735 Hack for ABB development build that supports elemhide:	39 ### http://hub.eyeo.com/issues/735 Hack for ABB development build that supports elemhide:

40 if ($arg_addonVersion ~ ^2\.(7\|8\|9)(\..*)?$)	40 if ($arg_addonVersion ~ ^2\.(7\|8\|9)(\..*)?$)

41 {	41 {

42 set $use_alternative_resource_flags "${use_alternative_resource_flags}+SUPPORT S_ELEMHIDE";	42 set $use_alternative_resource_flags "${use_alternative_resource_flags}+SUPPORT S_ELEMHIDE";

43 }	43 }

44	44

45 if ($arg_addonName = "libadblockplus-android")	45 if ($arg_addonName = "libadblockplus-android")

46 {	46 {

47 set $use_alternative_resource_flags "LIBABPAND";	47 set $use_alternative_resource_flags "LIBABP_ANDROID";

48 }	48 }

49	49

50 if ($geoip_country_code = "DE")	50 if ($geoip_country_code = "DE")

51 {	51 {

52 set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATIO N";	52 set $use_alternative_resource_flags "${use_alternative_resource_flags}+LOCATIO N";

53 }	53 }

54	54

55 # http://hub.eyeo.com/issues/1374	55 # http://hub.eyeo.com/issues/1374

56 # http://hub.eyeo.com/issues/10493	56 # http://hub.eyeo.com/issues/10493

57 # http://hub.eyeo.com/issues/10517	57 # http://hub.eyeo.com/issues/10517

58 if ($arg_application ~ (com.microsoft.emmx\|com.ume.browser.global))	58 if ($arg_application ~ (com\.microsoft\.emmx\|com\.ume\.browser\.global))

59 {	59 {

60 set $use_alternative_resource_flags "${use_alternative_resource_flags}+MIN";	60 set $use_alternative_resource_flags "${use_alternative_resource_flags}+MIN";

61 }	61 }

62	62

63 ### http://hub.eyeo.com/issues/3924 for Chinese SBrowser video exceptions (1/4)	63 ### http://hub.eyeo.com/issues/3924 for Chinese SBrowser video exceptions (1/4)

64 if ($arg_application = "sbrowser")	64 if ($arg_application = "sbrowser")

65 {	65 {

66 set $use_alternative_resource_flags "SBROWSER";	66 set $use_alternative_resource_flags "SBROWSER";

67 }	67 }

68	68

(...skipping 17 matching lines...) Expand all Loading...
86 }	86 }

87	87

88 if ($use_alternative_resource_flags = "IE+LOCATION")	88 if ($use_alternative_resource_flags = "IE+LOCATION")

89 {	89 {

90 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 break;	90 rewrite ^/easylist\.(.+) /easylist_noelemhide.$1 break;

91 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 break;	91 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany_noelemhide+easylist _noelemhide.$1 break;

92 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break;	92 rewrite ^/easylistgermany\.(.+) /easylistgermany_noelemhide.$1 break;

93 }	93 }

94	94

95 # http://hub.eyeo.com/issues/10493	95 # http://hub.eyeo.com/issues/10493

96 if ($use_alternative_resource_flags ~ (LIBABPAND\|LIBABPAND+MIN))	96 if ($use_alternative_resource_flags ~ (LIBABP_ANDROID\|LIBABP_ANDROID+MIN))

97 {	97 {

98 rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break;	98 rewrite ^/exceptionrules\.(.+) /exceptionrules-minimal.$1 break;

99 rewrite ^/easylist\.(.+) /easylist-minified.$1 break;	99 rewrite ^/easylist\.(.+) /easylist-minified.$1 break;

100 rewrite ^/easyprivacy\.(.+) /easyprivacy-minified.$1 break;	100 rewrite ^/easyprivacy\.(.+) /easyprivacy-minified.$1 break;

101 rewrite ^/fanboy-social\.(.+) /fanboy-social-minified.$1 break;	101 rewrite ^/fanboy-social\.(.+) /fanboy-social-minified.$1 break;

102 rewrite ^/abpindo\+easylist\.(.+) /abpindo+easylist-minified.$1 break;	102 rewrite ^/abpindo\+easylist\.(.+) /abpindo+easylist-minified.$1 break;

103 rewrite ^/abpvn\+easylist\.(.+) /abpvn+easylist-minified.$1 break;	103 rewrite ^/abpvn\+easylist\.(.+) /abpvn+easylist-minified.$1 break;

104 rewrite ^/bulgarian_list\+easylist\.(.+) /bulgarian_list+easylist-minified.$1 break;	104 rewrite ^/bulgarian_list\+easylist\.(.+) /bulgarian_list+easylist-minified.$1 break;

105 rewrite ^/easylistchina\+easylist\.(.+) /easylistchina+easylist-minified.$1 br eak;	105 rewrite ^/easylistchina\+easylist\.(.+) /easylistchina+easylist-minified.$1 br eak;

106 rewrite ^/easylistczechslovak\+easylist\.(.+) /easylistczechslovak+easylist-mi nified.$1 break;	106 rewrite ^/easylistczechslovak\+easylist\.(.+) /easylistczechslovak+easylist-mi nified.$1 break;

107 rewrite ^/easylistdutch\+easylist\.(.+) /easylistdutch+easylist-minified.$1 br eak;	107 rewrite ^/easylistdutch\+easylist\.(.+) /easylistdutch+easylist-minified.$1 br eak;

108 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany+easylist-minified.$ 1 break;	108 rewrite ^/easylistgermany\+easylist\.(.+) /easylistgermany+easylist-minified.$ 1 break;

109 rewrite ^/israellist\+easylist\.(.+) /israellist+easylist-minified.$1 break;	109 rewrite ^/israellist\+easylist\.(.+) /israellist+easylist-minified.$1 break;

110 rewrite ^/easylistitaly\+easylist\.(.+) /easylistitaly+easylist-minified.$1 br eak;	110 rewrite ^/easylistitaly\+easylist\.(.+) /easylistitaly+easylist-minified.$1 br eak;

111 rewrite ^/easylistlithuania\+easylist\.(.+) /easylistlithuania+easylist-minifi ed.$1 break;	111 rewrite ^/easylistlithuania\+easylist\.(.+) /easylistlithuania+easylist-minifi ed.$1 break;

112 rewrite ^/easylistpolish\+easylist\.(.+) /easylistpolish+easylist-minified.$1 break;	112 rewrite ^/easylistpolish\+easylist\.(.+) /easylistpolish+easylist-minified.$1 break;

113 rewrite ^/easylistspanish\+easylist\.(.+) /easylistspanish+easylist-minified.$ 1 break;	113 rewrite ^/easylistspanish\+easylist\.(.+) /easylistspanish+easylist-minified.$ 1 break;

114 rewrite ^/latvianlist\+easylist\.(.+) /latvianlist+easylist-minified.$1 break;	114 rewrite ^/latvianlist\+easylist\.(.+) /latvianlist+easylist-minified.$1 break;

115 rewrite ^/liste_fr\+easylist\.(.+) /liste_fr+easylist-minified.$1 break;	115 rewrite ^/liste_fr\+easylist\.(.+) /liste_fr+easylist-minified.$1 break;

116 rewrite ^/liste_ar\+liste_fr\+easylist\.(.+) /liste_ar+liste_fr+easylist-minif ied.$1 break;	116 rewrite ^/liste_ar\+liste_fr\+easylist\.(.+) /liste_ar+liste_fr+easylist-minif ied.$1 break;

117 rewrite ^/rolist\+easylist\.(.+) /rolist+easylist-minified.$1 break;	117 rewrite ^/rolist\+easylist\.(.+) /rolist+easylist-minified.$1 break;

118 rewrite ^/ruadlist\+easylist\.(.+) /ruadlist+easylist-minified.$1 break;	118 rewrite ^/ruadlist\+easylist\.(.+) /ruadlist+easylist-minified.$1 break;

119 }	119 }

120	120

121 ### http://hub.eyeo.com/issues/3924 for Chinese SBrowser video exceptions (4/4)	121 ### http://hub.eyeo.com/issues/3924 for Chinese SBrowser video exceptions (4/4)

122 if ($use_alternative_resource_flags = "SBROWSER+ABPSBROWSER+CN")	122 if ($use_alternative_resource_flags = "SBROWSER+ABPSBROWSER+CN")

123 {	123 {

124 rewrite ^/easylistchina\+easylist\.(.+) /easylistchina+easylistchina_complianc e+easylist.$1 break;	124 rewrite ^/easylistchina\+easylist\.(.+) /easylistchina+easylistchina_complianc e+easylist.$1 break;

125 }	125 }

LEFT	RIGHT