diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-04 13:44:46 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-04 13:44:46 +0100 |
| commit | 07e336854803a140f39b8372c004830e65c55820 (patch) | |
| tree | 09a5b0204af9d3e3103629f55b527437f0d3c7ec | |
| parent | f5d9f86d70baf2a2ea848194c108f35fc843e964 (diff) | |
| parent | 26589a66d312a5777e9b79ce174ae0897c25359b (diff) | |
| download | deployment-07e336854803a140f39b8372c004830e65c55820.tar.gz deployment-07e336854803a140f39b8372c004830e65c55820.tar.bz2 deployment-07e336854803a140f39b8372c004830e65c55820.zip | |
Merge branch 'master' of taler.net:deployment
| -rw-r--r-- | config/test.taler.net/taler.conf | 1 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/test.site | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf index 63efbc8..dcb4e63 100644 --- a/config/test.taler.net/taler.conf +++ b/config/test.taler.net/taler.conf @@ -8,7 +8,6 @@ CURRENCY = PUDOS [bank] uwsgi_serve = unix -uwsgi_unixpath = $HOME/sockets/bank.uwsgi database = talertest [bank-admin] diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site index dbfc748..3d363ab 100644 --- a/etc/nginx/sites-enabled/test.site +++ b/etc/nginx/sites-enabled/test.site @@ -101,16 +101,12 @@ server { include conf.d/talerssl; location /admin/add/incoming { - allow 127.0.0.1; - allow 131.254.145.3; - allow 2001:660:7303:145::2; - deny all; - uwsgi_pass unix:/home/test/sockets/bank.uwsgi; + uwsgi_pass unix:/tmp/bank-admin.uwsgi; include /etc/nginx/uwsgi_params; } location / { - uwsgi_pass unix:/home/test/sockets/bank.uwsgi; + uwsgi_pass unix:/tmp/bank.uwsgi; include /etc/nginx/uwsgi_params; } |