Core - Base Station - Cleanup from review

Epic-Breakfast-Productions · Feb 4, 2025 · a698da5 · a698da5
1 parent 7d02b32
commit a698da5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/software/oqm-core-base-station/installerSrc/core-baseStation-proxy-config.json b/software/oqm-core-base-station/installerSrc/core-baseStation-proxy-config.json
@@ -1,7 +1,6 @@
 {
 	"type": "core",
 	"name": "base-station",
-	"title": "Base Station",
 	"internalBaseUriConfig": "core.baseStation.internalBaseUri",
 	"preservePath": true,
 	"stripPrefixes": true

diff --git a/software/oqm-core-base-station/installerSrc/installerProperties.json b/software/oqm-core-base-station/installerSrc/installerProperties.json
@@ -6,7 +6,7 @@
 	"description": "Base Station instance for Open QuarterMaster.",
 	"homepage": "https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/open-qm-base-station",
 	"dependencies": {
-		"deb": "curl, jq, docker.io, oqm-manager-station+captain (>= 2.0.0), oqm-infra-keycloak (>= 1.1.0), oqm-core-depot, oqm-core-api (>= 2.1.0)",
+		"deb": "curl, jq, docker.io, oqm-manager-station+captain (>= 2.0.0), oqm-infra-keycloak (>= 1.1.0), oqm-infra-traefik (>= 1.0.0), oqm-core-depot, oqm-core-api (>= 2.1.0)",
 		"debRec": "oqm-plugin-ext_item_search"
 	},
 	"copyright": {

diff --git a/software/oqm-core-base-station/installerSrc/oqm-core-base_station.service b/software/oqm-core-base-station/installerSrc/oqm-core-base_station.service
@@ -71,8 +71,6 @@ ExecStartPost=/bin/bash -c "running=\"false\"; \
                                 fi; \
                             done; \
                             "
-# docker run --rm --name oqm-core-base_station-test --network=oqm-internal docker.io/curlimages/curl:latest https://oqm-core-base_station:443/q/health -k
-# docker run --rm --name oqm-core-base_station-ssl --network=oqm-internal docker.io/alpine/openssl:latest s_client -connect oqm-core-base_station:443 -servername oqm-core-base_station
 ExecStartPost=/bin/bash -c "running=\"false\"; \
                             healthUri=\"$(oqm-config -g core.baseStation.internalBaseUri)/q/health\"; \
                             while [ \"$running\" != \"true\" ]; do \

diff --git a/software/oqm-core-base-station/makeInstallers.sh b/software/oqm-core-base-station/makeInstallers.sh
@@ -109,8 +109,6 @@ cat <<EOT >> "$buildDir/$debDir/DEBIAN/postinst"
 #!/bin/bash
 
 systemctl daemon-reload
-# restart proxy after we add config
-#systemctl restart "open\\x2bquarter\\x2bmaster\\x2dinfra\\x2dnginx.service"
 systemctl enable "$serviceFileEscaped"
 systemctl start "$serviceFileEscaped"
 EOT
@@ -141,7 +139,6 @@ if [ $( docker ps -a | grep oqm-core-base_station | wc -l ) -gt 0 ]; then
 else
         echo "Docker container was already gone."
 fi
-#systemctl restart "open\\x2bquarter\\x2bmaster\\x2dinfra\\x2dnginx.service"
 
 EOT
 chmod +x "$buildDir/$debDir/DEBIAN/postrm"