diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-05-31 15:40:28 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-05-31 15:40:28 +0200 |
| commit | 8d2725d611cd1dc17eaac1bd8738a0f1521fc6f0 (patch) | |
| tree | 81f8f45308c06d8f64c359f6d8fe28ea57a35e09 | |
| parent | a454ed951c4f5f661560bb56f3d2a57a2beb0099 (diff) | |
| parent | 3cbfed3d2d72ac78b836c63a6f0bd3ae80f23c78 (diff) | |
| download | deployment-8d2725d611cd1dc17eaac1bd8738a0f1521fc6f0.tar.gz deployment-8d2725d611cd1dc17eaac1bd8738a0f1521fc6f0.tar.bz2 deployment-8d2725d611cd1dc17eaac1bd8738a0f1521fc6f0.zip | |
Merge branch 'master' of ssh://taler.net/var/git/deployment
| -rw-r--r-- | config/demo.taler.net/taler.conf | 2 | ||||
| -rw-r--r-- | config/test.taler.net/taler.conf | 2 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/default.site | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf index bf805db..c3e194e 100644 --- a/config/demo.taler.net/taler.conf +++ b/config/demo.taler.net/taler.conf @@ -27,7 +27,7 @@ WIREFORMAT = test SERVE = unix UNIXPATH = $HOME/sockets/merchant.http KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv -EDATE = 3 week +WIRE_TRANSFER_DELAY = 1 m [merchantdb-postgres] diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf index 39f9bfd..3d8c08c 100644 --- a/config/test.taler.net/taler.conf +++ b/config/test.taler.net/taler.conf @@ -27,7 +27,7 @@ WIREFORMAT = test SERVE = unix UNIXPATH = $HOME/sockets/merchant.http KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv -EDATE = 3 week +WIRE_TRANSFER_DELAY = 1 m [merchantdb-postgres] diff --git a/etc/nginx/sites-enabled/default.site b/etc/nginx/sites-enabled/default.site new file mode 100644 index 0000000..0fa4921 --- /dev/null +++ b/etc/nginx/sites-enabled/default.site @@ -0,0 +1,8 @@ +# matched when no other server name matches +server { + listen 80 default_server; + # server name must simply something invalid ... + server_name _; + # drop connection, special nginx status code + return 444; +} |