From 525cf1bfff9f8f94d6da6dec8f084bbbd17b5c7f Mon Sep 17 00:00:00 2001 From: Chris Lindbergh Date: Wed, 7 Aug 2024 10:41:38 -0600 Subject: [PATCH] Rename distro-specific vars file for better sorting and increase version to 2.3.0p12 --- README.md | 16 ++++++++-------- defaults/main.yml | 2 +- tasks/main.yml | 2 +- vars/Debian.bookworm.yml | 4 ++++ vars/Debian.bullseye.yml | 4 ++++ vars/Debian.buster.yml | 4 ++++ vars/Ubuntu.jammy.yml | 4 ++++ vars/Ubuntu.noble.yml | 4 ++++ vars/bookworm.Debian.yml | 4 ---- vars/bullseye.Debian.yml | 4 ---- vars/buster.Debian.yml | 4 ---- vars/default.yml | 2 +- vars/jammy.Ubuntu.yml | 4 ---- vars/noble.Ubuntu.yml | 4 ---- 14 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 vars/Debian.bookworm.yml create mode 100644 vars/Debian.bullseye.yml create mode 100644 vars/Debian.buster.yml create mode 100644 vars/Ubuntu.jammy.yml create mode 100644 vars/Ubuntu.noble.yml delete mode 100644 vars/bookworm.Debian.yml delete mode 100644 vars/bullseye.Debian.yml delete mode 100644 vars/buster.Debian.yml delete mode 100644 vars/jammy.Ubuntu.yml delete mode 100644 vars/noble.Ubuntu.yml diff --git a/README.md b/README.md index 78a4476..e4b35d9 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,11 @@ For reference, "OMD" below stands for the [Open Monitoring Distribution](https:/ | CheckMK Raw Edition Version | Role Version/Tag | | --------------------------- | ---------------- | +| 2.3.0p12 | 1.0.87 | | 2.3.0p11 | 1.0.86 | | 2.3.0p10 | 1.0.85 | | 2.2.0p9 | 1.0.84 | | 2.3.0p7 | 1.0.83 | -| 2.3.0p6 | 1.0.82 | ## Requirements @@ -99,7 +99,7 @@ Some of these may be seem redundant but are specified so future users can overri | checkmk_server_omd_start_creates | File created by starting OMD | `/opt/omd/sites/{{ checkmk_server_site }}/tmp/apache/run/apache.pid` | | checkmk_server_prerequisites | Packages needed before installing CheckMK RAW edition | `python3-apt` `python3-passlib` | | checkmk_server_site | Name of OMD "site" to create; this is often shown as `my-site` in the CheckMK documentation examples | `test` | -| checkmk_server_version | Version of CheckMK RAW edition to install | `2.3.0p11` | +| checkmk_server_version | Version of CheckMK RAW edition to install | `2.3.0p12` | | checkmk_server_web_service | Name of the web service to start and enable | `apache2` | ### Tables of Variables Unique to at Least One Distribution (with Defaults) @@ -112,12 +112,12 @@ Description: SHA256 checksum of the source installation package | Distribution | Default | | ------------ | ------- | -| Debian 10 | `sha256:2b2f5469b47dfb9c7adde9ac6864e5bf92c27de131f1dcf19b6f39068566f82c` | -| Debian 11 | `sha256:32df6d952d7770248aa6a36dfa3d19e4c0c11b2d70bf714fa03f6407feba499e` | -| Debian 12 | `sha256:14305898b8d836999130001568bc34ddc55be589baea28d2ca0a50e3e1514bcd` | -| Ubuntu 20.04 | `sha256:dfc6b6d7a450350ced2c7ba8b4fde07e8025e3d071d0f9132222c446edf65dc9` | -| Ubuntu 22.04 | `sha256:d5b264dfd5fe45c07990f04859e40c294eda17f8f4fe50e69e623b9fd29fb28d` | -| Ubuntu 24.04 | `sha256:36c2d929b9fb6930f2515bc2f408e5c1e752443c4266cf0e092612693f4992e7` | +| Debian 10 | `sha256:ca3ab687e50c06ce24672ea1b446d125841ec37b39b08e95e3e6a03ad0beb651` | +| Debian 11 | `sha256:c54402ee378095dedeb36132d2db79d0fba9357c07656416783e093b73e229f2` | +| Debian 12 | `sha256:dbbc7f939a37be5f50b26ef79c78ef19cf7fefc6e28fcb5ddbdcf3f87e1c00a3` | +| Ubuntu 20.04 | `sha256:e4d60722721f38001d9087f97a73fc6cf3dd09ee6136516a4fa682053e73699a` | +| Ubuntu 22.04 | `sha256:7965f13e368544f2e74e8d7dbe94f5e0a277c83f44ad9975c7bd805f218ca7ef` | +| Ubuntu 24.04 | `sha256:8c11785fc2da38ed8c7485effcb9206e8b41a4a929e1bb290be45f27db247c43` | ## Dependencies diff --git a/defaults/main.yml b/defaults/main.yml index 5eedce6..5f9e080 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,6 +31,6 @@ checkmk_server_prerequisites: - python3-apt - python3-passlib checkmk_server_site: test -checkmk_server_version: 2.3.0p11 +checkmk_server_version: 2.3.0p12 checkmk_server_web_service: apache2 ... diff --git a/tasks/main.yml b/tasks/main.yml index b2c681a..042c3eb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,7 +5,7 @@ vars: params: files: - - "{{ ansible_distribution_release }}.{{ ansible_distribution }}.yml" + - "{{ ansible_distribution }}.{{ ansible_distribution_release }}.yml" - "{{ ansible_distribution }}.{{ ansible_distribution_major_version }}.yml" - default.yml paths: diff --git a/vars/Debian.bookworm.yml b/vars/Debian.bookworm.yml new file mode 100644 index 0000000..e397d97 --- /dev/null +++ b/vars/Debian.bookworm.yml @@ -0,0 +1,4 @@ +--- +# Debian 12 "bookworm" variables file for checkmk_server +checkmk_server_download_checksum: "sha256:dbbc7f939a37be5f50b26ef79c78ef19cf7fefc6e28fcb5ddbdcf3f87e1c00a3" +... diff --git a/vars/Debian.bullseye.yml b/vars/Debian.bullseye.yml new file mode 100644 index 0000000..34a3953 --- /dev/null +++ b/vars/Debian.bullseye.yml @@ -0,0 +1,4 @@ +--- +# Debian 11 "bullseye" variables file for checkmk_server +checkmk_server_download_checksum: "sha256:c54402ee378095dedeb36132d2db79d0fba9357c07656416783e093b73e229f2" +... diff --git a/vars/Debian.buster.yml b/vars/Debian.buster.yml new file mode 100644 index 0000000..7e55c52 --- /dev/null +++ b/vars/Debian.buster.yml @@ -0,0 +1,4 @@ +--- +# Debian 10 "buster" variables file for checkmk_server +checkmk_server_download_checksum: "sha256:ca3ab687e50c06ce24672ea1b446d125841ec37b39b08e95e3e6a03ad0beb651" +... diff --git a/vars/Ubuntu.jammy.yml b/vars/Ubuntu.jammy.yml new file mode 100644 index 0000000..d5ad0bf --- /dev/null +++ b/vars/Ubuntu.jammy.yml @@ -0,0 +1,4 @@ +--- +# Ubuntu 22.04 "Jammy Jellyfish" variables file for checkmk_server +checkmk_server_download_checksum: "sha256:7965f13e368544f2e74e8d7dbe94f5e0a277c83f44ad9975c7bd805f218ca7ef" +... diff --git a/vars/Ubuntu.noble.yml b/vars/Ubuntu.noble.yml new file mode 100644 index 0000000..a8cfe67 --- /dev/null +++ b/vars/Ubuntu.noble.yml @@ -0,0 +1,4 @@ +--- +# Ubuntu 24.04 LTS "Noble Numbat" variables file for checkmk_server +checkmk_server_download_checksum: "sha256:8c11785fc2da38ed8c7485effcb9206e8b41a4a929e1bb290be45f27db247c43" +... diff --git a/vars/bookworm.Debian.yml b/vars/bookworm.Debian.yml deleted file mode 100644 index 62930d1..0000000 --- a/vars/bookworm.Debian.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Debian 12 "bookworm" variables file for checkmk_server -checkmk_server_download_checksum: "sha256:14305898b8d836999130001568bc34ddc55be589baea28d2ca0a50e3e1514bcd" -... diff --git a/vars/bullseye.Debian.yml b/vars/bullseye.Debian.yml deleted file mode 100644 index d036fc1..0000000 --- a/vars/bullseye.Debian.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Debian 11 "bullseye" variables file for checkmk_server -checkmk_server_download_checksum: "sha256:32df6d952d7770248aa6a36dfa3d19e4c0c11b2d70bf714fa03f6407feba499e" -... diff --git a/vars/buster.Debian.yml b/vars/buster.Debian.yml deleted file mode 100644 index 8a87780..0000000 --- a/vars/buster.Debian.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Debian 10 "buster" variables file for checkmk_server -checkmk_server_download_checksum: "sha256:2b2f5469b47dfb9c7adde9ac6864e5bf92c27de131f1dcf19b6f39068566f82c" -... diff --git a/vars/default.yml b/vars/default.yml index cc10068..76882c4 100644 --- a/vars/default.yml +++ b/vars/default.yml @@ -1,4 +1,4 @@ --- # default (Ubuntu 20.04 "Focal Fossa") variables file for checkmk_server -checkmk_server_download_checksum: "sha256:dfc6b6d7a450350ced2c7ba8b4fde07e8025e3d071d0f9132222c446edf65dc9" +checkmk_server_download_checksum: "sha256:e4d60722721f38001d9087f97a73fc6cf3dd09ee6136516a4fa682053e73699a" ... diff --git a/vars/jammy.Ubuntu.yml b/vars/jammy.Ubuntu.yml deleted file mode 100644 index d2e3483..0000000 --- a/vars/jammy.Ubuntu.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Ubuntu 22.04 "Jammy Jellyfish" variables file for checkmk_server -checkmk_server_download_checksum: "sha256:d5b264dfd5fe45c07990f04859e40c294eda17f8f4fe50e69e623b9fd29fb28d" -... diff --git a/vars/noble.Ubuntu.yml b/vars/noble.Ubuntu.yml deleted file mode 100644 index fe78850..0000000 --- a/vars/noble.Ubuntu.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Ubuntu 24.04 LTS "Noble Numbat" variables file for checkmk_server -checkmk_server_download_checksum: "sha256:36c2d929b9fb6930f2515bc2f408e5c1e752443c4266cf0e092612693f4992e7" -...