diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-03-02 12:45:33 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-03-02 12:45:33 +0100 |
| commit | 72e1235ea1be270c6d692fda4bba87ab38a1733c (patch) | |
| tree | 13bb3a9685749167d99a74c4182291c79e74b13a /etc | |
| parent | 3190e0f5e2c98195c7848b822591fdfe19c537ab (diff) | |
| download | deployment-72e1235ea1be270c6d692fda4bba87ab38a1733c.tar.gz deployment-72e1235ea1be270c6d692fda4bba87ab38a1733c.tar.bz2 deployment-72e1235ea1be270c6d692fda4bba87ab38a1733c.zip | |
removing PHP bank @test
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/nginx/sites-enabled/bank-test-ssl.site | 13 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/bank-test.site | 21 |
2 files changed, 5 insertions, 29 deletions
diff --git a/etc/nginx/sites-enabled/bank-test-ssl.site b/etc/nginx/sites-enabled/bank-test-ssl.site index 5975adc..d88038d 100644 --- a/etc/nginx/sites-enabled/bank-test-ssl.site +++ b/etc/nginx/sites-enabled/bank-test-ssl.site @@ -1,9 +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/test/bank/website; - index index.php; # Make site accessible from http://localhost/ server_name bank.test.taler.net; @@ -17,11 +13,10 @@ 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; + include /home/test/bank/TalerBank/uwsgi_params; + } rewrite ^/shop $scheme://shop.test.taler.net/ redirect; rewrite ^/mint $scheme://mint.demo.taler.net/ redirect; diff --git a/etc/nginx/sites-enabled/bank-test.site b/etc/nginx/sites-enabled/bank-test.site index 2664780..ffb7f7a 100644 --- a/etc/nginx/sites-enabled/bank-test.site +++ b/etc/nginx/sites-enabled/bank-test.site @@ -4,29 +4,10 @@ upstream django { server { listen 80; ## listen for ipv4; this line is default and implied - # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 - root /home/test/bank/website; - index index.php; - - # Make site accessible from http://localhost/ server_name bank.test.taler.net; - location ~ \.php$ { - fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - } - - location ~ ^/auth/static { - rewrite /auth/static/(.*) /static/$1 break; - uwsgi_pass django; - include /home/test/bank/TalerBank/uwsgi_params; - - } - - # Reach Django - location ~ ^/(auth|admin|static) { + location / { uwsgi_pass django; include /home/test/bank/TalerBank/uwsgi_params; } |