Skip to content

Commit 0da0cff

Browse files
M0Rf30M0Rf30
authored
chore(pkgbuild): split package functions for legacy/modern systemd targets (#83)
- Add service-discover-legacy.service with WantedBy=multi-user.target for both server and agent - Split package() into distro-specific functions for both server and agent - Rocky 8/Ubuntu Jammy use legacy service (multi-user.target) - Rocky 9/Ubuntu Noble use modern service: - server: carbonio-directory-server.target - agent: carbonio-appserver.target carbonio-mta.target carbonio-proxy.target carbonio.target Refs: CO-2808
1 parent 7c1f379 commit 0da0cff

File tree

6 files changed

+124
-26
lines changed

6 files changed

+124
-26
lines changed

‎build/agent/PKGBUILD‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,52 @@ conflicts=(
2727
)
2828
source=(
2929
"service-discover.service"
30+
"service-discover-legacy.service"
3031
)
3132
sha256sums=(
32-
'217caccf9ecbb4c607dc9aadd2ba47b39de0c71aee5bb496bc84a4f99159fb22'
33+
'05d8118237df2a745c3eec4678b38a4b31920e043298d9a733eba77326b42c92'
34+
'e0e17bae0bfb978dd52718a03079eaf30c2bf5dba080ca98c2964eb42e02bf14'
3335
)
3436

35-
build() {
36-
cd "$(dirname "$(find / -name "yap.json" -print -quit)")/.."
37-
CGO_ENABLED=0 go build \
38-
-o "${srcdir}/agent" \
39-
cmd/agent/agent.go
37+
_package_legacy() {
38+
cd "${srcdir}"
39+
install -Dm 755 agent \
40+
"${pkgdir}/usr/bin/service-discover"
41+
install -Dm 644 service-discover-legacy.service \
42+
"${pkgdir}/lib/systemd/system/service-discover.service"
4043
}
4144

42-
package() {
45+
_package_systemd() {
4346
cd "${srcdir}"
4447
install -Dm 755 agent \
4548
"${pkgdir}/usr/bin/service-discover"
4649
install -Dm 644 service-discover.service \
4750
"${pkgdir}/lib/systemd/system/service-discover.service"
4851
}
4952

53+
build() {
54+
cd "$(dirname "$(find / -name "yap.json" -print -quit)")/.."
55+
CGO_ENABLED=0 go build \
56+
-o "${srcdir}/agent" \
57+
cmd/agent/agent.go
58+
}
59+
60+
package__rocky_8() {
61+
_package_legacy
62+
}
63+
64+
package__rocky_9() {
65+
_package_systemd
66+
}
67+
68+
package__ubuntu_jammy() {
69+
_package_legacy
70+
}
71+
72+
package__ubuntu_noble() {
73+
_package_systemd
74+
}
75+
5076
postinst__apt() {
5177
# Automatically added by dh_systemd_enable/11.1.6ubuntu2
5278
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then

‎build/agent/service-discover-legacy.service‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# SPDX-FileCopyrightText: 2021-2022, 2024-2025 Zextras <https://www.zextras.com>
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only
4+
5+
[Unit]
6+
Description=Zextras Service Discover Agent
7+
Documentation=https://docs.zextras.com/
8+
Requires=network-online.target
9+
After=network-online.target
10+
11+
[Service]
12+
Type=notify
13+
ExecStart=/usr/bin/service-discoverd agent
14+
Restart=on-failure
15+
RestartSec=15s
16+
KillMode=process
17+
LimitNOFILE=65536
18+
ExecReload=/usr/bin/consul reload
19+
TimeoutSec=120s
20+
TimeoutStopSec=120s
21+
22+
[Install]
23+
WantedBy=multi-user.target

‎build/agent/service-discover.service‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
# SPDX-License-Identifier: AGPL-3.0-only
44

55
[Unit]
6-
Description=Service discover agent for Zextras
6+
Description=Zextras Service Discover Agent
77
Documentation=https://docs.zextras.com/
88
Requires=network-online.target
99
After=network-online.target
10-
PartOf=carbonio.target
10+
PartOf=carbonio-appserver.target carbonio-mta.target carbonio-proxy.target carbonio.target
1111

1212
[Service]
1313
Type=notify
1414
ExecStart=/usr/bin/service-discoverd agent
1515
Restart=on-failure
16-
RestartSec=15
16+
RestartSec=15s
1717
KillMode=process
1818
LimitNOFILE=65536
1919
ExecReload=/usr/bin/consul reload
20-
TimeoutSec=120
21-
TimeoutStopSec=120
20+
TimeoutSec=120s
21+
TimeoutStopSec=120s
2222

2323
[Install]
24-
WantedBy=multi-user.target
24+
WantedBy=carbonio-appserver.target carbonio-mta.target carbonio-proxy.target carbonio.target

‎build/server/PKGBUILD‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,52 @@ depends=(
2626
conflicts=("service-discover-agent")
2727
source=(
2828
"service-discover.service"
29+
"service-discover-legacy.service"
2930
)
3031
sha256sums=(
31-
'66f5ebdf2a93fdbf7a155daecfebb0c8d72ab0bce8148eb1c7a346d3658f7e60'
32+
'b7d5be9bb79a5afb5784ddfe302db4fadbc60668c44f0f1aafd8f450819c63c7'
33+
'5780163ac614276da1c812580686eb8adfdbfe9eebe62397d6a354ca461db1a9'
3234
)
3335

34-
build() {
35-
cd "$(dirname "$(find / -name "yap.json" -print -quit)")/.."
36-
CGO_ENABLED=0 go build \
37-
-o "${srcdir}/server" \
38-
cmd/server/server.go
36+
_package_legacy() {
37+
cd "${srcdir}"
38+
install -Dm 755 server \
39+
"${pkgdir}/usr/bin/service-discover"
40+
install -Dm 644 service-discover-legacy.service \
41+
"${pkgdir}/lib/systemd/system/service-discover.service"
3942
}
4043

41-
package() {
44+
_package_systemd() {
4245
cd "${srcdir}"
4346
install -Dm 755 server \
4447
"${pkgdir}/usr/bin/service-discover"
4548
install -Dm 644 service-discover.service \
4649
"${pkgdir}/lib/systemd/system/service-discover.service"
4750
}
4851

52+
build() {
53+
cd "$(dirname "$(find / -name "yap.json" -print -quit)")/.."
54+
CGO_ENABLED=0 go build \
55+
-o "${srcdir}/server" \
56+
cmd/server/server.go
57+
}
58+
59+
package__rocky_8() {
60+
_package_legacy
61+
}
62+
63+
package__rocky_9() {
64+
_package_systemd
65+
}
66+
67+
package__ubuntu_jammy() {
68+
_package_legacy
69+
}
70+
71+
package__ubuntu_noble() {
72+
_package_systemd
73+
}
74+
4975
postinst__apt() {
5076
# Automatically added by dh_systemd_enable/11.1.6ubuntu2
5177
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then

‎build/server/service-discover-legacy.service‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# SPDX-FileCopyrightText: 2021-2022, 2024-2025 Zextras <https://www.zextras.com>
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only
4+
5+
[Unit]
6+
Description=Zextras Service Discover Server
7+
Documentation=https://docs.zextras.com/
8+
Requires=network-online.target
9+
After=network-online.target
10+
11+
[Service]
12+
Type=notify
13+
ExecStart=/usr/bin/service-discoverd server
14+
Restart=on-failure
15+
RestartSec=15s
16+
KillMode=process
17+
LimitNOFILE=65536
18+
ExecReload=/usr/bin/consul reload
19+
TimeoutSec=120s
20+
TimeoutStopSec=120s
21+
22+
[Install]
23+
WantedBy=multi-user.target

‎build/server/service-discover.service‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
# SPDX-License-Identifier: AGPL-3.0-only
44

55
[Unit]
6-
Description=Service discover server for Zextras
6+
Description=Zextras Service Discover Server
77
Documentation=https://docs.zextras.com/
88
Requires=network-online.target
99
After=network-online.target
10-
PartOf=carbonio.target
10+
PartOf=carbonio-directory-server.target
1111

1212
[Service]
1313
Type=notify
1414
ExecStart=/usr/bin/service-discoverd server
1515
Restart=on-failure
16-
RestartSec=15
16+
RestartSec=15s
1717
KillMode=process
1818
LimitNOFILE=65536
1919
ExecReload=/usr/bin/consul reload
20-
TimeoutSec=120
21-
TimeoutStopSec=120
20+
TimeoutSec=120s
21+
TimeoutStopSec=120s
2222

2323
[Install]
24-
WantedBy=multi-user.target
24+
WantedBy=carbonio-directory-server.target

0 commit comments

Comments
 (0)