Skip to content

Commit 5de36c7

Browse files
authored
Packaging: Add directories and symlinks to deb/rpm packages (#6327)
* Packaging: Add common dirs to rpm/deb * Packaging: dir permissions * Packaging: add cmd symlinks to rpm/deb * Packaging: Use BUILD macros: ST2_PACKS_GROUP and ST2_SVC_USER * update changelog entry
1 parent 0b5b1ab commit 5de36c7

File tree

3 files changed

+78
-1
lines changed

3 files changed

+78
-1
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Added
7979
to pants' use of PEX lockfiles. This is not a user-facing addition.
8080
#6118 #6141 #6133 #6120 #6181 #6183 #6200 #6237 #6229 #6240 #6241 #6244 #6251 #6253
8181
#6254 #6258 #6259 #6260 #6269 #6275 #6279 #6278 #6282 #6283 #6273 #6287 #6306 #6307
82-
#6311 #6314 #6315 #6317 #6319 #6312 #6320 #6321 #6323 #6324 #6325 #6326
82+
#6311 #6314 #6315 #6317 #6319 #6312 #6320 #6321 #6323 #6324 #6325 #6326 #6327
8383
Contributed by @cognifloyd
8484
* Build of ST2 EL9 packages #6153
8585
Contributed by @amanda11

packaging/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ nfpm_deb_package(
3636
"./deb/scripts",
3737
"./deb/systemd:services",
3838
"./common/systemd:generators",
39+
"./common:dirs",
40+
"./common:symlinks",
3941
],
4042
scripts=dict(
4143
preinstall="deb/scripts/pre-install.sh",
@@ -66,6 +68,8 @@ nfpm_rpm_package(
6668
"./rpm/scripts",
6769
"./rpm/systemd:services",
6870
"./common/systemd:generators",
71+
"./common:dirs",
72+
"./common:symlinks",
6973
],
7074
scripts=dict(
7175
preinstall="rpm/scripts/pre-install.sh",

packaging/common/BUILD

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
nfpm_content_dirs(
2+
name="root_dirs",
3+
dirs=[
4+
# "/etc/bash_completion.d",
5+
# "/etc/logrotate.d",
6+
"/etc/st2",
7+
"/opt/stackstorm",
8+
"/opt/stackstorm/st2",
9+
"/usr/share/doc/st2",
10+
],
11+
file_owner="root",
12+
file_group="root",
13+
file_mode="rwxr-xr-x",
14+
)
15+
16+
nfpm_content_dirs(
17+
name="packs_group_dirs",
18+
dirs=[
19+
"/opt/stackstorm/packs",
20+
"/opt/stackstorm/virtualenvs",
21+
"/usr/share/doc/st2/examples",
22+
],
23+
file_owner="root",
24+
file_group=ST2_PACKS_GROUP,
25+
file_mode="rwxrwxr-x",
26+
)
27+
28+
nfpm_content_dirs(
29+
name="st2_user_dirs",
30+
dirs=[
31+
"/opt/stackstorm/configs",
32+
"/opt/stackstorm/exports",
33+
"/opt/stackstorm/overrides",
34+
"/var/log/st2",
35+
"/var/run/st2",
36+
],
37+
file_owner=ST2_SVC_USER,
38+
file_group="root",
39+
file_mode="rwxr-xr-x",
40+
)
41+
42+
target(
43+
name="dirs",
44+
dependencies=[
45+
":root_dirs",
46+
":packs_group_dirs",
47+
":st2_user_dirs",
48+
],
49+
)
50+
51+
nfpm_content_symlinks(
52+
name="symlinks",
53+
symlinks=[
54+
# the symlink src will be made available during post-install script
55+
(f"/opt/stackstorm/st2/bin/{cmd}", f"/usr/bin/{cmd}")
56+
for cmd in (
57+
"st2",
58+
"st2-trigger-refire",
59+
"st2-rule-tester",
60+
"st2-run-pack-tests",
61+
"st2-register-content",
62+
"st2-apply-rbac-definitions",
63+
"st2-bootstrap-rmq",
64+
"st2-generate-symmetric-crypto-key",
65+
"st2-self-check",
66+
"st2-track-result",
67+
"st2-validate-pack-config",
68+
"st2ctl",
69+
)
70+
],
71+
file_owner="root",
72+
file_group="root",
73+
)

0 commit comments

Comments
 (0)