summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/demo.taler.net/taler.conf2
-rw-r--r--config/test.taler.net/taler.conf2
-rw-r--r--etc/nginx/sites-enabled/default.site8
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;
+}