Unified 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.
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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/updateserver/files/site.conf |
| =================================================================== |
| rename from modules/updateserver/files/update.adblockplus.org |
| rename to modules/updateserver/files/site.conf |
| --- a/modules/updateserver/files/update.adblockplus.org |
| +++ b/modules/updateserver/files/site.conf |
| @@ -1,25 +1,2 @@ |
| -server { |
| - listen 80 default_server; |
| - listen [::]:80 default_server; |
| - server_name update.adblockplus.org; |
| - location / { |
| - rewrite (.*) https://update.adblockplus.org$1 permanent; |
| - } |
| -} |
| - |
| -server { |
| - listen 443 ssl default_server; |
| - listen [::]:443 ssl default_server; |
| - server_name update.adblockplus.org; |
| - ssl_certificate sites-available/adblockplus.org_sslcert.pem; |
| - ssl_certificate_key sites-available/adblockplus.org_sslcert.key; |
| - |
| - error_page 500 502 503 504 /50x.html; |
| - location = /50x.html { |
| - root html; |
| - } |
| - |
| - access_log /var/log/nginx/access_log_update main; |
| - keepalive_timeout 0; |
| - root /var/www/update; |
| -} |
| +keepalive_timeout 0; |
| +root /var/www/update; |
« no previous file with comments
|
« modules/updateserver/files/logrotate ('k')
|
modules/updateserver/manifests/init.pp » ('j')
|
no next file with comments »
