proj: Update routes

.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}",

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";

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"
+promo $(pwd)/assets -b "mqtts://excaliburs-erben.de:8883" -t "outdoor/king-arthur/sword/" -p "awesomeexodusoutdooradventures" -u "exodususer"

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"

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
 ```

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"
+ -l "log.excaliburs-erben.de" \
+ -k "9SWjXUxmnzcgCKYfzXMI"

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"
+ -l "log.excaliburs-erben.de" \
+ -k "9SWjXUxmnzcgCKYfzXMI"

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");

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");

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");