Merge branch 'next' into main

elan-ev · Feb 5, 2025 · a7247f4 · a7247f4
2 parents f18f547 + a793a66
commit a7247f4
Show file tree

Hide file tree

Showing 177 changed files with 22,521 additions and 3,419 deletions.
diff --git a/.deployment/files/known-groups.json b/.deployment/files/known-groups.json
@@ -1,6 +1,6 @@
 {
-    "ROLE_STUDENT": { "label": { "en": "Students", "de": "Studierende" }, "implies": [], "large": true },
-    "ROLE_STAFF": { "label": { "en": "Staff", "de": "Angestellte" }, "implies": [], "large": true },
-    "ROLE_INSTRUCTOR": { "label": { "en": "Lecturers", "de": "Vortragende" }, "implies": ["ROLE_STAFF"], "large": true },
-    "ROLE_TOBIRA_MODERATOR": { "label": { "en": "Moderators", "de": "Moderierende" }, "implies": ["ROLE_STAFF"], "large": false }
+    "ROLE_STUDENT": { "label": { "default": "Students", "de": "Studierende" }, "implies": [], "large": true },
+    "ROLE_STAFF": { "label": { "default": "Staff", "de": "Angestellte" }, "implies": [], "large": true },
+    "ROLE_INSTRUCTOR": { "label": { "default": "Lecturers", "de": "Vortragende" }, "implies": ["ROLE_STAFF"], "large": true },
+    "ROLE_TOBIRA_MODERATOR": { "label": { "default": "Moderators", "de": "Moderierende" }, "implies": ["ROLE_STAFF"], "large": false }
 }
diff --git a/.deployment/setup-server.yml b/.deployment/setup-server.yml
@@ -33,10 +33,10 @@
     - name: install MeiliSearch
       become: true
       get_url:
-        url: https://github.com/meilisearch/meilisearch/releases/download/v1.4.2/meilisearch-linux-amd64
+        url: https://github.com/meilisearch/meilisearch/releases/download/v1.12.6/meilisearch-linux-amd64
         dest: /opt/meili/meilisearch
         mode: '0755'
-        checksum: 'sha256:b54b9ace213b0d45558c5d0e79710f718b63d2e29c190fb95be01dc27eb1ca5c'
+        checksum: 'sha256:a9ca34a578fd1b3f5e68dab69f396bcc02cf0bfc1409c377efde25df43cb6809'
       register: meili_updated
       notify: restart MeiliSearch
 

diff --git a/.deployment/templates/config.toml b/.deployment/templates/config.toml
@@ -1,12 +1,12 @@
 [general]
-site_title.en = "Tobira Test Deployment"
+site_title.default = "Tobira Test Deployment"
 tobira_url = "https://{% if id != 'main' %}{{id}}.{% endif %}tobira.opencast.org"
 users_searchable = true
 
 [general.metadata]
 dcterms.source = "builtin:source"
 dcterms.license = "builtin:license"
-dcterms.spatial = { en = "Location", de = "Ort" }
+dcterms.spatial = { default = "Location", de = "Ort" }
 
 [db]
 database = "tobira-{{ id }}"
@@ -25,7 +25,7 @@ unix_socket_permissions = 0o777
 [auth]
 source = "tobira-session"
 session.from_login_credentials = "login-callback:http+unix://[/opt/tobira/{{ id }}/socket/auth.sock]/"
-login_page.note.en = 'Dummy users: "jose", "morgan", "björk" and "sabine". Password for all: "tobira".'
+login_page.note.default = 'Dummy users: "jose", "morgan", "björk" and "sabine". Password for all: "tobira".'
 login_page.note.de = 'Testnutzer: "jose", "morgan", "björk" und "sabine". Passwort für alle: "tobira".'
 
 trusted_external_key = "tobira"
@@ -45,19 +45,17 @@ file = "/var/log/tobira/{{ id }}-${cmd}.log"
 
 [opencast]
 host = "https://tobira-test-oc.ethz.ch"
-
-[sync]
 user = "admin"
 password = "{{ opencast_admin_password }}"
+
+[sync]
 poll_period = "1min"
+interpret_eth_passwords = true
 
 [theme]
-logo.large.path = "/opt/tobira/{{ id }}/logo-large.svg"
-logo.large.resolution = [643, 217]
-logo.large_dark.path = "/opt/tobira/{{ id }}/logo-large-dark.svg"
-logo.large_dark.resolution = [643, 217]
-logo.small.path = "/opt/tobira/{{ id }}/logo-small.svg"
-logo.small.resolution = [102, 115]
-logo.small_dark.path = "/opt/tobira/{{ id }}/logo-small.svg"
-logo.small_dark.resolution = [212, 182]
 favicon = "/opt/tobira/{{ id }}/favicon.svg"
+logos = [
+    { path = "/opt/tobira/{{ id }}/logo-large.svg",  mode = "light", size = "wide", resolution = [425, 182] },
+    { path = "/opt/tobira/{{ id }}/logo-large-dark.svg", mode = "dark", size = "wide", resolution = [425, 182] },
+    { path = "/opt/tobira/{{ id }}/logo-small.svg", size = "narrow", resolution = [212, 182] },
+]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,6 +123,8 @@ jobs:
           .cache-key
           .cargo-flags
           .deployment/templates/config.toml
+          .deployment/files/known-groups.json
+          .deployment/files/known-users.json
           util/dummy-login/dist/index.js
 
     # This is uploaded for the test job, specifically `cargo test`

diff --git a/.github/workflows/upload-db-dump.yml b/.github/workflows/upload-db-dump.yml
@@ -35,13 +35,16 @@ jobs:
         run: |
           sed --in-place \
             -e 's/host = "http:\/\/localhost:8081"/host = "https:\/\/tobira-test-oc.ethz.ch"/g' \
+            -e '/password = "opencast"/a\interpret_eth_passwords = true' \
             -e 's/password = "opencast"/password = "${{ secrets.TOBIRA_OPENCAST_ADMIN_PASSWORD }}"/g' \
             -e 's/level = "trace"/level = "debug"/g' \
             -e '/preferred_harvest_size/d' \
             util/dev-config/config.toml
 
       - name: Sync with Opencast
         run: ./tobira sync run --config util/dev-config/config.toml
+      - name: Fetch text assets from Opencast
+        run: ./tobira sync texts fetch --config util/dev-config/config.toml
       - name: Import realm tree
         run: |
           ./tobira import-realm-tree \

diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /deploy
+/util/.db-dumps-cache