From f6b74ee473a7cce76c4cfc1ae349c2c1d03b80a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Mon, 13 Sep 2021 13:41:32 +0200 Subject: [PATCH 1/4] Change binary location in apt package to be consistent with operator binaries and rpm package. Currently the agent binary is in different places for the rpm and the apt package: RPM: /opt/stackable/stackable-agent/stackable-agent APT: /opt/stackable-agent/stackable-agent This commit changes to location on APT packages to /opt/stackable/stackable-agent/stackable-agent as well, so that this is consistent for all delivery mechanisms. Fixes #301 --- Cargo.toml | 2 +- packaging/debian/service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d6ebd120..294aea3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,5 +71,5 @@ maintainer-scripts = "packaging/debian/" systemd-units = { enable = false } assets = [ ["packaging/config/agent.conf", "etc/stackable/stackable-agent/", "644"], - ["target/release/stackable-agent", "opt/stackable-agent/stackable-agent", "755"], + ["target/release/stackable-agent", "opt/stackabe/stackable-agent/stackable-agent", "755"], ] diff --git a/packaging/debian/service b/packaging/debian/service index d80fa43a..0549d4b4 100644 --- a/packaging/debian/service +++ b/packaging/debian/service @@ -4,7 +4,7 @@ Before= After=network.target [Service] User=root -ExecStart=/opt/stackable-agent/stackable-agent +ExecStart=/opt/stackable/stackable-agent/stackable-agent Restart=on-abort StandardOutput=journal StandardError=journal From 848b6919f882f910097ac4395634e19148d39b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Mon, 13 Sep 2021 14:16:06 +0200 Subject: [PATCH 2/4] Tiny mistake ... --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 294aea3c..1d2f66b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,5 +71,5 @@ maintainer-scripts = "packaging/debian/" systemd-units = { enable = false } assets = [ ["packaging/config/agent.conf", "etc/stackable/stackable-agent/", "644"], - ["target/release/stackable-agent", "opt/stackabe/stackable-agent/stackable-agent", "755"], + ["target/release/stackable-agent", "opt/stackable/stackable-agent/stackable-agent", "755"], ] From 06c6e76f063d844d7165316970cf0bf74888cfef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Mon, 13 Sep 2021 14:30:43 +0200 Subject: [PATCH 3/4] Added change of binary name to CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 702015d1..7dcffb05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.7.0 - unreleased +### Changed +- Changed the binary location for APT packages from `/opt/stackable-agent/stackable-agent` to `/opt/stackable/stackable-agent/stackable-agent` + ([#304]). + ## 0.6.0 - 2021-09-08 ### Added From ade445072fc2b3d6754cdb6c74f83afda08fce2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Mon, 13 Sep 2021 14:36:27 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md Co-authored-by: Siegfried Weber --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dcffb05..b8a763a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Changed the binary location for APT packages from `/opt/stackable-agent/stackable-agent` to `/opt/stackable/stackable-agent/stackable-agent` ([#304]). +[#304]: https://github.com/stackabletech/agent/pull/304 ## 0.6.0 - 2021-09-08 ### Added