DEV-2010: fix service name (#20)

* use service name instead of package * Fix path, no openvpn uploads * serviceName, not serviceUnit --------- Co-authored-by: Jon Henrik Bjørnstad <[email protected]>
qbee-io · Jan 29, 2024 · abe9d76 · abe9d76
1 parent 0d0af88
commit abe9d76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/app/configuration/bundle_software_management.go b/app/configuration/bundle_software_management.go
@@ -338,7 +338,7 @@ func (s Software) restart(ctx context.Context, srv *Service) {
 	cmd = []string{systemctlBin, "restart", serviceUnit}
 
 	// Make sure that qbee-agent is never restarted in blocking mode.
-	if s.Package == "qbee-agent" {
+	if serviceName == "qbee-agent" {
 		cmd = []string{systemctlBin, "--no-block", "restart", serviceUnit}
 	}
 

diff --git a/script/upload-updates b/script/upload-updates
@@ -6,7 +6,7 @@ SCRIPT_DIR=$(cd $(dirname $0) && pwd)
 BASEDIR=$(dirname $SCRIPT_DIR)
 source $SCRIPT_DIR/config.env
 
-COMMON_SRC_DIR="$BASEDIR/../../src"
+COMMON_SRC_DIR="$BASEDIR/../platform/src"
 
 SIGNING_KEY_PATH=$1
 UPLOAD_AWS_REGION="${AWS_REGION:-eu-west-1}"
@@ -54,17 +54,4 @@ function upload_agent_update() {
   done
 }
 
-
-function upload_openvpn_update() {
-
-  OPENVPN_BASE="$BASEDIR/../agent-v1/static/targets"
-
-  for arch in "${SUPPORTED_ARCHS[@]}"; do 
-    echo "Uploading openvpn $VERSION $arch (file: $OPENVPN_BASE/${arch_openvpn[$arch]}/openvpn"
-    upload_update "openvpn" "$arch" "$OPENVPN_BASE/${arch_openvpn[$arch]}/openvpn"
-  done
-
-}
-
-upload_openvpn_update
 upload_agent_update