Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 | 1 |
| 2 ssl_protocols TLSv1 TLSv1.1 TLSv1.2; | 2 ssl_protocols TLSv1 TLSv1.1 TLSv1.2; |
| 3 ssl_ciphers 'AES128+EECDH:AES128+EDH'; | 3 ssl_ciphers 'AES128+EECDH:AES128+EDH'; |
| 4 ssl_prefer_server_ciphers on; | 4 ssl_prefer_server_ciphers on; |
| 5 ssl_session_cache shared:SSL:10m; | 5 ssl_session_cache shared:SSL:10m; |
| 6 | 6 |
| 7 ssl_certificate /etc/nginx/ssl/skia_org.pem; | 7 ssl_certificate /etc/nginx/ssl/skia_org.pem; |
| 8 ssl_certificate_key /etc/nginx/ssl/skia_org.key; | 8 ssl_certificate_key /etc/nginx/ssl/skia_org.key; |
| 9 | 9 |
| 10 proxy_connect_timeout 5m; | 10 proxy_connect_timeout 5m; |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 440 error_log /var/log/nginx/bugchomper.error.log error; | 440 error_log /var/log/nginx/bugchomper.error.log error; |
| 441 | 441 |
| 442 if ( $host != 'bugchomper.skia.org' ) { | 442 if ( $host != 'bugchomper.skia.org' ) { |
| 443 rewrite ^/(.*)$ https://bugchomper.skia.org/$1 permanent; | 443 rewrite ^/(.*)$ https://bugchomper.skia.org/$1 permanent; |
| 444 } | 444 } |
| 445 | 445 |
| 446 location / { | 446 location / { |
| 447 proxy_pass http://skia-bugchomper:8050; | 447 proxy_pass http://skia-bugchomper:8050; |
| 448 } | 448 } |
| 449 } | 449 } |
| 450 | |
| 451 ##### internal.skia.org ########################### | |
| 452 server { | |
| 453 listen 443; | |
| 454 server_name internal.skia.org; | |
| 455 | |
| 456 access_log /var/log/nginx/internal.access.log; | |
| 457 error_log /var/log/nginx/internal.error.log error; | |
| 458 | |
| 459 ssl on; | |
| 460 | |
| 461 if ( $host != 'internal.skia.org' ) { | |
|
stephana
2015/08/27 14:31:32
This if block should not be necessary (here or mos
jcgregorio
2015/08/27 14:33:31
Done.
| |
| 462 rewrite ^/(.*)$ https://internal.skia.org/$1 permanent; | |
| 463 } | |
| 464 | |
| 465 location / { | |
| 466 proxy_pass http://skia-internal:8000; | |
| 467 } | |
| 468 } | |
| 469 | |
| 470 server { | |
| 471 listen 80; | |
| 472 server_name internal.skia.org; | |
| 473 return 301 https://internal.skia.org$request_uri; | |
| 474 } | |
| 475 | |
| 476 | |
| 450 server { | 477 server { |
| 451 listen 80; | 478 listen 80; |
| 452 server_name bugchomper.skia.org; | 479 server_name bugchomper.skia.org; |
| 453 return 301 https://bugchomper.skia.org$request_uri; | 480 return 301 https://bugchomper.skia.org$request_uri; |
| 454 } | 481 } |
| 455 | 482 |
| OLD | NEW |