From a632fcc54051b58b6c2bd59de0188136c356d579 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 22 Mar 2016 14:57:06 +0100
Subject: [SERVER] Get rid of .sample for config files (saves you the rename
 orgy after install)

---
 conf/alt-servers        |  4 ++++
 conf/alt-servers.sample |  4 ----
 conf/server.conf        | 38 ++++++++++++++++++++++++++++++++++++++
 conf/server.conf.sample | 37 -------------------------------------
 4 files changed, 42 insertions(+), 41 deletions(-)
 create mode 100644 conf/alt-servers
 delete mode 100644 conf/alt-servers.sample
 create mode 100644 conf/server.conf
 delete mode 100644 conf/server.conf.sample

(limited to 'conf')

diff --git a/conf/alt-servers b/conf/alt-servers
new file mode 100644
index 0000000..fd2f2ec
--- /dev/null
+++ b/conf/alt-servers
@@ -0,0 +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/alt-servers.sample b/conf/alt-servers.sample
deleted file mode 100644
index fd2f2ec..0000000
--- a/conf/alt-servers.sample
+++ /dev/null
@@ -1,4 +0,0 @@
-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
new file mode 100644
index 0000000..c32d907
--- /dev/null
+++ b/conf/server.conf
@@ -0,0 +1,38 @@
+[dnbd3]
+; port to listen on (default: 5003)
+listenPort=5003
+; relative root directory for images, ending in .r[1-9][0-9]*
+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=true
+; if proxy is true and an image is incomplete, should idle bandwidth be used to replicate missing blocks?
+backgroundReplication=true
+; if true (which is the default), images will automatically be removed from the list if they can't be accessed
+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)
+clientTimeout=15000
+
+; Log related config
+[logging]
+; log file path and name
+; comment out to disable logging to file
+; protip: use SIGUSR2 to reopen log file
+file=./dnbd3.log
+; which type of messages to log to file
+fileMask=ERROR WARNING MINOR INFO DEBUG1
+; which to log to console (stdout)
+consoleMask=ERROR WARNING MINOR INFO
+; Valid types (warning: specifying invalid types will not yield an error!)
+; ERROR     Fatal error, server will terminate
+; WARNING   Major issue, something is broken but keep running
+; MINOR     Minor issue, more of a hickup than serious problem
+; INFO      Informational message
+; DEBUG1    Debug information, used for medium verbosity
+; DEBUG2    Used for debug messages that would show up a lot
+
diff --git a/conf/server.conf.sample b/conf/server.conf.sample
deleted file mode 100644
index 7ef10a3..0000000
--- a/conf/server.conf.sample
+++ /dev/null
@@ -1,37 +0,0 @@
-[dnbd3]
-; port to listen on (default: 5003)
-listenPort=5003
-; relative root directory for images, ending in .r[1-9][0-9]*
-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=true
-; if proxy is true and an image is incomplete, should idle bandwidth be used to replicate missing blocks?
-backgroundReplication=true
-; if true (which is the default), images will automatically be removed from the list if they can't be accessed
-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)
-clientTimeout=15000
-
-; Log related config
-[logging]
-; log file path and name
-; protip: use SIGUSR2 to reopen log file
-file=./dnbd3.log
-; which type of messages to log to file
-fileMask=ERROR WARNING MINOR INFO DEBUG1
-; which to log to console (stdout)
-consoleMask=ERROR WARNING MINOR INFO
-; Valid types (warning: specifying invalid types will not yield an error!)
-; ERROR     Fatal error, server will terminate
-; WARNING   Major issue, something is broken but keep running
-; MINOR     Minor issue, more of a hickup than serious problem
-; INFO      Informational message
-; DEBUG1    Debug information, used for medium verbosity
-; DEBUG2    Used for debug messages that would show up a lot
-
-- 
cgit v1.2.3-55-g7522