Side by Side Diff: modules/updateserver/files/site.conf
Issue 5734493784637440:
Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set: Converted Nagios site configuration and centralized error page configuration
Created April 10, 2014, 6:40 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/updateserver/files/logrotate ('k')
|
modules/updateserver/manifests/init.pp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 server { | 1 keepalive_timeout 0; |
| 2 listen 80 default_server; | 2 root /var/www/update; |
| 3 listen [::]:80 default_server; | |
| 4 server_name update.adblockplus.org; | |
| 5 location / { | |
| 6 rewrite (.*) https://update.adblockplus.org$1 permanent; | |
| 7 } | |
| 8 } | |
| 9 | |
| 10 server { | |
| 11 listen 443 ssl default_server; | |
| 12 listen [::]:443 ssl default_server; | |
| 13 server_name update.adblockplus.org; | |
| 14 ssl_certificate sites-available/adblockplus.org_sslcert.pem; | |
| 15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key; | |
| 16 | |
| 17 error_page 500 502 503 504 /50x.html; | |
| 18 location = /50x.html { | |
| 19 root html; | |
| 20 } | |
| 21 | |
| 22 access_log /var/log/nginx/access_log_update main; | |
| 23 keepalive_timeout 0; | |
| 24 root /var/www/update; | |
| 25 } | |
| OLD | NEW |
« no previous file with comments
|
« modules/updateserver/files/logrotate ('k')
|
modules/updateserver/manifests/init.pp » ('j')
|
no next file with comments »
