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

anolytics-toolkit deploy fixes and tsl fixes

parent c4fdeab0
......@@ -6,4 +6,23 @@
}
frontendAddr: "https://analytics-toolkit.nomad-coe.eu"
}
passport: {
strategy: "saml"
saml: {
path: "/login/callback"
entryPoint: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
issuer: "https://analytics-toolkit.nomad-coe.eu/shibboleth"
identifierFormat: null
# logoutUrl: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
# logoutCallback: undefined
acceptedClockSkewMs: -1
}
}
mongoDb: {
url: "mongodb://notebook-info-db-mongodb/filedatabase"
}
session_redis: {
port: 6390,
host: 'analytics-toolkit.nomad-coe.eu'
}
}
......@@ -42,8 +42,6 @@ passport: {
issuer: "https://labdev-nomad.esc.rzg.mpg.de/shibboleth"
identifierFormat: null
acceptedClockSkewMs: -1
logoutUrl: undefined
logoutCallback: undefined
}
},
k8component: {
......
......@@ -13,6 +13,8 @@
entryPoint: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
issuer: "https://labdev-nomad.esc.rzg.mpg.de/shibboleth"
identifierFormat: null
# logoutUrl: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
# logoutCallback: undefined
acceptedClockSkewMs: -1
}
}
......
......@@ -220,10 +220,10 @@ fi
echo "# password secret"
echo " kubectl create secret generic analytics-session-db --from-file=redis-password=session-db-redis-pwd.txt"
echo "# actual redis setup"
echo " if ! [[ -n \"\$(helm ls analytics-session-db | grep -E '^analytics-session-db\s' )\" ]]; then"
echo " helm $tls install --name analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo " if ! [[ -n \"\$(helm ls $tls analytics-session-db | grep -E '^analytics-session-db\s' )\" ]]; then"
echo " helm install $tls --name analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo " else"
echo " helm $tls upgrade analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo " helm upgrade $tls analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo " fi"
......@@ -253,7 +253,7 @@ echo "# password secret"
echo " kubectl create secret generic notebook-db-mongo-pwd --from-literal=database=notebookinfo --from-literal=user=notebookinfo --from-file=password=notebook-db-mongo-pwd.txt"
echo "# actual mongo setup"
echo " if ! [[ -n \"\$(helm ls notebook-info-db | grep -E '^notebook-info-db\s' )\" ]]; then"
echo " if ! [[ -n \"\$(helm ls $tls notebook-info-db | grep -E '^notebook-info-db\s' )\" ]]; then"
echo " helm install $tls --name notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
echo " else"
echo " helm upgrade $tls notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
......@@ -311,7 +311,7 @@ echo " kubectl create -f user-settings-redis-volume.yaml"
echo "# password secret"
echo " kubectl create secret generic user-settings-db --from-file=redis-password=user-settings-redis-pwd.txt"
echo "# actual redis setup"
echo " if ! [[ -n \"\$(helm ls user-settings-db | grep -E '^user-settings-db\s' )\" ]]; then"
echo " if ! [[ -n \"\$(helm ls $tls user-settings-db | grep -E '^user-settings-db\s' )\" ]]; then"
echo " helm install $tls --name user-settings-db -f user-settings-redis-helm-values.yaml stable/redis"
echo " else"
echo " helm upgrade $tls user-settings-db -f user-settings-redis-helm-values.yaml stable/redis"
......
Supports Markdown
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