Skip to content
Snippets Groups Projects

Adding ownCloud backend remote mount path + fixing resource-extension commentary

4 files
+ 49
17
Compare changes
  • Side-by-side
  • Inline

Files

@@ -136,9 +136,9 @@ singleuser:
@@ -136,9 +136,9 @@ singleuser:
#
#
#LabApp.custom_css=True allows to use custom CSS for EOSC style
#LabApp.custom_css=True allows to use custom CSS for EOSC style
#
#
#ResourceUseDisplay.mem_warning_threshold=0.75 sets memory warning at 75%
#ResourceUseDisplay.mem_warning_threshold=0.25 sets for resource-usage
#threshold for resource-usage extension which is also used by EGI
#extension to warn about used memory when only 25% of memory is available
#notebooks-resource-warning extension
#which is also used by EGI notebooks-resource-warning extension
stringData: |-
stringData: |-
#! /bin/sh
#! /bin/sh
#
#
@@ -250,9 +250,15 @@ hub:
@@ -250,9 +250,15 @@ hub:
return
return
if type == "home":
if type == "home":
 
#Jupyter side
subpath = ""
subpath = ""
 
#ownCloud backend side
 
remote_path = "/notebooks_service"
else:
else:
subpath = "/" + type.capitalize()
#Jupyter side
 
subpath = "/" + type.capitalize()
 
#ownCloud backend side
 
remote_path = "/"
env = [
env = [
{"name": "WEBDAV_URL", "value": owncloud_url},
{"name": "WEBDAV_URL", "value": owncloud_url},
{"name": "WEBDAV_VENDOR", "value": "owncloud"},
{"name": "WEBDAV_VENDOR", "value": "owncloud"},
@@ -262,6 +268,8 @@ hub:
@@ -262,6 +268,8 @@ hub:
{"name": "MOUNT_PATH", "value": "/owncloud" + subpath},
{"name": "MOUNT_PATH", "value": "/owncloud" + subpath},
# default mode is "full"
# default mode is "full"
{"name": "VFS_CACHE_MODE", "value": "full"},
{"name": "VFS_CACHE_MODE", "value": "full"},
 
# remote path to mount on ownCloud backend
 
{"name": "REMOTE_PATH", "value": remote_path}
]
]
if type != "home":
if type != "home":
env.append({"name": "MOUNT_WAIT_POINT", "value": "webdav-fs: /owncloud fuse.rclone"})
env.append({"name": "MOUNT_WAIT_POINT", "value": "webdav-fs: /owncloud fuse.rclone"})
@@ -272,7 +280,7 @@ hub:
@@ -272,7 +280,7 @@ hub:
spawner.extra_containers.append(
spawner.extra_containers.append(
{
{
"name": "owncloud-" + type,
"name": "owncloud-" + type,
"image": "eginotebooks/webdav-rclone-sidecar:sha-0a62679",
"image": "eginotebooks/webdav-rclone-sidecar:sha-0f42313",
"args": ["bearer_token_command=cat " + self.token_path],
"args": ["bearer_token_command=cat " + self.token_path],
"env": env,
"env": env,
"resources": self.sidecar_resources,
"resources": self.sidecar_resources,
Loading