From b56c801574448faad07699798d68dcc7eaae2c0d Mon Sep 17 00:00:00 2001 From: schurzi Date: Mon, 15 Aug 2022 13:05:09 +0200 Subject: [PATCH] add basic support for ubuntu22.04 (#554) Signed-off-by: Martin Schurz Signed-off-by: Martin Schurz --- .github/workflows/mysql_hardening.yml | 1 + .github/workflows/nginx_hardening.yml | 1 + .github/workflows/os_hardening.yml | 1 + .github/workflows/os_hardening_vm.yml | 1 + .github/workflows/ssh_hardening.yml | 1 + .github/workflows/ssh_hardening_custom_tests.yml | 1 + README.md | 2 +- roles/mysql_hardening/vars/Ubuntu_22.yml | 10 ++++++++++ 8 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 roles/mysql_hardening/vars/Ubuntu_22.yml diff --git a/.github/workflows/mysql_hardening.yml b/.github/workflows/mysql_hardening.yml index 30bc82a1..a1ba48fd 100644 --- a/.github/workflows/mysql_hardening.yml +++ b/.github/workflows/mysql_hardening.yml @@ -26,6 +26,7 @@ jobs: - rocky8 - ubuntu1804 - ubuntu2004 + - ubuntu2204 - debian9 - debian10 # - amazon # geerlingguy.mysql does not support fedora diff --git a/.github/workflows/nginx_hardening.yml b/.github/workflows/nginx_hardening.yml index e9cad27b..f805f61a 100644 --- a/.github/workflows/nginx_hardening.yml +++ b/.github/workflows/nginx_hardening.yml @@ -26,6 +26,7 @@ jobs: - rocky8 - ubuntu1804 - ubuntu2004 + - ubuntu2204 - debian9 - debian10 - amazon diff --git a/.github/workflows/os_hardening.yml b/.github/workflows/os_hardening.yml index 29da4477..597012ef 100644 --- a/.github/workflows/os_hardening.yml +++ b/.github/workflows/os_hardening.yml @@ -26,6 +26,7 @@ jobs: - rocky8 - ubuntu1804 - ubuntu2004 + - ubuntu2204 - debian9 - debian10 - amazon diff --git a/.github/workflows/os_hardening_vm.yml b/.github/workflows/os_hardening_vm.yml index 55742535..cd63b743 100644 --- a/.github/workflows/os_hardening_vm.yml +++ b/.github/workflows/os_hardening_vm.yml @@ -26,6 +26,7 @@ jobs: - rocky8 - ubuntu1804 - ubuntu2004 + - ubuntu2204 - debian9 - debian10 # - opensuse42 # opensuse currently cannot get an ip address diff --git a/.github/workflows/ssh_hardening.yml b/.github/workflows/ssh_hardening.yml index c40e1ed6..84f20735 100644 --- a/.github/workflows/ssh_hardening.yml +++ b/.github/workflows/ssh_hardening.yml @@ -27,6 +27,7 @@ jobs: - fedora - ubuntu1804 - ubuntu2004 + - ubuntu2204 - debian9 - debian10 - amazon diff --git a/.github/workflows/ssh_hardening_custom_tests.yml b/.github/workflows/ssh_hardening_custom_tests.yml index 6f6d62fb..ed1a875b 100644 --- a/.github/workflows/ssh_hardening_custom_tests.yml +++ b/.github/workflows/ssh_hardening_custom_tests.yml @@ -27,6 +27,7 @@ jobs: - fedora - ubuntu1804 - ubuntu2004 + - ubuntu2204 - debian9 - debian10 - amazon diff --git a/README.md b/README.md index f07b389d..71f5f289 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This collection provides battle tested hardening for: - CentOS 7/8 - Rocky Linux 8 - Debian 9/10 - - Ubuntu 16.04/18.04/20.04 + - Ubuntu 16.04/18.04/20.04/22.04 - Amazon Linux (some roles supported) - Arch Linux (some roles supported) - Fedora (some roles supported) diff --git a/roles/mysql_hardening/vars/Ubuntu_22.yml b/roles/mysql_hardening/vars/Ubuntu_22.yml new file mode 100644 index 00000000..ce0ebe36 --- /dev/null +++ b/roles/mysql_hardening/vars/Ubuntu_22.yml @@ -0,0 +1,10 @@ +--- +mysql_daemon: mysql + +mysql_hardening_mysql_conf_file: '/etc/mysql/my.cnf' +mysql_hardening_mysql_confd_dir: '/etc/mysql/conf.d' + +mysql_cnf_owner: 'root' # owner of /etc/mysql/*.cnf files +mysql_cnf_group: 'mysql' # owner of /etc/mysql/*.cnf files + +mysql_hardening_group: 'adm'