From e7393389b878a239d467268fb3a6ff16ae111a21 Mon Sep 17 00:00:00 2001 From: Jakob Gegeniger Date: Sat, 3 Oct 2026 16:06:15 +0200 Subject: [PATCH] proj: Update routes --- .vscode/launch.json | 6 +++--- doc/config.ini | 2 +- doc/setupAutostart.md | 2 +- makefile | 1 + readme.md | 2 +- scripts/run.sh | 6 +++--- scripts/test.sh | 6 +++--- src/sword/swordMain.cpp | 12 ++++++------ src/throne/throneMain.cpp | 6 +++--- src/throneBridge/throneBridgeMain.cpp | 6 +++--- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 4e17123..b65837b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,12 +14,12 @@ "promo", //"test", "${workspaceFolder}/assets", "-n", "SwordDebug", - "-b", "'mqtts://nerdyssey.de:8883'", + "-b", "'mqtts://excaliburs-erben.de:8883'", "-t", "'staging/outdoor/king-arthur/sword/'", "-p", "'awesomeexodusoutdooradventures'", "-u", "'exodususer'", - "-l", "'log.nerdyssey.de'", - "-k", "'uYpJC6WyZAbFK2MUgwNH'" + "-l", "'log.excaliburs-erben.de'", + "-k", "'9SWjXUxmnzcgCKYfzXMI'" ], "stopAtEntry": false, "cwd": "${fileDirname}", diff --git a/doc/config.ini b/doc/config.ini index 57e5025..f91f0f2 100644 --- a/doc/config.ini +++ b/doc/config.ini @@ -16,7 +16,7 @@ RestartSec=5 WantedBy=multi-user.target -; BrockerUrl "mqtts://nerdyssey.de:8883"; +; BrockerUrl "mqtts://excaliburs-erben.de:8883"; ; Topic "outdoor/king-arthur/sword/"; ; MqttUser "exodususer"; ; MqttPassword "awesomeexodusoutdooradventures"; diff --git a/doc/setupAutostart.md b/doc/setupAutostart.md index 55ce9c5..299cf91 100644 --- a/doc/setupAutostart.md +++ b/doc/setupAutostart.md @@ -35,4 +35,4 @@ sudo systemctl status SwordMain.service ``` -promo $(pwd)/assets -b "mqtts://nerdyssey.de:8883" -t "outdoor/king-arthur/sword/" -p "awesomeexodusoutdooradventures" -u "exodususer" \ No newline at end of file +promo $(pwd)/assets -b "mqtts://excaliburs-erben.de:8883" -t "outdoor/king-arthur/sword/" -p "awesomeexodusoutdooradventures" -u "exodususer" \ No newline at end of file diff --git a/makefile b/makefile index 7472b88..12c9dd8 100644 --- a/makefile +++ b/makefile @@ -5,6 +5,7 @@ build: pack_sword: @mkdir -p deploy/sword @cp build/src/sword/SwordMain deploy/sword + @cp scripts/run.sh deploy/sword @cp -r assets deploy/sword @cd deploy && tar -czvf swordMain.tar.gz sword @echo .. extract with "tar -xzvf" diff --git a/readme.md b/readme.md index 6b61956..10976c2 100644 --- a/readme.md +++ b/readme.md @@ -27,5 +27,5 @@ Features Throne for final coronation ## MQTT Testcommands ```sh -mosquitto_sub -h nerdyssey.de -p 8883 -t "staging/outdoor/king-arthur/#" -u "exodususer" -P "awesomeexodusoutdooradventures" --capath /etc/ssl/certs/ -d +mosquitto_sub -h excaliburs-erben.de -p 8883 -t "staging/outdoor/king-arthur/#" -u "exodususer" -P "awesomeexodusoutdooradventures" --capath /etc/ssl/certs/ -d ``` \ No newline at end of file diff --git a/scripts/run.sh b/scripts/run.sh index 50a63a0..b4e2182 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -2,9 +2,9 @@ /home/gustice/workspace/swordStation/SwordMain \ promo /home/gustice/workspace/swordStation/assets \ -n Sword \ - -b mqtts://nerdyssey.de:8883 \ + -b mqtts://excaliburs-erben.de:8883 \ -t outdoor/king-arthur/sword/ \ -p awesomeexodusoutdooradventures \ -u exodususer \ - -l "log.nerdyssey.de" \ - -k "uYpJC6WyZAbFK2MUgwNH" \ No newline at end of file + -l "log.excaliburs-erben.de" \ + -k "9SWjXUxmnzcgCKYfzXMI" \ No newline at end of file diff --git a/scripts/test.sh b/scripts/test.sh index 0992b31..52362fe 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -2,9 +2,9 @@ /home/gustice/workspace/swordStation/SwordMain \ test /home/gustice/workspace/swordStation/assets \ -n SwordDebug \ - -b mqtts://nerdyssey.de:8883 \ + -b mqtts://excaliburs-erben.de:8883 \ -t staging/outdoor/king-arthur/sword/ \ -p awesomeexodusoutdooradventures \ -u exodususer \ - -l "log.nerdyssey.de" \ - -k "uYpJC6WyZAbFK2MUgwNH" \ No newline at end of file + -l "log.excaliburs-erben.de" \ + -k "9SWjXUxmnzcgCKYfzXMI" \ No newline at end of file diff --git a/src/sword/swordMain.cpp b/src/sword/swordMain.cpp index db3813e..661160b 100644 --- a/src/sword/swordMain.cpp +++ b/src/sword/swordMain.cpp @@ -22,12 +22,12 @@ int main(int argc, char* argv[]) { string appName = "SwordDebug"; string modeArg = "test"; string assetsBasePath = "/home/user/assets/sword"; - string brocker = "mqtts://nerdyssey.de:8883"; - string topic = "staging/outdoor/king-arthur/sword/"; - string user = "exodususer"; - string password = "awesomeexodusoutdooradventures"; - string logUrl = "log.nerdyssey.de"; - string logApiKey = "uYpJC6WyZAbFK2MUgwNH"; + string brocker = "mqtts://excaliburs-erben.de:8883"; + string topic = "outdoor/king-arthur/sword/"; + string user = "userForMqttBrocker"; + string password = "passwordForMqttBorcker"; + string logUrl = "log.excaliburs-erben.de"; + string logApiKey = "keyForSeqLoggingService"; app.add_option("startmode", modeArg, "Startup mode")->required(); app.add_option("basepath", assetsBasePath, "Base bath for assets")->required(); app.add_option("-n,--name", appName, "Name of App"); diff --git a/src/throne/throneMain.cpp b/src/throne/throneMain.cpp index ebce1bd..6733f40 100644 --- a/src/throne/throneMain.cpp +++ b/src/throne/throneMain.cpp @@ -159,12 +159,12 @@ int main(int argc, char* argv[]) { CLI::App app{"Sword Firmware"}; string modeArg = "test"; string assetsBasePath = "/home/user/assets"; - string brocker = "mqtts://nerdyssey.de:8883"; + string brocker = "mqtts://excaliburs-erben.de:8883"; string topic = "staging/outdoor/king-arthur/sword/"; string user = "exodususer"; string password = "awesomeexodusoutdooradventures"; - string logUrl = "log.nerdyssey.de"; - string logApiKey = "uYpJC6WyZAbFK2MUgwNH"; + string logUrl = "log.excaliburs-erben.de"; + string logApiKey = "9SWjXUxmnzcgCKYfzXMI"; app.add_option("startmode", modeArg, "Startup mode")->required(); app.add_option("basepath", assetsBasePath, "Base bath for assets")->required(); app.add_option("-b,--brocker", brocker, "MQTT Topic URL"); diff --git a/src/throneBridge/throneBridgeMain.cpp b/src/throneBridge/throneBridgeMain.cpp index ebce1bd..6733f40 100644 --- a/src/throneBridge/throneBridgeMain.cpp +++ b/src/throneBridge/throneBridgeMain.cpp @@ -159,12 +159,12 @@ int main(int argc, char* argv[]) { CLI::App app{"Sword Firmware"}; string modeArg = "test"; string assetsBasePath = "/home/user/assets"; - string brocker = "mqtts://nerdyssey.de:8883"; + string brocker = "mqtts://excaliburs-erben.de:8883"; string topic = "staging/outdoor/king-arthur/sword/"; string user = "exodususer"; string password = "awesomeexodusoutdooradventures"; - string logUrl = "log.nerdyssey.de"; - string logApiKey = "uYpJC6WyZAbFK2MUgwNH"; + string logUrl = "log.excaliburs-erben.de"; + string logApiKey = "9SWjXUxmnzcgCKYfzXMI"; app.add_option("startmode", modeArg, "Startup mode")->required(); app.add_option("basepath", assetsBasePath, "Base bath for assets")->required(); app.add_option("-b,--brocker", brocker, "MQTT Topic URL");