Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/discourse/files/intraforum.adblockplus.org

Issue 10630004: Make all our applications work with Nginx 1.4.1 (Closed)
Patch Set: Created May 22, 2013, 4:47 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | modules/nagios/templates/site.erb » ('j') | modules/nagios/templates/site.erb » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 upstream discourse { 1 upstream discourse {
2 server unix:///tmp/discourse-thin.sock; 2 server unix:///tmp/discourse-thin.sock;
3 } 3 }
4 4
5 server { 5 server {
6 listen 80; 6 listen 80;
7 listen [::]:80; 7 listen [::]:80;
8 server_name intraforum.adblockplus.org; 8 server_name intraforum.adblockplus.org;
9 location / { 9 location / {
10 rewrite (.*) https://intraforum.adblockplus.org$1 permanent; 10 rewrite (.*) https://intraforum.adblockplus.org$1 permanent;
11 } 11 }
12 } 12 }
13 server { 13 server {
14 listen 443 ssl;
14 listen [::]:443 ssl; 15 listen [::]:443 ssl;
15 server_name intraforum.adblockplus.org; 16 server_name intraforum.adblockplus.org;
16 ssl_certificate sites-available/adblockplus.org_sslcert.pem; 17 ssl_certificate sites-available/adblockplus.org_sslcert.pem;
17 ssl_certificate_key sites-available/adblockplus.org_sslcert.key; 18 ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
18 19
19 gzip on; 20 gzip on;
20 gzip_min_length 1000; 21 gzip_min_length 1000;
21 gzip_types application/json text/css application/x-javascript; 22 gzip_types application/json text/css application/x-javascript;
22 23
23 sendfile on; 24 sendfile on;
(...skipping 24 matching lines...) Expand all
48 proxy_set_header X-Real-IP $remote_addr; 49 proxy_set_header X-Real-IP $remote_addr;
49 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 50 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
50 proxy_set_header X-Forwarded-Proto $scheme; 51 proxy_set_header X-Forwarded-Proto $scheme;
51 proxy_set_header Host $http_host; 52 proxy_set_header Host $http_host;
52 if (!-f $request_filename) { 53 if (!-f $request_filename) {
53 proxy_pass http://discourse; 54 proxy_pass http://discourse;
54 break; 55 break;
55 } 56 }
56 } 57 }
57 } 58 }
OLDNEW
« no previous file with comments | « no previous file | modules/nagios/templates/site.erb » ('j') | modules/nagios/templates/site.erb » ('J')

Powered by Google App Engine
This is Rietveld