From e09e3d5cbe9a6e9660060caacb507b71e2298c54 Mon Sep 17 00:00:00 2001 From: Isa Farnik Date: Mon, 21 Oct 2024 15:27:07 -0700 Subject: [PATCH] fix(pkgs): ensure 2.8 systemd unit present --- build/package/nfpm.yaml | 2 ++ changelog/unreleased/kong/fix_service_file.yml | 3 +++ scripts/explain_manifest/fixtures/alpine-amd64.txt | 2 ++ scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt | 2 ++ scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt | 2 ++ scripts/explain_manifest/fixtures/debian-11-amd64.txt | 2 ++ scripts/explain_manifest/fixtures/el8-amd64.txt | 2 ++ scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt | 2 ++ scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt | 2 ++ scripts/explain_manifest/suites.py | 2 ++ 10 files changed, 21 insertions(+) create mode 100644 changelog/unreleased/kong/fix_service_file.yml diff --git a/build/package/nfpm.yaml b/build/package/nfpm.yaml index 7c3940903cb1..419b23ff6756 100644 --- a/build/package/nfpm.yaml +++ b/build/package/nfpm.yaml @@ -31,6 +31,8 @@ contents: dst: /etc/kong - src: bin/kong dst: /usr/local/bin/kong +- src: build/package/kong.service + dst: /lib/systemd/system/kong.service - src: build/package/kong.logrotate dst: /etc/kong/kong.logrotate scripts: diff --git a/changelog/unreleased/kong/fix_service_file.yml b/changelog/unreleased/kong/fix_service_file.yml new file mode 100644 index 000000000000..03cb98e619d5 --- /dev/null +++ b/changelog/unreleased/kong/fix_service_file.yml @@ -0,0 +1,3 @@ +message: "Fixed an issue where the systemd service unit file was missing from packages." +type: bugfix +scope: Core diff --git a/scripts/explain_manifest/fixtures/alpine-amd64.txt b/scripts/explain_manifest/fixtures/alpine-amd64.txt index 148e352515f2..d81baedad064 100644 --- a/scripts/explain_manifest/fixtures/alpine-amd64.txt +++ b/scripts/explain_manifest/fixtures/alpine-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt index 3d0e4868ebe3..5a123c1bdbd8 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt index 01328af3a9ac..0e3df9c38ef7 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2023-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/fixtures/debian-11-amd64.txt b/scripts/explain_manifest/fixtures/debian-11-amd64.txt index 9b20fbb595b6..dbb985c4b087 100644 --- a/scripts/explain_manifest/fixtures/debian-11-amd64.txt +++ b/scripts/explain_manifest/fixtures/debian-11-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/fixtures/el8-amd64.txt b/scripts/explain_manifest/fixtures/el8-amd64.txt index cb5d0045ac2c..b99d9e319888 100644 --- a/scripts/explain_manifest/fixtures/el8-amd64.txt +++ b/scripts/explain_manifest/fixtures/el8-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt index 4c29e30d3970..dffccadd0236 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt index e736498f2710..db3985d10885 100644 --- a/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt +++ b/scripts/explain_manifest/fixtures/ubuntu-22.04-amd64.txt @@ -1,5 +1,7 @@ - Path : /etc/kong/kong.logrotate +- Path : /lib/systemd/system/kong.service + - Path : /usr/local/kong/include/google Type : directory diff --git a/scripts/explain_manifest/suites.py b/scripts/explain_manifest/suites.py index 29fc4e7d1412..9f63d4c660ff 100644 --- a/scripts/explain_manifest/suites.py +++ b/scripts/explain_manifest/suites.py @@ -16,6 +16,8 @@ def common_suites(expect, libxcrypt_no_obsolete_api: bool = False): expect("/etc/kong/kong.logrotate", "includes logrotate config").exists() + expect("/lib/systemd/system/kong.service", "includes systemd unit file").exists() + expect("/usr/local/kong/include/openssl/**.h", "includes OpenSSL headers").exists() # binary correctness