Merge branch 'main' into patch-3

Author: Lach-anonym

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 	"name": "Transitous",
 	"build": {
 		"dockerfile": "../ci/container/Containerfile-devcontainer",
-		"context": "../ci/container/"
+		"context": "../"
 	},
 
 	// Configure tool-specific properties.

.github/workflows/container-images.yml

@@ -7,6 +7,7 @@ on:
   push:
     paths:
       - "ci/container/Containerfile"
+      - "requirements.txt"
     branches:
       - "main"
   workflow_dispatch:

.github/workflows/website.yml

@@ -30,44 +30,51 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      HUGO_VERSION: 0.143.0
+      HUGO_VERSION: 0.159.0
     steps:
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
       - name: Install Hugo CLI
         run: |
           wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
           && sudo dpkg -i ${{ runner.temp }}/hugo.deb
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0
 
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Install Node.js dependencies
         run: cd website && npm install
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
 
       - run: pip install mkdocs
       - run: mkdocs build --site-dir ../website/static/doc/ -f docs/mkdocs.yml
 
+      - name: Build widget
+        run: cd website && npm run build:widget
+
       - name: Build with Hugo
         env:
           # For maximum backward compatibility with Hugo modules
           HUGO_ENVIRONMENT: production
           HUGO_ENV: production
         run: |
           wget https://api.transitous.org/gtfs/license.json -O website/data/license.json
-          cd website && npm run release
+          cd website && hugo --minify --baseURL "${{ steps.pages.outputs.base_url }}/"
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: ./website/public
 

.woodpecker/motis-release.yml

@@ -8,13 +8,13 @@ steps:
   build-release-skylake-avx512:
     image: docker.io/alpine
     commands:
-      - export MOTIS_TAG=v2.8.1
+      - export MOTIS_TAG=v2.9.1
       - apk add musl-dev cmake ninja gcc g++ git pnpm linux-headers
       - git clone https://github.com/motis-project/motis -b $MOTIS_TAG motis-src
       - mkdir -p motis-src/build
       - export flags="-static -O3 -fomit-frame-pointer -flto -DNDEBUG"
       - export target_flags="-march=skylake-avx512"
-      - cmake -DCMAKE_BUILD_TYPE=None -DMOTIS_MIMALLOC=ON -DCMAKE_CXX_FLAGS="$flags" -DCMAKE_C_FLAGS="$flags" -DMOTIS_TARGET_FLAGS="$target_flags" -GNinja -DNO_BUILDCACHE=ON -Bmotis-src/build -Smotis-src
+      - cmake --compile-no-warning-as-error -DCMAKE_BUILD_TYPE=None -DMOTIS_MIMALLOC=ON -DCMAKE_CXX_FLAGS="$flags" -DCMAKE_C_FLAGS="$flags" -DMOTIS_TARGET_FLAGS="$target_flags" -GNinja -DNO_BUILDCACHE=ON -Bmotis-src/build -Smotis-src
       - ninja -C motis-src/build motis motis-test motis-web-ui
       - mkdir -p motis-out
       - mv motis-src/build/motis motis-out/motis
@@ -30,7 +30,7 @@ steps:
       - mkdir -p motis-src/build
       - export flags="-static -O3 -fno-omit-frame-pointer -DNDEBUG"
       - export target_flags="-march=haswell"
-      - cmake -DCMAKE_BUILD_TYPE=None -DMOTIS_MIMALLOC=ON -DCMAKE_CXX_FLAGS="$flags" -DCMAKE_C_FLAGS="$flags" -DMOTIS_TARGET_FLAGS="$target_flags" -GNinja -DNO_BUILDCACHE=ON -Bmotis-src/build -Smotis-src
+      - cmake --compile-no-warning-as-error -DCMAKE_BUILD_TYPE=None -DMOTIS_MIMALLOC=ON -DCMAKE_CXX_FLAGS="$flags" -DCMAKE_C_FLAGS="$flags" -DMOTIS_TARGET_FLAGS="$target_flags" -GNinja -DNO_BUILDCACHE=ON -Bmotis-src/build -Smotis-src
       - ninja -C motis-src/build motis motis-test motis-web-ui
       - mkdir -p motis-out
       - mv motis-src/build/motis motis-out/motis

