Unified Diff: modules/statsmaster/files/site.conf
Issue 5734493784637440:
Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set:
Created April 2, 2014, 2:05 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/notificationserver/files/site.conf ('K')
|
« modules/statsmaster/files/logrotate ('k')
|
modules/statsmaster/manifests/init.pp » ('j')
|
modules/trac/files/site.conf » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/statsmaster/files/site.conf |
| =================================================================== |
| rename from modules/statsmaster/files/stats.adblockplus.org |
| rename to modules/statsmaster/files/site.conf |
| --- a/modules/statsmaster/files/stats.adblockplus.org |
| +++ b/modules/statsmaster/files/site.conf |
| @@ -1,50 +1,32 @@ |
| -server { |
| - listen 80 default_server; |
| - listen [::]:80 default_server; |
| - server_name stats.adblockplus.org; |
| - location / { |
| - rewrite (.*) https://stats.adblockplus.org$1 permanent; |
| - } |
| +error_page 500 502 503 504 /50x.html; |
| +location = /50x.html { |
| + root html; |
| } |
| -server { |
| - listen 443 ssl default_server; |
| - listen [::]:443 ssl default_server; |
| - server_name stats.adblockplus.org; |
| - ssl_certificate sites-available/adblockplus.org_sslcert.pem; |
| - ssl_certificate_key sites-available/adblockplus.org_sslcert.key; |
| +keepalive_timeout 0; |
| +root /var/www/stats; |
| - error_page 500 502 503 504 /50x.html; |
| - location = /50x.html { |
| - root html; |
| - } |
| +location /static { |
| + root /opt/sitescripts/sitescripts/stats; |
| +} |
| - access_log /var/log/nginx/access_log_stats main; |
| - keepalive_timeout 0; |
| - root /var/www/stats; |
| +location /download { |
| + auth_basic "Stats Restricted Access"; |
| + auth_basic_user_file /var/www/htpasswd; |
| +} |
| - location /static { |
| - root /opt/sitescripts/sitescripts/stats; |
| - } |
| +location /update { |
| + auth_basic "Stats Restricted Access"; |
| + auth_basic_user_file /var/www/htpasswd; |
| +} |
| - location /download { |
| - auth_basic "Stats Restricted Access"; |
| - auth_basic_user_file /var/www/htpasswd; |
| - } |
| +location /notification { |
| + auth_basic "Stats Restricted Access"; |
| + auth_basic_user_file /var/www/htpasswd; |
| +} |
| - location /update { |
| - auth_basic "Stats Restricted Access"; |
| - auth_basic_user_file /var/www/htpasswd; |
| - } |
| - |
| - location /notification { |
| - auth_basic "Stats Restricted Access"; |
| - auth_basic_user_file /var/www/htpasswd; |
| - } |
| - |
| - location /raw { |
| - alias /var/www/statsdata; |
| - auth_basic "Stats Restricted Access"; |
| - auth_basic_user_file /var/www/htpasswd; |
| - } |
| +location /raw { |
| + alias /var/www/statsdata; |
| + auth_basic "Stats Restricted Access"; |
| + auth_basic_user_file /var/www/htpasswd; |
| } |
