Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV-2010: fix service name #20

Merged
merged 3 commits into from
Jan 29, 2024
Merged

DEV-2010: fix service name #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4d9a42
use service name instead of package
jonhenrik13 Jan 29, 2024
3b2e41b
Fix path, no openvpn uploads
jonhenrik13 Jan 29, 2024
e084ba4
serviceName, not serviceUnit
jonhenrik13 Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/configuration/bundle_software_management.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}

Expand Down
15 changes: 1 addition & 14 deletions script/upload-updates
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Loading