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

Side by Side Diff: modules/statsmaster/files/stats.adblockplus.org

Issue 11468051: Update stats processing (Closed)
Patch Set: Dropped Jinja2 requirement Created Aug. 29, 2013, 9:06 p.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/statsclient/manifests/init.pp ('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 server {
2 listen 80 default_server; 2 listen 80 default_server;
3 listen [::]:80 default_server; 3 listen [::]:80 default_server;
4 server_name stats.adblockplus.org; 4 server_name stats.adblockplus.org;
5 location / { 5 location / {
6 rewrite (.*) https://stats.adblockplus.org$1 permanent; 6 rewrite (.*) https://stats.adblockplus.org$1 permanent;
7 } 7 }
8 } 8 }
9 9
10 server { 10 server {
11 listen 443 ssl default_server; 11 listen 443 ssl default_server;
12 listen [::]:443 ssl default_server; 12 listen [::]:443 ssl default_server;
13 server_name stats.adblockplus.org; 13 server_name stats.adblockplus.org;
14 ssl_certificate sites-available/adblockplus.org_sslcert.pem; 14 ssl_certificate sites-available/adblockplus.org_sslcert.pem;
15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key; 15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
16 16
17 error_page 500 502 503 504 /50x.html; 17 error_page 500 502 503 504 /50x.html;
18 location = /50x.html { 18 location = /50x.html {
19 root html; 19 root html;
20 } 20 }
21 21
22 access_log /var/log/nginx/access_log_stats main; 22 access_log /var/log/nginx/access_log_stats main;
23 keepalive_timeout 0; 23 keepalive_timeout 0;
24 root /var/www/stats; 24 root /var/www/stats;
25 25
26 location /static { 26 location /static {
27 root /opt/sitescripts/sitescripts/stats; 27 root /opt/sitescripts/sitescripts/stats;
28 } 28 }
29 29
30 location /download 30 location /download {
31 {
32 auth_basic "Stats Restricted Access"; 31 auth_basic "Stats Restricted Access";
33 auth_basic_user_file /var/www/htpasswd; 32 auth_basic_user_file /var/www/htpasswd;
34 } 33 }
35 34
36 location /update 35 location /update {
37 {
38 auth_basic "Stats Restricted Access"; 36 auth_basic "Stats Restricted Access";
39 auth_basic_user_file /var/www/htpasswd; 37 auth_basic_user_file /var/www/htpasswd;
40 } 38 }
41 39
42 location /notification 40 location /notification {
43 {
44 auth_basic "Stats Restricted Access"; 41 auth_basic "Stats Restricted Access";
45 auth_basic_user_file /var/www/htpasswd; 42 auth_basic_user_file /var/www/htpasswd;
46 } 43 }
47 } 44 }
OLDNEW
« no previous file with comments | « modules/statsclient/manifests/init.pp ('k') | modules/statsmaster/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld