Skip to content

Commit 40a6332

Browse files
authored
feat: Updates post-install for linux package builds (#27003)
Nearly clean cherry-pick from main-2.x. Final result is identical to main-2.x. Co-authored-by: Brandon Pfeifer <bpfeifer@influxdata.com> (cherry picked from commit 0f4cd4e) Closes: #27002
1 parent 5e204dc commit 40a6332

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.circleci/packages/config.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ packages:
5959
group: root
6060
perms: 0755
6161
target: usr/lib/influxdb/scripts/influxd-systemd-start.sh
62+
63+
- owner: root
64+
group: root
65+
perms: 0644
66+
target: lib/systemd/system/influxdb.service
6267
source: .circleci/packages/influxdb2
6368
deb:
6469
recommends:
@@ -70,4 +75,4 @@ packages:
7075
- curl
7176
rpm:
7277
recommends:
73-
- influxdata-archive-keyring
78+
- influxdata-archive-keyring

.circleci/packages/influxdb2/control/post-install

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ function install_init {
1313
}
1414

1515
function install_systemd {
16-
cp -f $SCRIPT_DIR/influxdb.service /lib/systemd/system/influxdb.service
16+
# Service file is now installed directly by RPM - just enable it
17+
systemctl daemon-reload
1718
systemctl enable influxdb
1819
}
1920

.circleci/packages/influxdb2/control/post-uninstall

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
function disable_systemd {
44
systemctl disable influxdb
5-
rm -f /lib/systemd/system/influxdb.service
65
}
76

87
function disable_update_rcd {

.circleci/packages/influxdb2/fs/usr/lib/influxdb/scripts/influxdb.service renamed to .circleci/packages/influxdb2/fs/lib/systemd/system/influxdb.service

File renamed without changes.

0 commit comments

Comments
 (0)