summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2016-03-02 15:48:45 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2016-03-02 15:48:45 +0100
commit0dd68fd58514cc7f900407c80b798de9424df80f (patch)
tree07dfc8133fb8d347abb49ae3aa31dc89235188a2
parent046846f61bdf5ffa9f8a1182d5038ad34768b0a1 (diff)
downloaddeployment-0dd68fd58514cc7f900407c80b798de9424df80f.tar.gz
deployment-0dd68fd58514cc7f900407c80b798de9424df80f.tar.bz2
deployment-0dd68fd58514cc7f900407c80b798de9424df80f.zip
setting bank@demo-ssl up
-rw-r--r--etc/nginx/sites-enabled/bank-demo-ssl.site11
-rw-r--r--etc/nginx/sites-enabled/bank-test-ssl.site2
-rw-r--r--etc/nginx/sites-enabled/bank-test.site4
3 files changed, 8 insertions, 9 deletions
diff --git a/etc/nginx/sites-enabled/bank-demo-ssl.site b/etc/nginx/sites-enabled/bank-demo-ssl.site
index e682d08..db684f9 100644
--- a/etc/nginx/sites-enabled/bank-demo-ssl.site
+++ b/etc/nginx/sites-enabled/bank-demo-ssl.site
@@ -1,6 +1,5 @@
server {
listen 443 ssl; ## listen for ipv4; this line is default and implied
- # listen [::]:80 default_server ipv6only=on; ## listen for ipv6
root /home/demo/bank/website;
index index.php;
@@ -17,11 +16,11 @@ server {
add_header Strict-Transport-Security "max-age=63072000; preload";
- location ~ \.php$ {
- fastcgi_pass unix:/var/run/php5-fpm.sock;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- include fastcgi_params;
- }
+ location / {
+ uwsgi_pass django-demo;
+ include /home/demo/bank/TalerBank/uwsgi_params;
+ }
+
rewrite ^/shop $scheme://shop.demo.taler.net/ redirect;
diff --git a/etc/nginx/sites-enabled/bank-test-ssl.site b/etc/nginx/sites-enabled/bank-test-ssl.site
index d88038d..f766fee 100644
--- a/etc/nginx/sites-enabled/bank-test-ssl.site
+++ b/etc/nginx/sites-enabled/bank-test-ssl.site
@@ -14,7 +14,7 @@ server {
add_header Strict-Transport-Security "max-age=63072000; preload";
location / {
- uwsgi_pass django;
+ uwsgi_pass django-test;
include /home/test/bank/TalerBank/uwsgi_params;
}
diff --git a/etc/nginx/sites-enabled/bank-test.site b/etc/nginx/sites-enabled/bank-test.site
index ffb7f7a..5972516 100644
--- a/etc/nginx/sites-enabled/bank-test.site
+++ b/etc/nginx/sites-enabled/bank-test.site
@@ -1,4 +1,4 @@
-upstream django {
+upstream django-test {
server 127.0.0.1:8000;
}
@@ -8,7 +8,7 @@ server {
server_name bank.test.taler.net;
location / {
- uwsgi_pass django;
+ uwsgi_pass django-test;
include /home/test/bank/TalerBank/uwsgi_params;
}