taler-deployment

commit 8d2725d611cd1dc17eaac1bd8738a0f1521fc6f0
parent a454ed951c4f5f661560bb56f3d2a57a2beb0099
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Tue, 31 May 2016 15:40:28 +0200

Merge branch 'master' of ssh://taler.net/var/git/deployment

Diffstat:
M
config/demo.taler.net/taler.conf
 | 
2
+-
M
config/test.taler.net/taler.conf
 | 
2
+-
A
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
@@ -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
@@ -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
@@ -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;
+}