Updated installers to be compatible with scheme for determining servi…

…ce status

software/Infrastructure/jaeger/properties.json

@@ -1,6 +1,6 @@
 {
 	"packageName":"open+quarter+master-infra-jaeger",
-	"version":"1.0.2",
+	"version":"1.0.3",
 	"description":"Jaeger instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/jaeger",
 	"configs": [

software/Infrastructure/makeInstallers.sh

@@ -38,16 +38,21 @@ for curPackage in ${packages[@]}; do
 	packageConfigFile="$curPackage/properties.json"
 	packageDebDir="$buildDir/$curPackage/$debDir"
 	echo "Creating deb installer for $curPackage"
+
+	serviceFile="$(jq -r '.packageName' "$packageConfigFile").service"
+	serviceFileEscaped="$(systemd-escape "$serviceFile")"
 	#
 	# Debian build
 	#
 
+
+
 	mkdir -p "$packageDebDir"
 	mkdir "$packageDebDir/DEBIAN"
 	mkdir -p "$packageDebDir/etc/systemd/system/"
 
-	cp "$curPackage/oqm_$curPackage.service" "$packageDebDir/etc/systemd/system/"
-	sed -i "s/\${version}/$(jq -r '.version' "$packageConfigFile")/" "$packageDebDir/etc/systemd/system/oqm_$curPackage.service"
+	cp "$curPackage/$serviceFile" "$packageDebDir/etc/systemd/system/$serviceFileEscaped"
+	sed -i "s/\${version}/$(jq -r '.version' "$packageConfigFile")/" "$packageDebDir/etc/systemd/system/$serviceFileEscaped"
 
 	# TODO:: license information https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 	# https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-binarycontrolfiles
@@ -87,8 +92,8 @@ EOT
 #!/bin/bash
 
 systemctl daemon-reload
-systemctl enable oqm_$curPackage.service
-systemctl start oqm_$curPackage.service
+systemctl enable "$serviceFileEscaped"
+systemctl start "$serviceFileEscaped"
 
 #add config to file
 mkdir -p /etc/oqm/serviceConfig
@@ -110,8 +115,8 @@ EOT
 	cat <<EOT >> "$packageDebDir/DEBIAN/prerm"
 #!/bin/bash
 
-systemctl disable oqm_$curPackage.service
-systemctl stop oqm_$curPackage.service
+systemctl disable "$serviceFileEscaped"
+systemctl stop "$serviceFileEscaped"
 
 # remove config from infra config file
 EOT

software/Infrastructure/mongo/properties.json

@@ -1,6 +1,6 @@
 {
 	"packageName":"open+quarter+master-infra-mongodb",
-	"version":"1.0.2",
+	"version":"1.0.3",
 	"description":"MongoDb instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/mongo",
 	"configs": [

software/Infrastructure/prometheus/properties.json

@@ -1,6 +1,6 @@
 {
 	"packageName":"open+quarter+master-infra-prometheus",
-	"version":"1.0.2",
+	"version":"1.0.3",
 	"description":"Prometheus instance for Open QuarterMaster.",
 	"homepage":"https://github.com/Epic-Breakfast-Productions/OpenQuarterMaster/tree/main/software/Infrastructure/prometheus",
 	"configs": [

software/open-qm-base-station/docs/Releasing.md

@@ -13,13 +13,16 @@ Prereqs:
 
 These are the steps to take to perform a release of the software:
 
-1. Run _all_ tests:
+1. If it's been a while...
+   1. review Dockerfiles for base image version
+   2. review dependencies for version updates
+2. Run _all_ tests:
     1. `./gradlew clean test `
     2. If it's been a while, review Dockerfiles for base image version
-2. Increment version of service accordingly in `build.gradle`
-3. Ensure everything committed and pushed to github. Check workflows.
-4. Be logged into docker hub with ebprod user `docker login`
-5. Deploy jvm version
+3. Increment version of service accordingly in `build.gradle`
+4. Ensure everything committed and pushed to github. Check workflows.
+5. Be logged into docker hub with ebprod user `docker login`
+6. Deploy jvm version
     1. Clean/build/push project `./gradlew clean build -Pquarkus.container-image.build=true -Pquarkus.docker.buildx.platform=linux/arm64,linux/amd64 -Pquarkus.container-image.group=ebprod -Pquarkus.container-image.push=true`
 7. Make installers: `./makeInstallers.sh`
 8. Make release for version on Github, attach all installers to it (`build/installers`)

software/open-qm-base-station/makeInstallers.sh

@@ -39,8 +39,11 @@ mkdir "$buildDir/$debDir"
 mkdir "$buildDir/$debDir/DEBIAN"
 mkdir -p "$buildDir/$debDir/etc/systemd/system/"
 
-cp oqm_base_station.service "$buildDir/$debDir/etc/systemd/system/"
-sed -i "s/\${version}/$(./gradlew -q printVersion)/" "$buildDir/$debDir/etc/systemd/system/oqm_base_station.service"
+serviceFile="open+quarter+master-core-base+station.service"
+serviceFileEscaped="$(systemd-escape "$serviceFile")"
+
+cp "$serviceFile" "$buildDir/$debDir/etc/systemd/system/$serviceFileEscaped"
+sed -i "s/\${version}/$(./gradlew -q printVersion)/" "$buildDir/$debDir/etc/systemd/system/$serviceFileEscaped"
 
 # TODO:: license information https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 # https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-binarycontrolfiles
@@ -92,16 +95,16 @@ cat <<EOT >> "$buildDir/$debDir/DEBIAN/postinst"
 #!/bin/bash
 
 systemctl daemon-reload
-systemctl enable oqm_base_station.service
-systemctl start oqm_base_station.service
+systemctl enable "$serviceFileEscaped"
+systemctl start "$serviceFileEscaped"
 EOT
 chmod +x "$buildDir/$debDir/DEBIAN/postinst"
 
 cat <<EOT >> "$buildDir/$debDir/DEBIAN/prerm"
 #!/bin/bash
 
-systemctl disable oqm_base_station.service
-systemctl stop oqm_base_station.service
+systemctl disable "$serviceFileEscaped"
+systemctl stop "$serviceFileEscaped"
 EOT
 chmod +x "$buildDir/$debDir/DEBIAN/prerm"