diff options
Diffstat (limited to 'satellit_installer/includes/50-install_dnbd3-server.inc')
| -rw-r--r-- | satellit_installer/includes/50-install_dnbd3-server.inc | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/satellit_installer/includes/50-install_dnbd3-server.inc b/satellit_installer/includes/50-install_dnbd3-server.inc index 8e69db2..2b8e8fa 100644 --- a/satellit_installer/includes/50-install_dnbd3-server.inc +++ b/satellit_installer/includes/50-install_dnbd3-server.inc @@ -1,17 +1,3 @@ -install_dnbd3-server_service() { - echo "# copying dnbd3-server service file..." - cp -p "$BASEDIR/static_files/dnbd3/dnbd3-server.service" /etc/systemd/system/dnbd3-server.service || perror "failed." - echo "# Linking dnbd3-server service file into (/etc/systemd/system/)multi-user.target.wants..." - ln -s /etc/systemd/system/dnbd3-server.service /etc/systemd/system/multi-user.target.wants/dnbd3-server.service \ - || perror "Could not link dnbd3-server service file into multiuser target!" - # For accessing stage4 on master server via SSL tunnel - echo "# copying dnbd3-master-proxy service file..." - cp -p "$BASEDIR/static_files/dnbd3/dnbd3-master-proxy.service" /etc/systemd/system/dnbd3-master-proxy.service || perror "failed." - echo "# Linking dnbd3-master-proxy service file into (/etc/systemd/system/)multi-user.target.wants..." - ln -s /etc/systemd/system/dnbd3-master-proxy.service /etc/systemd/system/multi-user.target.wants/dnbd3-master-proxy.service \ - || perror "Could not link dnbd3-master-proxy service file into multiuser target!" -} - install_dnbd3-server() { # $1: directory to install dnbd3-server to echo "# Installing dnbd3 server... " @@ -21,21 +7,13 @@ install_dnbd3-server() { git clone https://git.openslx.org/dnbd3.git "$BASEDIR/tmp/dnbd3" || perror "Could not clone dnbd3" mkdir "$BASEDIR/tmp/dnbd3/build" cd "$BASEDIR/tmp/dnbd3/build" || perror "Build dir == where?" - cmake -DBUILD_FUSE_CLIENT=OFF -DBUILD_KERNEL_MODULE=OFF -DBUILD_STRESSTEST=OFF -DBUILD_SERVER=ON -DCMAKE_BUILD_TYPE=Release .. || perror "cmake failed" + cmake -DDNBD3_CLIENT_FUSE=OFF -DDNBD3_KERNEL_MODULE=OFF -DDNBD3_SERVER=ON -DCMAKE_BUILD_TYPE=Release .. || perror "cmake failed" make dnbd3-server || perror "Building dnbd3-server failed" - cp dnbd3-server "$1/" || perror "Could not copy dnbd3-server binary to $1" + cp src/server/dnbd3-server "$1/" || perror "Could not copy dnbd3-server binary to $1" cd - &>/dev/null - # Copy config files - mkdir -p /etc/dnbd3-server || perror "mkdir /etc/dnbd3-server failed" - for i in rpc.acl server.conf alt-servers; do - cp -p "$BASEDIR/static_files/dnbd3/$i" "/etc/dnbd3-server/$i" \ - || perror "Could not copy $i to /etc/dnbd3-server" - chmod 644 "/etc/dnbd3-server/$i" - done - chown -R root:root "$1" - - install_dnbd3-server_service "/etc/systemd/system/" + # Install static files + install_files "dnbd3" echo "# dnbd3-server ok." } |