LICENSES/BSD-2-Clause.txt

@@ -0,0 +1,27 @@
+Copyright (c) <year> <owner>
+
+Redistribution  and  use in  source  and  binary forms,  with  or
+without modification,  are permitted provided that  the following
+conditions are met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2.  Redistributions  in  binary  form must  reproduce  the  above
+copyright  notice,  this list  of  conditions  and the  following
+disclaimer in  the documentation and/or other  materials provided
+with the distribution.
+
+This  software   is  provided   by  the  copyright   holders  and
+contributors  "as  is" and  any  express  or implied  warranties,
+including,  but  not  limited   to,  the  implied  warranties  of
+merchantability  and   fitness  for  a  particular   purpose  are
+disclaimed.   In  no   event  shall   the  copyright   holder  or
+contributors  be liable  for  any  direct, indirect,  incidental,
+special, exemplary, or consequential  damages (including, but not
+limited to, procurement of substitute  goods or services; loss of
+use, data,  or profits; or business  interruption) however caused
+and  on any  theory  of liability,  whether  in contract,  strict
+liability, or tort (including negligence or otherwise) arising in
+any way out of  the use of this software, even  if advised of the
+possibility of such damage.

REUSE.toml

@@ -18,3 +18,8 @@ SPDX-License-Identifier = "CC0-1.0"
 path = "ansible/roles/nginx/files/robots.txt"
 SPDX-FileCopyrightText = "none"
 SPDX-License-Identifier = "CC0-1.0"
+
+[[annotations]]
+path = "ansible/roles/feed-proxy/files/robots.txt"
+SPDX-FileCopyrightText = "none"
+SPDX-License-Identifier = "CC0-1.0"

ansible/crowd-sourced-realtime.yml

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 2025 Jonah Brüchert <jbb@kaidan.im>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+- name: Set up MOTIS servers
+  hosts: crowd-sourced-realtime
+  roles:
+    - crowd-sourced-realtime

ansible/feed-proxy.yml

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2025 Traines <git@traines.eu>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# ansible-playbook --vault-id feed-proxy@/etc/feed-proxy.vault -e "feed_proxy_host=proxy.example.com" feed-proxy.yml
+
+# get the feed proxy vault pass in roles/feed-proxy/vars/feed-secrets-vault-pass.yml and put it in decrypted form to /etc/feed-proxy.vault
+# encrypt a new variable to put into roles/feed-proxy/vars/feed-secrets.yml
+# ansible-vault encrypt_string --vault-id feed-proxy@/etc/feed-proxy.vault 'foobar' --name 'Authorization'
+
+- name: Set up feed proxy server
+  hosts: localhost
+  roles:
+    - feed-proxy

ansible/hosts

@@ -113,3 +113,9 @@ woodpecker:
         30363331323065643861613364303531653565633833346263313334613032613539386430613364
         3137363965316563650a356631343130653036613838646331363336643265333662346534343163
         33646436316239336363363339386665353532363336636535333139363937373064
+
+crowd-sourced-realtime:
+  hosts:
+    crunchy:
+      ansible_user: root
+      ansible_host: crunchy.spline.de

ansible/roles/crowd-sourced-realtime/files/delay-tracker.service

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2025 Jonah Brüchert <jbb@kaidan.im>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+[Unit]
+Description=Delay Tracker
+After=network.target
+
+[Service]
+User=crowd-sourced-realtime
+Group=nogroup
+Restart=always
+ExecStart=/usr/local/bin/delay-tracker
+WorkingDirectory=/var/cache/transitous/out/delay-tracker/
+
+[Install]
+WantedBy=multi-user.target