From 28d3988e5fdb1700bf9f1aa2c435bc760ff71e1f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 13 Jun 2016 16:10:41 +0200
Subject: Revert "up"

This reverts commit bc062fbb650df939c93d88520e822e9df8abc4be.
---
 conf/alt-servers |  3 +++
 conf/server.conf | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/alt-servers b/conf/alt-servers
index 8b13789..fd2f2ec 100644
--- a/conf/alt-servers
+++ b/conf/alt-servers
@@ -1 +1,4 @@
+192.168.100.10 Some alt server
++192.168.100.100 My first alt server that will not be used for replication
+-192.168.100.50 Super sectret alt server that will be used for replication, but clients don't know about it
 
diff --git a/conf/server.conf b/conf/server.conf
index d50c78d..c32d907 100644
--- a/conf/server.conf
+++ b/conf/server.conf
@@ -2,17 +2,17 @@
 ; port to listen on (default: 5003)
 listenPort=5003
 ; relative root directory for images, ending in .r[1-9][0-9]*
-basePath=/media/data/dnbd3
+basePath=/mnt/storage/dnbd3
 ; artificial connection delay for connecting servers
 serverPenalty=100000
 ; artificial connection delay for connecting clients
 clientPenalty=0
 ; is this server a proxy? if true, requests for non-existing images will be relayed to known alt-servers
-isProxy=false
+isProxy=true
 ; if proxy is true and an image is incomplete, should idle bandwidth be used to replicate missing blocks?
-backgroundReplication=false
+backgroundReplication=true
 ; if true (which is the default), images will automatically be removed from the list if they can't be accessed
-removeMissingImages=false
+removeMissingImages=true
 ; timeout in ms for send/recv on connections to uplink servers (used for replication)
 uplinkTimeout=1250
 ; timeout in ms for send/recv on connections to clients (using an image on this server)
@@ -23,7 +23,7 @@ clientTimeout=15000
 ; log file path and name
 ; comment out to disable logging to file
 ; protip: use SIGUSR2 to reopen log file
-file=/home/joe/dev/dnbd3/dnbd3.log
+file=./dnbd3.log
 ; which type of messages to log to file
 fileMask=ERROR WARNING MINOR INFO DEBUG1
 ; which to log to console (stdout)
-- 
cgit v1.2.3-55-g7522