Skip to content
Snippets Groups Projects
Verified Commit 98dfd436 authored by Martin Weise's avatar Martin Weise
Browse files

merge from release-1.4.5

parent 8e6210ef
No related branches found
No related tags found
5 merge requests!322Master,!321Dev,!319Dev,!318Dev,!315Dev
No preview for this file type
......@@ -275,6 +275,9 @@ services:
container_name: dbrepo-ui
hostname: ui
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.5
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
depends_on:
dbrepo-search-service:
condition: service_started
......@@ -397,8 +400,8 @@ services:
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- "-s3-bucket=dbrepo"
environment:
AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
AWS_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
AWS_REGION: "${STORAGE_REGION_NAME:-default}"
depends_on:
dbrepo-storage-service:
......
---
author: Martin Weise
---
## tl;dr
[:fontawesome-solid-database:  Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/52){ .md-button .md-button--primary target="_blank" }
## Description
This section will be expanded soon.
## Solution
We host a mirror from the [public data](https://www.stadttheater.uni-hamburg.de/) provided by UHH.
## DBRepo Features
- [x] System versioning
- [x] Subset exploration
- [x] External data access for analysis
## Acknowledgement
This work was part of a cooperation with the [University of Hamburg](https://www.uni-hamburg.de/en.html).
<img src="../../images/logos/uhh.png" width=100 />
\ No newline at end of file
.docs/images/logos/uhh.png

20.8 KiB

......@@ -47,10 +47,6 @@ curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-service
Call the helper script to regenerate the client secret of the `dbrepo-client` and set it as value of the
`AUTH_SERVICE_CLIENT_SECRET` variable in the `.env` file.
```bash
curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/.scripts/reg-client-secret.sh" | bash
```
Update the rest of the default secrets in the `.env` file to secure passwords. You can use `openssl` for that, e.g.
`openssl rand -hex 16`. Set `auth_ldap.dn_lookup_bind.password` in `dist/rabbitmq.conf` to the value of
`SYSTEM_PASSWORD`.
......@@ -69,7 +65,7 @@ Log into the Auth Service with the default credentials `admin` and the value of
:material-numeric-3-circle-outline:.
<figure markdown>
![](images/screenshots/auth-service-ldap-1.png){ .img-border }
![Keycloka identitiy provider list](images/screenshots/auth-service-ldap-1.png){ .img-border }
<figcaption>Figure 1: Select the Identity Service provider.</figcaption>
</figure>
......@@ -78,9 +74,15 @@ but this is optional. Change the Bind credentials to the desired password :mater
the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
<figure markdown>
![](images/screenshots/auth-service-ldap-2.png){ .img-border }
![Keycloak identity provider settings](images/screenshots/auth-service-ldap-2.png){ .img-border }
<figcaption>Figure 2: Update the Identity Service admin user credentials.</figcaption>
</figure>
Update the client secret of the `dbrepo-client`:
```bash
curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.5/.scripts/reg-client-secret.sh" | bash
```
Also, update the JWT key according to the
[Keycloak documentation](https://www.keycloak.org/docs/24.0.1/server_admin/index.html#rotating-keys). To secure your
......
......@@ -387,6 +387,7 @@ release-helm:
- "helm package ./helm/dbrepo --sign --key 'Martin Weise' --keyring ~/.gnupg/secring.gpg --destination ./build"
- "helm plugin install https://github.com/sigstore/helm-sigstore"
script:
- "helm push ./build/dbrepo-${CHART_VERSION}.tgz oci://${CI_REGISTRY2_URL}/helm"
- "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz"
release-docs:
......
......@@ -310,6 +310,9 @@ services:
APP_VERSION: ${APP_VERSION:-latest}
COMMIT: ${CI_COMMIT_SHA:-}
network: host
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
depends_on:
dbrepo-search-service:
condition: service_started
......
......@@ -51,6 +51,7 @@ nav:
- Survey Data: examples/survey.md
- Lute Data: examples/lute-data.md
- Music-ML Data: examples/music.md
- Theater Data: examples/theater.md
- Transportation Data: examples/transportation.md
- XPS Data: examples/xps-data.md
- publications.md
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment