summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorManuel Bentele2020-10-22 12:08:34 +0200
committerManuel Bentele2020-10-22 12:08:34 +0200
commitf9872723efc831827d179c3baf5b9f6c428512c4 (patch)
tree9662cc3071362570a1f4051f0850b41fbdfff246 /conf
parent[BUILD] add option to build the dnbd3-server with afl-fuzz support (diff)
downloaddnbd3-f9872723efc831827d179c3baf5b9f6c428512c4.tar.gz
dnbd3-f9872723efc831827d179c3baf5b9f6c428512c4.tar.xz
dnbd3-f9872723efc831827d179c3baf5b9f6c428512c4.zip
[BUILD] add CMake targets to build binary and source packages with CPack
This patch adds the following CMake targets - package - source to build bundeled packages. Those packages contain either all built binary artifacts or all source files for source code distribution. Both CMake targets are available in Release build configuration.
Diffstat (limited to 'conf')
-rw-r--r--conf/CMakeLists.txt13
-rw-r--r--conf/README.server35
-rw-r--r--conf/rpc.acl1
-rw-r--r--conf/server.conf1
4 files changed, 13 insertions, 37 deletions
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
new file mode 100644
index 0000000..1b888e6
--- /dev/null
+++ b/conf/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.10)
+
+# set the project name
+project(dnbd3-conf)
+
+# define all configuration files
+set(DNBD3_CONF_FILES ${CMAKE_CURRENT_SOURCE_DIR}/alt-servers
+ ${CMAKE_CURRENT_SOURCE_DIR}/rpc.acl
+ ${CMAKE_CURRENT_SOURCE_DIR}/server.conf)
+
+# install configuration files into sample directory
+install(FILES ${DNBD3_CONF_FILES} DESTINATION /etc/dnbd3-server/sample
+ COMPONENT server)
diff --git a/conf/README.server b/conf/README.server
deleted file mode 100644
index 08be09f..0000000
--- a/conf/README.server
+++ /dev/null
@@ -1,35 +0,0 @@
-Configuration for dnbd3-server
-
-The server requires a config directory.
-Start it like so: ./dnbd3-server -c ./my-config/
-
-There are two files in that dir
-
-== alt-servers ==
-List of known alt-servers for this server.
-INI Format:
-[Address]
-comment=Whatever
-for=client | replication
-namespace=some/path/
-
-All fields in a section are optional. If the "for" key is missing, the server
-will be used for replication and will be sent to clients that request a list
-of alt servers.
-The namespace key can be specified multiple times per section. If it is missing,
-the server will be used for all image names; otherwise, it will only be used
-for images which's name starts with one of the given strings.
-
-If you're not running in proxy mode, this file won't do much for you
-
-== server.conf ==
-
-Main configuration file. Ini format.
-
-[dnbd3]
-basePath=/srv/openslx/dnbd3 # virtual root of image files
-serverPenalty=1234 # artificial acceptance delay for incoming server connections (µs)
-clientPenalty=2345 # artificial acceptance delay for incoming client connection (µs)
-isProxy=true # enable proxy mode - will try to replicate from alt-servers if a client requests unknown image
-uplinkTimeout=1250 # r/w timeout for connections to uplink servers
-
diff --git a/conf/rpc.acl b/conf/rpc.acl
index 5167ae3..b2c2c44 100644
--- a/conf/rpc.acl
+++ b/conf/rpc.acl
@@ -2,4 +2,3 @@
127.0.0.0/8 ALL
# Some info reading for another machine
132.230.8.113 STATS CLIENT_LIST IMAGE_LIST
-
diff --git a/conf/server.conf b/conf/server.conf
index d9d4094..5f0b2a0 100644
--- a/conf/server.conf
+++ b/conf/server.conf
@@ -69,4 +69,3 @@ consoleMask=ERROR WARNING MINOR INFO
;
; Whether timestamps should be output to console too (or just to file if false)
consoleTimestamps=false
-