summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-10-18 17:58:40 +0300
committerGitHub <noreply@github.com>2024-10-18 17:58:40 +0300
commit167cba6556c84deacf5b8864eb8bcdf9051f25e3 (patch)
treed5d9d736ac27cda0419f5a217a3afb56c66f4290
parent2359180068a653e39724a33b91bfa1ed395c1993 (diff)
parentbf2e6afc49ca43c5ba81f79787e8d866517263ca (diff)
downloadvyos-build-167cba6556c84deacf5b8864eb8bcdf9051f25e3.tar.gz
vyos-build-167cba6556c84deacf5b8864eb8bcdf9051f25e3.zip
Merge pull request #813 from dmbaturin/T6776-zabbix-updates
build: T6776: use the official Zabbix repo for zabbix-agent2
-rw-r--r--data/architectures/amd64.toml3
-rw-r--r--data/architectures/arm64.toml3
-rw-r--r--data/live-build-config/archives/zabbix-official-repo.key.chrootbin0 -> 1183 bytes
3 files changed, 4 insertions, 2 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml
index 79922d7e..5c83a660 100644
--- a/data/architectures/amd64.toml
+++ b/data/architectures/amd64.toml
@@ -1,5 +1,6 @@
additional_repositories = [
- "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main"
+ "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main",
+ "deb https://repo.zabbix.com/zabbix/6.0/debian bookworm main"
]
# Packages added to images for x86 by default
diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml
index 228d0f3f..c64e19a1 100644
--- a/data/architectures/arm64.toml
+++ b/data/architectures/arm64.toml
@@ -1,5 +1,6 @@
additional_repositories = [
- "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main"
+ "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main",
+ "deb https://repo.zabbix.com/zabbix/6.0/debian-arm64 bookworm main"
]
# Packages included in ARM64 images by default
diff --git a/data/live-build-config/archives/zabbix-official-repo.key.chroot b/data/live-build-config/archives/zabbix-official-repo.key.chroot
new file mode 100644
index 00000000..660c453a
--- /dev/null
+++ b/data/live-build-config/archives/zabbix-official-repo.key.chroot
Binary files differ