nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the production nginx forwards non-ssl requests to use ssl

Browse source
This commit is contained in:
zhitomirskiyi 2010-11-15 13:56:26 -08:00
parent 0f1517af15
commit eb8b35f222
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chef/cookbooks/common/templates/default/nginx.conf.erb
View file

@ -27,7 +27,7 @@ http {
gzip_comp_level 2; gzip_comp_level 2;
gzip_proxied any; gzip_proxied any;
gzip_buffers 16 8k; gzip_buffers 16 8k;
gzip_types text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript; gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
gzip_disable "MSIE [1-6]\.(?!.*SV1)"; gzip_disable "MSIE [1-6]\.(?!.*SV1)";
@ -38,28 +38,9 @@ http {
} }
server { server {
listen 80; listen 80;
server_name alpha.joindiaspora.com www.alpha.joindiaspora.com; server_name alpha.joindiaspora.com www.alpha.joindiaspora.com;
root /usr/local/app/diaspora/public; rewrite ^(.*) https://alpha.joindiaspora.com$1 permanent;
location / {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_buffering off;
if (-f $request_filename/index.html) {
rewrite (.*) $1/index.html break;
}
if (-f $request_filename.html) {
rewrite (.*) $1.html break;
}
if (!-f $request_filename) {
proxy_pass http://thin_cluster;
break;
}
} }
server { server {
@ -69,8 +50,8 @@ http {
root /usr/local/app/diaspora/public; root /usr/local/app/diaspora/public;
ssl on; ssl on;
ssl_certificate /usr/local/nginx/conf/joindiaspora.crt; ssl_certificate /usr/local/nginx/conf/diaspora.crt;
ssl_key /usr/local/nginx/conf/joindiaspora.key; ssl_certificate_key /usr/local/nginx/conf/diaspora.key;
location / { location / {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;