merge client cache

12 files changed, 43 insertions, 5 deletions

diff --git a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
index 516cbfa2..7d34480d 100644
--- a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
+++ b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Setup dnbd3 kernel module and user space daemon
-After=sysinit.target
 Before=shutdown.target
 DefaultDependencies=no
 
@@ -9,3 +8,5 @@ ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3
 ExecStop=/opt/openslx/bin/dnbd3-client --kill
 ExecStopPost=/opt/openslx/bin/rm /var/run/dnbd3.socket
 Restart=on-abort
+
+
diff --git a/remote/modules/dnbd3/module.build b/remote/modules/dnbd3/module.build
index cdbd8251..fd56b4f7 100644
--- a/remote/modules/dnbd3/module.build
+++ b/remote/modules/dnbd3/module.build
@@ -27,13 +27,16 @@ build() {
 	cd "$MODULE_DIR/src/kmod" || perror "Could not CD to standalone dnbd3 kmod dir"
 	make MODULE_NAME=dnbd3 KDIR="$KERNEL_HEADERS_DIR" || perror "Could not compile kernel module"
 	mkdir -p "$MODULE_BUILD_DIR/lib/modules/dnbd3" || perror "Could not create lib/modules/dnbd3"
-	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Coould not create opt/openslx/bin"
+	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not create opt/openslx/bin"
 	cp "$MODULE_DIR/src/kmod/dnbd3.ko" "$MODULE_BUILD_DIR/lib/modules/dnbd3/" || perror "could not cp dnbd3.ko"
 	cd "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not cd to build dir for client binary"
 	cmake "$MODULE_DIR/src/dnbd3" || perror "Could not cmake"
 	make dnbd3-client || perror "Could not make dnbd3-client"
 	chown root:root "dnbd3-client"
 	chmod +xs "dnbd3-client"
+	make dnbd3-server || perror "Could not make dnbd3-server"
+	chown root:root "dnbd3-server"
+	chmod +xs "dnbd3-server"	
 	cd "$MODULE_DIR"
 }
 
diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf
index 631b0e23..f917b1b4 100644
--- a/remote/modules/dnbd3/module.conf
+++ b/remote/modules/dnbd3/module.conf
@@ -5,6 +5,7 @@ REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
 REQUIRED_COMMIT="bc4ee543ce5beec823ae0cbd811bb7febe43103f"
 REQUIRED_BINARIES="
 	dnbd3-client
+	dnbd3-server
 "
 REQUIRED_DIRECTORIES="
 	/lib/modules
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
index 7f8b54a8..0b453165 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Mount Openslx Stage 4
 DefaultDependencies=no
-Wants=setup-dnbd3.service stage4.target
-After=setup-dnbd3.service
+Wants=setup-dnbd3.service setup-dnbd3_cache.service stage4.target
+After=setup-dnbd3.service setup-dnbd3_cache.service
 Before=stage4.target
 
 [Service]
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
index 201e7a26..277efa05 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
@@ -63,6 +63,8 @@ else
 	exit 1
 fi
 
+sleep 2
+
 # dbus reload needed eg. for gnome etc. and perhaps other service files which stage4 needs:
 systemctl reload dbus.service
 
diff --git a/server/configs/curitiba/dnbd3-cache b/server/configs/curitiba/dnbd3-cache
new file mode 120000
index 00000000..9bc8ef6f
--- /dev/null
+++ b/server/configs/curitiba/dnbd3-cache
@@ -0,0 +1 @@
+../../modules/dnbd3-cache/
\ No newline at end of file
diff --git a/server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix b/server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix
deleted file mode 120000
index c7444165..00000000
--- a/server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/ubuntu-14.04-unity-panel-service-fix
\ No newline at end of file
diff --git a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
new file mode 100644
index 00000000..2eaeddc4
--- /dev/null
+++ b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Setup dnbd3-server as proxy/cache daemon
+Requires=setup-dnbd3.service
+Wants=setup-partitions.service
+After=sysinit.target setup-dnbd3.service setup-partitions.service
+Before=shutdown.target
+DefaultDependencies=no
+
+[Service]
+ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3_cache
+ExecStop=/opt/openslx/bin/killall dnbd3-server
+Restart=on-abort
diff --git a/server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service
new file mode 120000
index 00000000..9ed23a9f
--- /dev/null
+++ b/server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service
@@ -0,0 +1 @@
+../setup-dnbd3_cache.service
\ No newline at end of file
diff --git a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
new file mode 100644
index 00000000..3d9801ca
--- /dev/null
+++ b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
@@ -0,0 +1 @@
+-200.17.202.46 SLXBOX DNBD3 SERVER
diff --git a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
new file mode 100644
index 00000000..c0820ea1
--- /dev/null
+++ b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
@@ -0,0 +1,9 @@
+[dnbd3]
+#vmdkLegacyMode=TRUE
+#clientPenalty=300000
+clientPenalty=0
+basePath=/cache/export/dnbd3
+isProxy=true
+proxyPrivateOnly=true
+uplinkTimeout=5000
+
diff --git a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
new file mode 100755
index 00000000..705c5c89
--- /dev/null
+++ b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
@@ -0,0 +1,8 @@
+#!/bin/ash
+
+[ -d "/cache/export/dnbd3" ] ||  mkdir -p /cache/export/dnbd3/
+
+exec dnbd3-server -c /opt/openslx/dnbd3-cache -n
+slxlog "dnbd3-server" "Error launching dnbd3-server"
+exit 1
+