Skip to content

Commit d33bdd2

Browse files
committed
Update VirtualHost Prevention XMLPRC
1 parent 05a0dce commit d33bdd2

File tree

253 files changed

+7103
-2354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+7103
-2354
lines changed

createvhosts.py

+28-17
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ def writeconfded(user, domain, docroot, passedip, alias):
3333
pagespeed FileCachePath /var/ngx_pagespeed_cache;
3434
pagespeed RewriteLevel CoreFilters;
3535
pagespeed EnableFilters collapse_whitespace,remove_comments,extend_cache,combine_css,combine_javascript;
36+
pagespeed EnableFilters convert_png_to_jpeg;
3637
3738
location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
38-
add_header "" "";
39-
}
39+
add_header "" "";
40+
}
4041
4142
location ~ "^/ngx_pagespeed_static/" { }
4243
location ~ "^/ngx_pagespeed_beacon$" { }
@@ -47,29 +48,38 @@ def writeconfded(user, domain, docroot, passedip, alias):
4748
4849
#location / {
4950
location ~*.*\.(3gp|gif|jpg|jpeg|png|ico|wmv|avi|asf|asx|mpg|mpeg|mp4|pls|mp3|mid|wav|swf|flv|html|htm|txt|js|css|exe|zip|tar|rar|gz|tgz|bz2|uha|7z|doc|docx|xls|xlsx|pdf|iso)$ {
50-
expires 1M;
51-
try_files $uri @backend;
51+
expires 1M;
52+
try_files $uri @backend;
5253
}
54+
5355
location / {
54-
error_page 405 = @backend;
55-
add_header X-Cache "HIT from Backend";
56-
proxy_pass http://%s:8080;
57-
include proxy.inc;
58-
include microcache.inc;
56+
error_page 405 = @backend;
57+
add_header X-Cache "HIT from Backend";
58+
proxy_pass http://%s:8080;
59+
include proxy.inc;
60+
include microcache.inc;
5961
}
62+
6063
location @backend {
61-
internal;
62-
proxy_pass http://%s:8080;
63-
include proxy.inc;
64-
include microcache.inc;
64+
internal;
65+
proxy_pass http://%s:8080;
66+
include proxy.inc;
67+
include microcache.inc;
6568
}
69+
6670
location ~ .*\.(php|jsp|cgi|pl|py)?$ {
67-
proxy_pass http://%s:8080;
68-
include proxy.inc;
69-
include microcache.inc;
71+
proxy_pass http://%s:8080;
72+
include proxy.inc;
73+
include microcache.inc;
7074
}
75+
7176
location ~ /\.ht {
72-
deny all;
77+
deny all;
78+
}
79+
80+
location /xmlrpc.php {
81+
#allow 192.168.1.0/24;
82+
deny all;
7383
}
7484
}""" % (docroot, passedip, domain, alias, passedip, wildcard_safe(domain) + "-bytes_log", wildcard_safe(domain), docroot, passedip, passedip, passedip)
7585
if not os.path.exists( '/etc/nginx/vhosts'):
@@ -94,6 +104,7 @@ def writeconfshared(user,domain,docroot,passedip, alias):
94104
pagespeed FileCachePath /var/ngx_pagespeed_cache;
95105
pagespeed RewriteLevel CoreFilters;
96106
pagespeed EnableFilters collapse_whitespace,remove_comments,extend_cache,combine_css,combine_javascript;
107+
pagespeed EnableFilters convert_png_to_jpeg;
97108
98109
location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
99110
add_header "" "";

createvhostsssl.py

+30-19
Original file line numberDiff line numberDiff line change
@@ -97,45 +97,54 @@ def re_range_crt(f, crt_start, crt_end):
9797
pagespeed FileCachePath /var/ngx_pagespeed_cache;
9898
pagespeed RewriteLevel CoreFilters;
9999
pagespeed EnableFilters collapse_whitespace,remove_comments,extend_cache,combine_css,combine_javascript;
100+
pagespeed EnableFilters convert_png_to_jpeg;
101+
100102
location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
101-
add_header "" "";
102-
}
103-
location ~ "^/ngx_pagespeed_static/" { }
103+
add_header "" "";
104+
}
105+
106+
location ~ "^/ngx_pagespeed_static/" { }
104107
location ~ "^/ngx_pagespeed_beacon$" { }
105-
pagespeed Statistics on;
108+
109+
pagespeed Statistics on;
106110
pagespeed StatisticsLogging on;
107111
pagespeed LogDir /var/log/pagespeed;
108112
109113
#location / {
110114
location ~*.*\.(3gp|gif|jpg|jpeg|png|ico|wmv|avi|asf|asx|mpg|mpeg|mp4|pls|mp3|mid|wav|swf|flv|html|htm|txt|js|css|exe|zip|tar|rar|gz|tgz|bz2|uha|7z|doc|docx|xls|xlsx|pdf|iso)$ {
111-
expires 1M;
112-
try_files $uri @backend;
115+
expires 1M;
116+
try_files $uri @backend;
113117
}
114118
115119
location / {
116-
error_page 405 = @backend;
117-
add_header X-Cache "HIT from Backend";
118-
proxy_pass https://%s:8443;
119-
include proxy.inc;
120-
include microcache.inc;
120+
error_page 405 = @backend;
121+
add_header X-Cache "HIT from Backend";
122+
proxy_pass https://%s:8443;
123+
include proxy.inc;
124+
include microcache.inc;
121125
}
122126
123127
location @backend {
124-
internal;
125-
proxy_pass https://%s:8443;
126-
include proxy.inc;
127-
include microcache.inc;
128+
internal;
129+
proxy_pass https://%s:8443;
130+
include proxy.inc;
131+
include microcache.inc;
128132
}
129133
130134
location ~ .*\.(php|jsp|cgi|pl|py)?$ {
131-
proxy_pass https://%s:8443;
132-
include proxy.inc;
133-
include microcache.inc;
135+
proxy_pass https://%s:8443;
136+
include proxy.inc;
137+
include microcache.inc;
134138
}
135139
136140
location ~ /\.ht {
137-
deny all;
141+
deny all;
138142
}
143+
144+
location /xmlrpc.php {
145+
#allow 192.168.1.0/24;
146+
deny all;
147+
}
139148
}""" % (docroot, passedip, domain, alias, passedip, wildcard_safe(domain) + "-bytes_log", wildcard_safe(domain), docroot, domain, domain, passedip, passedip, passedip)
140149
if not os.path.exists( '/etc/nginx/vhosts'):
141150
os.makedirs('/etc/nginx/vhosts')
@@ -231,6 +240,8 @@ def re_range_crt(f, crt_start, crt_end):
231240
pagespeed FileCachePath /var/ngx_pagespeed_cache;
232241
pagespeed RewriteLevel CoreFilters;
233242
pagespeed EnableFilters collapse_whitespace,remove_comments,extend_cache,combine_css,combine_javascript;
243+
pagespeed EnableFilters convert_png_to_jpeg;
244+
234245
location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
235246
add_header "" "";
236247
}

nginx-1.14.0/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
default: build
33

44
clean:
5-
rm -rf Makefile objs
5+
rm -rf Makefile nginx-1.14.0
66

77
build:
8-
$(MAKE) -f objs/Makefile
8+
$(MAKE) -f nginx-1.14.0/Makefile
99

1010
install:
11-
$(MAKE) -f objs/Makefile install
11+
$(MAKE) -f nginx-1.14.0/Makefile install
1212

1313
modules:
14-
$(MAKE) -f objs/Makefile modules
14+
$(MAKE) -f nginx-1.14.0/Makefile modules
1515

1616
upgrade:
1717
/usr/local/sbin -t

0 commit comments

Comments
 (0)