From ffec3e8e75495804734580e7b2518a6130b74b0c Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Fri, 28 Jun 2024 17:47:13 +0000 Subject: [PATCH 1/6] Remove Debian Buster support --- metadata.json | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata.json b/metadata.json index 31ece5f2..8aac1414 100644 --- a/metadata.json +++ b/metadata.json @@ -69,7 +69,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10", "11", "12" ] From 575deea7b981113cec74275364b74abf0cbbe53f Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Fri, 28 Jun 2024 17:57:44 +0000 Subject: [PATCH 2/6] Remove EL7 support --- data/RedHat-family-5.yaml | 3 --- data/RedHat-family-6.yaml | 3 --- metadata.json | 16 ---------------- 3 files changed, 22 deletions(-) delete mode 100644 data/RedHat-family-5.yaml delete mode 100644 data/RedHat-family-6.yaml diff --git a/data/RedHat-family-5.yaml b/data/RedHat-family-5.yaml deleted file mode 100644 index bded087d..00000000 --- a/data/RedHat-family-5.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -icinga2::globals::icinga2_bin: /usr/sbin/icinga2 -icinga2::manage_selinux: false diff --git a/data/RedHat-family-6.yaml b/data/RedHat-family-6.yaml deleted file mode 100644 index bded087d..00000000 --- a/data/RedHat-family-6.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -icinga2::globals::icinga2_bin: /usr/sbin/icinga2 -icinga2::manage_selinux: false diff --git a/metadata.json b/metadata.json index 31ece5f2..b5c4351d 100644 --- a/metadata.json +++ b/metadata.json @@ -22,18 +22,9 @@ } ], "operatingsystem_support": [ - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7", - "8", - "9" - ] - }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ - "7", "8", "9" ] @@ -41,7 +32,6 @@ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "7", "8", "9" ] @@ -60,12 +50,6 @@ "9" ] }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] - }, { "operatingsystem": "Debian", "operatingsystemrelease": [ From 695a682731efdd54822955260011043b1e011e8d Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Fri, 28 Jun 2024 18:02:43 +0000 Subject: [PATCH 3/6] Add support for Fedora 40 --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 31ece5f2..331c9543 100644 --- a/metadata.json +++ b/metadata.json @@ -84,7 +84,8 @@ { "operatingsystem": "Fedora", "operatingsystemrelease": [ - "32" + "39", + "40" ] }, { From a24a67ebe81ba09f9bc62782997f14cefb90badd Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Mon, 8 Jul 2024 07:09:22 +0200 Subject: [PATCH 4/6] Fix file permissions for private keys in unit tests --- spec/classes/elasticsearch_spec.rb | 4 ++-- spec/classes/gelf_spec.rb | 4 ++-- spec/classes/icingadb_spec.rb | 4 ++-- spec/classes/idomysql_spec.rb | 4 ++-- spec/classes/idopgsql_spec.rb | 4 ++-- spec/classes/influxdb2_spec.rb | 4 ++-- spec/classes/influxdb_spec.rb | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spec/classes/elasticsearch_spec.rb b/spec/classes/elasticsearch_spec.rb index 26d04c20..95196fbf 100644 --- a/spec/classes/elasticsearch_spec.rb +++ b/spec/classes/elasticsearch_spec.rb @@ -23,13 +23,13 @@ when 'FreeBSD' let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_user) { 'icinga' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } case facts[:os]['family'] when 'Debian' let(:icinga2_user) { 'nagios' } diff --git a/spec/classes/gelf_spec.rb b/spec/classes/gelf_spec.rb index f137894d..e6b54165 100644 --- a/spec/classes/gelf_spec.rb +++ b/spec/classes/gelf_spec.rb @@ -23,13 +23,13 @@ when 'FreeBSD' let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_user) { 'icinga' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } case facts[:os]['family'] when 'Debian' let(:icinga2_user) { 'nagios' } diff --git a/spec/classes/icingadb_spec.rb b/spec/classes/icingadb_spec.rb index e4c9ffd6..34c60e47 100644 --- a/spec/classes/icingadb_spec.rb +++ b/spec/classes/icingadb_spec.rb @@ -24,14 +24,14 @@ when 'FreeBSD' let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_sslfile_owner) { 'icinga' } let(:icinga2_sslfile_mode) { '0640' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_sslfile_mode) { '0640' } case facts[:os]['family'] when 'Debian' diff --git a/spec/classes/idomysql_spec.rb b/spec/classes/idomysql_spec.rb index 616f136e..9f372a14 100644 --- a/spec/classes/idomysql_spec.rb +++ b/spec/classes/idomysql_spec.rb @@ -42,14 +42,14 @@ let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } let(:ido_mysql_schema_dir) { '/usr/local/share/icinga2-ido-mysql/schema' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_user) { 'icinga' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } let(:ido_mysql_schema_dir) { '/usr/share/icinga2-ido-mysql/schema' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } case facts[:os]['family'] when 'Debian' let(:icinga2_user) { 'nagios' } diff --git a/spec/classes/idopgsql_spec.rb b/spec/classes/idopgsql_spec.rb index 57995b0d..40e19652 100644 --- a/spec/classes/idopgsql_spec.rb +++ b/spec/classes/idopgsql_spec.rb @@ -25,14 +25,14 @@ let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } let(:ido_pgsql_schema_dir) { '/usr/local/share/icinga2-ido-pgsql/schema' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_user) { 'icinga' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } let(:ido_pgsql_schema_dir) { '/usr/share/icinga2-ido-pgsql/schema' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } case facts[:os]['family'] when 'Debian' let(:icinga2_user) { 'nagios' } diff --git a/spec/classes/influxdb2_spec.rb b/spec/classes/influxdb2_spec.rb index af80d691..679dde9a 100644 --- a/spec/classes/influxdb2_spec.rb +++ b/spec/classes/influxdb2_spec.rb @@ -23,13 +23,13 @@ when 'FreeBSD' let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_user) { 'icinga' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } case facts[:os]['family'] when 'Debian' let(:icinga2_user) { 'nagios' } diff --git a/spec/classes/influxdb_spec.rb b/spec/classes/influxdb_spec.rb index dbbb8e33..1b5926af 100644 --- a/spec/classes/influxdb_spec.rb +++ b/spec/classes/influxdb_spec.rb @@ -23,13 +23,13 @@ when 'FreeBSD' let(:icinga2_conf_dir) { '/usr/local/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } let(:icinga2_user) { 'icinga' } let(:icinga2_group) { 'icinga' } else let(:icinga2_conf_dir) { '/etc/icinga2' } let(:icinga2_pki_dir) { '/var/lib/icinga2/certs' } - let(:icinga2_sslkey_mode) { '0400' } + let(:icinga2_sslkey_mode) { '0440' } case facts[:os]['family'] when 'Debian' let(:icinga2_user) { 'nagios' } From 0babd0d3fec215959ea80ddaf88796b6c4a7217d Mon Sep 17 00:00:00 2001 From: markuszilch Date: Sat, 6 Jul 2024 23:53:03 +0200 Subject: [PATCH 5/6] modulesync 9.0.0 --- .github/labeler.yml | 3 +++ .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .msync.yml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .github/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000..7899de84 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,3 @@ +--- +skip-changelog: + - head-branch: ['^release-*', 'release'] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d65bcc95..2974af38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,4 +18,4 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v3 + uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5927715b..55324aa6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index 876cb3b0..36071685 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '8.0.1' +modulesync_config_version: '9.0.0' From a20eb6f87061a0c421070652f063bd970ad883bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:48:12 +0000 Subject: [PATCH 6/6] Bump voxpupuli/gha-puppet from 2 to 3 Bumps [voxpupuli/gha-puppet](https://github.com/voxpupuli/gha-puppet) from 2 to 3. - [Changelog](https://github.com/voxpupuli/gha-puppet/blob/v3/CHANGELOG.md) - [Commits](https://github.com/voxpupuli/gha-puppet/compare/v2...v3) --- updated-dependencies: - dependency-name: voxpupuli/gha-puppet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2974af38..d65bcc95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,4 +18,4 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55324aa6..5927715b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3 with: allowed_owner: 'voxpupuli' secrets: