From 91ff390180da565ca98b6e1253c7f0648811f1a5 Mon Sep 17 00:00:00 2001 From: Jakob Gegeniger Date: Sat, 3 Oct 2026 15:40:51 +0200 Subject: [PATCH] proj: chainging routes --- deploy.sh | 6 +++--- doc/config/gitea.docker-compose.yml | 6 +++--- doc/mqtt.md | 10 +++++----- docker-compose.yml | 4 +--- src/router/index.ts | 2 +- src/services/mqtt.ts | 4 ++-- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/deploy.sh b/deploy.sh index 340666f..64ef61a 100644 --- a/deploy.sh +++ b/deploy.sh @@ -3,12 +3,12 @@ # scp kingArthurApp.tar.gz youruser@your_server_ip:~/ # add login key first -# > docker login git.nerdyssey.de +# > docker login git.excaliburs-erben.de # > Username: dockerLogin # > Passwrord: appkey # [DOMAIN]/[OWNER]/[IMAGE_NAME]:[TAG] -docker build -t git.nerdyssey.de/exodus/burg-stett-king-arth-web:latest . -docker push git.nerdyssey.de/exodus/burg-stett-king-arth-web:latest +docker build -t git.excaliburs-erben.de/exodus/web-king-arth-maintenance:latest . +docker push git.excaliburs-erben.de/exodus/web-king-arth-maintenance:latest # # docker compose pull diff --git a/doc/config/gitea.docker-compose.yml b/doc/config/gitea.docker-compose.yml index e92672c..acc11b7 100644 --- a/doc/config/gitea.docker-compose.yml +++ b/doc/config/gitea.docker-compose.yml @@ -15,9 +15,9 @@ services: - GITEA__database__USER=gitea - GITEA__database__PASSWD=###SomePassword### # Web / Domain settings - - GITEA__server__DOMAIN=git.nerdyssey.de - - GITEA__server__ROOT_URL=https://git.nerdyssey.de/ - - GITEA__server__SSH_DOMAIN=git.nerdyssey.de + - GITEA__server__DOMAIN=git.excaliburs-erben.de + - GITEA__server__ROOT_URL=https://git.excaliburs-erben.de/ + - GITEA__server__SSH_DOMAIN=git.excaliburs-erben.de - GITEA__server__SSH_PORT=2222 # Security - GITEA__service__DISABLE_REGISTRATION=true diff --git a/doc/mqtt.md b/doc/mqtt.md index 7a9ba51..9939fc4 100644 --- a/doc/mqtt.md +++ b/doc/mqtt.md @@ -18,15 +18,15 @@ mosquitto_sub -h 91.99.29.8 -t outdoor/king-arthur/sword/run ## safe ```sh -mosquitto_sub -L mqtts://nerdyssey.de:8883/outdoor/king-arthur/sword/run -d -mosquitto_sub -L mqtts://nerdyssey.de:8883/outdoor/king-arthur/sword/int -d +mosquitto_sub -L mqtts://excaliburs-erben.de:8883/outdoor/king-arthur/sword/run -d +mosquitto_sub -L mqtts://excaliburs-erben.de:8883/outdoor/king-arthur/sword/int -d -mosquitto_pub -L mqtts://nerdyssey.de:8883 -t outdoor/king-arthur/sword/run -m "SetMaintanance" +mosquitto_pub -L mqtts://excaliburs-erben.de:8883 -t outdoor/king-arthur/sword/run -m "SetMaintanance" -mosquitto_sub -h mqtts://nerdyssey.de:8883 -t "outdoor/king-arthur/sword/int" -u "exodususer" -P "awesomeexodusoutdooradventures" +mosquitto_sub -h mqtts://excaliburs-erben.de:8883 -t "outdoor/king-arthur/sword/int" -u "exodususer" -P "awesomeexodusoutdooradventures" mosquitto_pub -h -t "outdoor/king-arthur/sword/int" -m "Hello Secure World!" -u "exodususer" -P "awesomeexodusoutdooradventures" -mosquitto_sub -h nerdyssey.de -p 8883 -t "outdoor/king-arthur/sword/int" -u "exodususer" -P "awesomeexodusoutdooradventures" --capath /etc/ssl/certs/ -d +mosquitto_sub -h excaliburs-erben.de -p 8883 -t "outdoor/king-arthur/sword/int" -u "exodususer" -P "awesomeexodusoutdooradventures" --capath /etc/ssl/certs/ -d ``` - `+` Single-level wildcard: `t1/+/sub2/sub3` diff --git a/docker-compose.yml b/docker-compose.yml index 936ec12..1511094 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ -version: '3.8' - services: exodus-burg-stett-king-arth-web: - image: git.nerdyssey.de/exodus/burg-stett-king-arth-web:latest + image: git.excaliburs-erben.de/exodus/burg-stett-king-arth-web:latest container_name: exodus-burg-stett-king-arth-web restart: unless-stopped # ports: diff --git a/src/router/index.ts b/src/router/index.ts index 0f97b47..6c99b04 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -6,7 +6,7 @@ import Players from '../views/Players.vue' import Start from '../views/Start.vue' import Text from '../views/Text.vue' -const routeBase: string = "nerdyssey.de/exodus/king-arthur" +const routeBase: string = "excaliburs-erben.de/exodus/king-arthur" const routes: any[] = [ { diff --git a/src/services/mqtt.ts b/src/services/mqtt.ts index cd52ad5..cd34dfd 100644 --- a/src/services/mqtt.ts +++ b/src/services/mqtt.ts @@ -1,10 +1,10 @@ import mqtt from 'mqtt' -const mqttBrokerHost = 'mqtt.nerdyssey.de' +const mqttBrokerHost = 'mqtt.excaliburs-erben.de' const mqttBrokerPort = 443 // 9001 if not secure const mqttBrokerPath = '/mqtt' const mqttUseTls = true -const mqttTopicRoot = 'outdoor/king-arthur/sword/' +const mqttTopicRoot = 'staging/outdoor/king-arthur/sword/' const mqttMessage = 'start-hit' const mqttUser = "exodususer"; const mqttPassword = "awesomeexodusoutdooradventures";