From 4feacfb7e139fab6bc182693feb659e67ef8815a Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Tue, 24 Aug 2021 16:00:58 +0200
Subject: [SERVER] Make default config a bit more readable

---
 pkg/config/alt-servers |  3 ++-
 pkg/config/rpc.acl     |  1 +
 pkg/config/server.conf | 24 +++++++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkg/config/alt-servers b/pkg/config/alt-servers
index b26fe79..d9d2636 100644
--- a/pkg/config/alt-servers
+++ b/pkg/config/alt-servers
@@ -4,8 +4,9 @@ comment=Some alt server
 [192.168.100.100]
 comment=My first alt server that will not be used for replication
 for=client
+
 [192.168.100.50]
-comment=Super sectret alt server that will be used for replication, but clients don't know about it
+comment=Super secret alt server that will be used for replication, but clients don't know about it
 for=replication
 
 [192.168.100.123]
diff --git a/pkg/config/rpc.acl b/pkg/config/rpc.acl
index b2c2c44..b3b4561 100644
--- a/pkg/config/rpc.acl
+++ b/pkg/config/rpc.acl
@@ -1,4 +1,5 @@
 # Everything from localhost
 127.0.0.0/8 ALL
+
 # Some info reading for another machine
 132.230.8.113 STATS CLIENT_LIST IMAGE_LIST
diff --git a/pkg/config/server.conf b/pkg/config/server.conf
index 26e8c77..22bd14a 100644
--- a/pkg/config/server.conf
+++ b/pkg/config/server.conf
@@ -1,36 +1,51 @@
 [dnbd3]
 ; port to listen on (default: 5003)
 listenPort=5003
+
 ; relative root directory for images, ending in .r[1-9][0-9]*
 basePath=/mnt/storage
+
 ; 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
+
 ; minimum amount of connected clients for background replication to kick in
 bgrMinClients=0
+
 ; if another proxy requests and image that we don't have, should we ask our alt-servers for it?
 lookupMissingForProxy=true
+
 ; create sparse files instead of preallocating; ignored if backgroundReplication=true
 ; -- only recommended if cache space is small
 sparseFiles=false
+
 ; 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=5000
+
 ; timeout in ms for send/recv on connections to clients (using an image on this server)
 clientTimeout=15000
+
 ; set this to true to close handles of unused images after some timeout
 closeUnusedFd=false
+
 ; set this to true to load files without the .r[0-9]+ extension too, assuming RID=1
 vmdkLegacyMode=false
+
 ; Don't set the server flag when connecting to alt-servers
 ; Intended for if the proxy is used for on-client caching
 pretendClient=false
+
 ; When running in proxy mode and running out of space, automatically delete oldest image(s) to make
 ; the newly replicated image fit. In sparse mode, this will make sure at least 2GB of free space are
 ; available when replicating a new image. During normal operation, it will free at least 256MB whenever
@@ -48,19 +63,22 @@ maxClients=2000
 maxImages=1000
 maxPayload=9M
 maxReplicationSize=150G
+
 ; Maximum number of bytes to prefetch when relaying client request to upstream server
 maxPrefetch=256k
 
-; 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)
+
+; which type of messages 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
@@ -68,6 +86,6 @@ consoleMask=ERROR WARNING MINOR INFO
 ; INFO      Informational message
 ; DEBUG1    Debug information, used for medium verbosity
 ; DEBUG2    Used for debug messages that would show up a lot
-;
+
 ; Whether timestamps should be output to console too (or just to file if false)
 consoleTimestamps=false
-- 
cgit v1.2.3-55-g7522