Commit b9c65d71 authored by Mohamed, Fawzi Roberto (fawzi)'s avatar Mohamed, Fawzi Roberto (fawzi)
Browse files

new prefix/cM/* for start and commands, use prefix, remove baseUri

analytics-toolkit beaker still using old /notebook-edit entrypoint
parent f4af2f64
......@@ -14,12 +14,11 @@ const yaml = require('js-yaml')
var baseRepl = {
baseDir: baseDir,
baseUri: config.app.baseUri,
baseUriPath: url.parse(config.app.baseUri).path
prefix: config.k8component.image.prefix
};
// ensure that baseUriPath does not end with /
if (baseRepl.baseUriPath.endsWith('/'))
baseRepl.baseUriPath = baseRepl.baseUriPath.slice(0, baseRepl.baseUriPath.length -1)
// ensure that prefix does not end with /
if (baseRepl.prefix.endsWith('/'))
baseRepl.prefix = baseRepl.prefix.slice(0, baseRepl.prefix.length -1)
const br = config.app.baseReplacements
for (k in br)
baseRepl[k] = br[k];
......
......@@ -26,4 +26,10 @@
port: 6390,
host: 'analytics-toolkit.nomad-coe.eu'
}
k8component: {
entryPoint: {
path: "/notebook-edit/*"
pathReStr: "/notebook-edit(/[^?#]*)(\\?[^#]*)?(#.*)?$"
}
}
}
......@@ -12,9 +12,7 @@ k8component: {
liveDelay: 15
}
entryPoint: {
path: "/notebook-edit/*"
pathReStr: "/notebook-edit(/[^?#]*)(\\?[^#]*)?(#.*)?$"
redirectTarget: "{{baseUri}}/beaker/#/open?uri={{escapedPath1}}"
redirectTarget: "{{prefix}}/#/open?uri={{escapedPath1}}"
execCommand: []
exclusiveStartPoint: false
}
......
......@@ -8,7 +8,6 @@ k8component: {
image: "analytics-toolkit.nomad-coe.eu:5509/nomadlab/jupyter-image:0.999"
port: 8888,
prefix: "/jupyter",
homePath: "/home/beaker"
healthPath: "/jupyter"
healthDelay: 2
healthPeriod: 10
......@@ -19,7 +18,7 @@ k8component: {
"entryPoint": {
"path": "/jupyter/entrypoint"
"uriRe": "/jupyter(/.*)",
"redirectTarget": "{{baseUri}}/jupyter/tree?",
"redirectTarget": "{{prefix}}/tree?",
"exclusiveStartPoint": false
},
}
......@@ -9,7 +9,6 @@ app: {
resolveCacheNMax: 30000
pageReloadTime: 5
frontendAddr: "http://127.0.0.1:4200"
baseUri: "http://127.0.0.1"
catchErrors: false
templatesDir: "{{baseDir}}/templates"
baseReplacements: {
......@@ -71,14 +70,14 @@ k8component: {
checksumSkipReStr: "^(?:path[0-9]*|escapedPath[0-9]*)$"
}
entryPoint: {
path: "/notebook-edit/*"
pathReStr: "/notebook-edit(/[^?#]*)(\\?[^#]*)?(#.*)?$"
redirectTarget: "{{baseUri}}/beaker/#/open?uri={{escapedPath1}}"
path: "{{commands}}/start/*"
pathReStr: "/start(/[^?#]*)(\\?[^#]*)?(#.*)?$"
redirectTarget: "{{prefix}}/"
execCommand: []
exclusiveStartPoint: false
}
commands: {
path: "{{baseUriPath}}/cM"
path: "{{prefix}}/cM"
}
}
userInfo: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment