Rebase zabbix server on jammy, add jammy_minimal

ngardiner · Jun 11, 2023 · c140905 · c140905
1 parent 7a31f6d
commit c140905
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/jammy_minimal/.gitignore b/jammy_minimal/.gitignore
@@ -3,4 +3,4 @@ config
 info
 logfile
 rootfs
-ubuntu-20.04-minimal_20.04-1_amd64.tar.gz
+ubuntu-22.04-minimal_22.04-1_amd64.tar.gz
diff --git a/jammy_minimal/README.md b/jammy_minimal/README.md
@@ -1,7 +1,7 @@
-# Ubuntu Focal Minimal Install
+# Ubuntu Jammy Minimal Install
 
-- Built from a minimal debootstrap install of Ubuntu Focal
+- Built from a minimal debootstrap install of Ubuntu Jammy
 - Contains additional important packages such as an NTP Client and CA Certificates
 - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
-- Total uncompressed image size is *552 MB*
-- Total compressed image size is *163 MB*
+- Total uncompressed image size is *463 MB*
+- Total compressed image size is *154 MB*
diff --git a/zabbix_server/.gitignore b/zabbix_server/.gitignore
@@ -3,4 +3,4 @@ config
 info
 logfile
 rootfs
-ubuntu-16.04-zabbix-server_16.04-1_amd64.tar.gz
+ubuntu-22.04-zabbix-server_22.04-1_amd64.tar.gz
diff --git a/zabbix_server/Makefile b/zabbix_server/Makefile
@@ -7,7 +7,7 @@ all: info/init_ok bootstrap global finalize
 
 bootstrap:
 	dab bootstrap
-	dab install fping libiksemel3 libmysqlclient20 libodbc1 mysql-server-5.7 mysql-common
+	dab install fping libiksemel3 libodbc1 mysql-client mysql-server mysql-common
 	dab install zabbix-server-mysql
 	install -m 0700 runonce.sh ${BASEDIR}/etc/init.d/firstboot
 	dab exec update-rc.d firstboot defaults

diff --git a/zabbix_server/README.md b/zabbix_server/README.md
@@ -5,5 +5,5 @@ Zabbix is a scalable enterprise monitoring solution. The Zabbix Server component
 ## Template
 
 - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
-- Total uncompressed image size is *908 MB*
-- Total compressed image size is *257 MB*
+- Total uncompressed image size is *1356 MB*
+- Total compressed image size is *246 MB*
diff --git a/zabbix_server/dab.conf b/zabbix_server/dab.conf
@@ -1,14 +1,14 @@
-Suite: xenial
+Suite: jammy
 CacheDir: ../cache
-Source: http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse 
-Source: http://archive.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse  
-Source: http://archive.ubuntu.com/ubuntu xenial-security main restricted universe multiverse 
-Source: http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main 
+Source: http://ftp.ubuntu.com/ubuntu SUITE main restricted universe multiverse 
+Source: http://ftp.ubuntu.com/ubuntu SUITE-updates main restricted universe multiverse  
+Source: http://ftp.ubuntu.com/ubuntu SUITE-security main restricted universe multiverse 
+Source: http://ppa.launchpad.net/ansible/ansible/ubuntu SUITE main 
 Architecture: amd64
 Name: zabbix-server
-Version: 16.04-1
+Version: 22.04-1
 Section: system
 Maintainer: Nathan Gardiner <[email protected]>
 Infopage: http://www.zabbix.com
-Description: Ansible Environment
- Ansible is the simplest way to automate apps and IT infrastructure. Application Deployment + Configuration Management + Continuous Delivery
+Description: Zabbix Environment
+  Zabbix
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ config @@
     info
     logfile
     rootfs
-    ubuntu-20.04-minimal_20.04-1_amd64.tar.gz
+    ubuntu-22.04-minimal_22.04-1_amd64.tar.gz