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

Side by Side Diff: modules/statsmaster/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.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/statsmaster/files/logrotate ('k') | modules/statsmaster/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 server { 1 keepalive_timeout 0;
2 listen 80 default_server; 2 root /var/www/stats;
3 listen [::]:80 default_server; 3
4 server_name stats.adblockplus.org; 4 location /static
5 location / { 5 {
6 rewrite (.*) https://stats.adblockplus.org$1 permanent; 6 root /opt/sitescripts/sitescripts/stats;
7 }
8 } 7 }
9 8
10 server { 9 location /download
11 listen 443 ssl default_server; 10 {
12 listen [::]:443 ssl default_server; 11 auth_basic "Stats Restricted Access";
13 server_name stats.adblockplus.org; 12 auth_basic_user_file /var/www/htpasswd;
14 ssl_certificate sites-available/adblockplus.org_sslcert.pem; 13 }
15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
16 14
17 error_page 500 502 503 504 /50x.html; 15 location /update
18 location = /50x.html { 16 {
19 root html; 17 auth_basic "Stats Restricted Access";
20 } 18 auth_basic_user_file /var/www/htpasswd;
19 }
21 20
22 access_log /var/log/nginx/access_log_stats main; 21 location /notification
23 keepalive_timeout 0; 22 {
24 root /var/www/stats; 23 auth_basic "Stats Restricted Access";
24 auth_basic_user_file /var/www/htpasswd;
25 }
25 26
26 location /static { 27 location /raw
27 root /opt/sitescripts/sitescripts/stats; 28 {
28 } 29 alias /var/www/statsdata;
29 30 auth_basic "Stats Restricted Access";
30 location /download { 31 auth_basic_user_file /var/www/htpasswd;
31 auth_basic "Stats Restricted Access";
32 auth_basic_user_file /var/www/htpasswd;
33 }
34
35 location /update {
36 auth_basic "Stats Restricted Access";
37 auth_basic_user_file /var/www/htpasswd;
38 }
39
40 location /notification {
41 auth_basic "Stats Restricted Access";
42 auth_basic_user_file /var/www/htpasswd;
43 }
44
45 location /raw {
46 alias /var/www/statsdata;
47 auth_basic "Stats Restricted Access";
48 auth_basic_user_file /var/www/htpasswd;
49 }
50 } 32 }
OLDNEW
« no previous file with comments | « modules/statsmaster/files/logrotate ('k') | modules/statsmaster/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld