From f8f70b0f8fe792f466648346f293264646abe16c Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Mon, 10 Jun 2024 17:08:21 +0200 Subject: [PATCH 1/4] Add use of puppet-php >= 10.2.0 to docs --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d93e5a3..82a2ffd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://github.com/voxpupuli/puppet-icinga/workflows/CI/badge.svg)](https://github.com/voxpupuli/puppet-icinga/actions?query=workflow%3ACI) [![Release](https://github.com/voxpupuli/puppet-icinga/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/puppet-icinga/actions/workflows/release.yml) -[![Puppet Forge](https://img.shields.io/puppetforge/v/puppet/icinga.svg)](https://forge.puppet.com/modules/icinga/icinga) +[![Puppet Forge](https://img.shields.io/puppetforge/v/puppet/icinga.svg)](https://forge.puppet.com/modules/puppet/icinga) [![puppet integration](http://www.puppetmodule.info/images/badge.png)](https://icinga.com/products/integrations/puppet) [![Apache-2.0 License](https://img.shields.io/github/license/voxpupuli/puppet-icinga.svg)](LICENSE) [![Donated by Icinga](https://img.shields.io/badge/donated%20by-Icinga-fb7047.svg)](#transfer-notice) @@ -32,7 +32,7 @@ This module provides several non private helper classes for the other official I ### How to use the classes for Icinga Web an databases with MariaDB on Debian bookwork -To get Icinga Web 2 running on Debian bookworm use puppet-php >=8.1.0 and set: +To get Icinga Web 2 running on Debian bookworm use puppet-php >=8.1.0 (no longer necessary if puppet-php >= 10.2.0 is used) and set: ```yaml php::globals::php_version: '8.2' @@ -246,7 +246,7 @@ The class supports: And requiers: -* [icinga/icinga2] >= 3.1.0 < 5.0.0 +* [icinga/icinga2] >= 3.1.0 < 6.0.0 Setting up a Icinga Server with a CA and to store configuration: @@ -308,9 +308,9 @@ The class supports: Ands requires: -* [puppetlabs/mysql] >= 10.9.0 =< 16.0.0 +* [puppetlabs/mysql] >= 10.9.0 < 16.0.0 * [puppetlabs/postgresql] >= 7.0.0 < 11.0.0 -* [icinga/icinga2] >= 2.9.0 < 5.0.0 +* [icinga/icinga2] >= 2.9.0 < 6.0.0 * [icinga/icingadb] >= 1.0.0 < 3.0.0 To activate and configure the IcingaDB (usally on a server) do: @@ -336,9 +336,9 @@ The class supports: Ands requires: -* [puppetlabs/mysql] >= 10.9.0 =< 16.0.0 +* [puppetlabs/mysql] >= 10.9.0 < 16.0.0 * [puppetlabs/postgresql] >= 7.0.0 < 11.0.0 -* [icinga/icinga2] >= 2.9.0 < 5.0.0 +* [icinga/icinga2] >= 2.9.0 < 6.0.0 To activate and configure the IDO feature (usally on a server) do: @@ -361,10 +361,10 @@ The class supports: And requires: -* [puppetlabs/mysql] >= 10.9.0 =< 16.0.0 +* [puppetlabs/mysql] >= 10.9.0 < 16.0.0 * [puppetlabs/postgresql] >= 7.0.0 < 11.0.0 * [icinga/icingaweb2] >= 3.6.0 < 5.0.0 -* [icinga/icinga2] >= 2.9.0 < 5.0.0 +* [icinga/icinga2] >= 2.9.0 < 6.0.0 * [puppetlabs/apache] >= 5.8.0 < 12.0.0 * [puppet/php] >= 8.0.0 < 11.0.0 @@ -456,7 +456,7 @@ The class supports: And required in addition to `icinga::web::icingadb` or `icinga::web::monitoring`: -* [puppetlabs/mysql] >= 10.9.0 =< 16.0.0 +* [puppetlabs/mysql] >= 10.9.0 < 16.0.0 * [puppetlabs/postgresql] >= 7.0.0 < 11.0.0 * [icinga/icingaweb2] >= 3.7.0 < 5.0.0 From 7d2f6140842c1ce74740136677c560318c4f4652 Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Tue, 11 Jun 2024 06:21:44 +0200 Subject: [PATCH 2/4] Drop Debian Buster support --- data/Debian/Debian/10.yaml | 19 ------------------- metadata.json | 1 - 2 files changed, 20 deletions(-) delete mode 100644 data/Debian/Debian/10.yaml diff --git a/data/Debian/Debian/10.yaml b/data/Debian/Debian/10.yaml deleted file mode 100644 index 17f7c0f..0000000 --- a/data/Debian/Debian/10.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -icinga::repos: - 'icinga-stable-release': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-testing-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-snapshot-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'netways-plugins-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E - 'netways-extras-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E - -icinga::repos::configure_backports: true diff --git a/metadata.json b/metadata.json index 4ac88ee..d50ef2b 100644 --- a/metadata.json +++ b/metadata.json @@ -61,7 +61,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10", "11" ] }, From 8e5a550675fd747be4fab64a3472c81d2c1fb66e Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Tue, 11 Jun 2024 06:36:08 +0200 Subject: [PATCH 3/4] Switch to keyring for all supported Ubuntu and Debian repos --- data/Debian/Debian/10.yaml | 19 ------------------- data/Debian/Debian/11.yaml | 17 ----------------- data/Debian/Ubuntu/20.04.yaml | 17 ----------------- 3 files changed, 53 deletions(-) delete mode 100644 data/Debian/Debian/10.yaml delete mode 100644 data/Debian/Debian/11.yaml delete mode 100644 data/Debian/Ubuntu/20.04.yaml diff --git a/data/Debian/Debian/10.yaml b/data/Debian/Debian/10.yaml deleted file mode 100644 index 17f7c0f..0000000 --- a/data/Debian/Debian/10.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -icinga::repos: - 'icinga-stable-release': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-testing-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-snapshot-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'netways-plugins-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E - 'netways-extras-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E - -icinga::repos::configure_backports: true diff --git a/data/Debian/Debian/11.yaml b/data/Debian/Debian/11.yaml deleted file mode 100644 index f784f42..0000000 --- a/data/Debian/Debian/11.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -icinga::repos: - 'icinga-stable-release': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-testing-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-snapshot-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'netways-plugins-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E - 'netways-extras-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E diff --git a/data/Debian/Ubuntu/20.04.yaml b/data/Debian/Ubuntu/20.04.yaml deleted file mode 100644 index f784f42..0000000 --- a/data/Debian/Ubuntu/20.04.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -icinga::repos: - 'icinga-stable-release': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-testing-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'icinga-snapshot-builds': - key: - id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - 'netways-plugins-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E - 'netways-extras-release': - key: - id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E From 3be7158430dc4b42462db3501b187513a9530e7a Mon Sep 17 00:00:00 2001 From: Andrew Faulkner Date: Tue, 11 Jun 2024 23:53:39 +0100 Subject: [PATCH 4/4] Correct spelling --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d93e5a3..e84845c 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ The class supports: * [puppet] >= 7.9.0 < 9.0.0 -And requiers: +And requires: * [puppetlabs/stdlib] >= 6.6.0 < 10.0.0 * [puppetlabs/apt] >= 9.2.0 < 10.0.0 @@ -244,7 +244,7 @@ The class supports: * [puppet] >= 7.0 < 9.0 -And requiers: +And requires: * [icinga/icinga2] >= 3.1.0 < 5.0.0