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

Side by Side Diff: modules/nagios/templates/site.erb

Issue 10630004: Make all our applications work with Nginx 1.4.1 (Closed)
Patch Set: Created May 22, 2013, 4:47 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
OLDNEW
1 server { 1 server {
2 listen 80;
2 listen [::]:80; 3 listen [::]:80;
3 server_name '<%= vhost %>'; 4 server_name '<%= vhost %>';
4 5
5 location / { 6 location / {
6 rewrite (.*) https://<%= vhost %>$1 permanent; 7 rewrite (.*) https://<%= vhost %>$1 permanent;
7 } 8 }
8 } 9 }
9 10
10 server { 11 server {
12 listen 443 ssl;
11 listen [::]:443 ssl; 13 listen [::]:443 ssl;
12 ssl_certificate sites-available/adblockplus.org_sslcert.pem; 14 ssl_certificate sites-available/adblockplus.org_sslcert.pem;
13 ssl_certificate_key sites-available/adblockplus.org_sslcert.key; 15 ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
14 16
15 server_name '<%= vhost %>'; 17 server_name '<%= vhost %>';
16 18
17 expires 31d; 19 expires 31d;
18 20
19 root /usr/share/nagios3/htdocs; 21 root /usr/share/nagios3/htdocs;
20 index index.php index.html; 22 index index.php index.html;
(...skipping 28 matching lines...) Expand all
49 51
50 fastcgi_param AUTH_USER $remote_user; 52 fastcgi_param AUTH_USER $remote_user;
51 fastcgi_param REMOTE_USER $remote_user; 53 fastcgi_param REMOTE_USER $remote_user;
52 fastcgi_param SCRIPT_FILENAME /usr/lib/cgi-bin/nagios3$fastcgi_script_name; 54 fastcgi_param SCRIPT_FILENAME /usr/lib/cgi-bin/nagios3$fastcgi_script_name;
53 55
54 fastcgi_pass unix:/var/run/fcgiwrap.socket; 56 fastcgi_pass unix:/var/run/fcgiwrap.socket;
55 } 57 }
56 58
57 location ~ \.php$ { 59 location ~ \.php$ {
58 include /etc/nginx/fastcgi_params; 60 include /etc/nginx/fastcgi_params;
61 fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
Felix Dahlke 2013/05/22 04:50:28 This took quite a while to figure out, any idea wh
Wladimir Palant 2013/05/22 06:22:31 This is actually the proper solution, FastCGI does
Felix Dahlke 2013/05/22 06:59:49 Done. Don't really get why this wasn't necessary w
59 fastcgi_pass unix:/tmp/php-fastcgi.sock; 62 fastcgi_pass unix:/tmp/php-fastcgi.sock;
60 } 63 }
61 } 64 }
OLDNEW

Powered by Google App Engine
This is Rietveld