From c143ce942b43ca1e6e1027502b2bb840a9f84ea2 Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Wed, 5 Jan 2022 14:36:14 +0100 Subject: [PATCH] fix #50 Update to https repos for Debian --- README.md | 6 +++--- data/Debian/Ubuntu/common.yaml | 10 +++++----- data/Debian/common.yaml | 16 ++++++++-------- data/RedHat/Fedora/common.yaml | 6 +++--- manifests/repos/apt.pp | 4 ++-- metadata.json | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 22d61f2..5c9fe3d 100644 --- a/README.md +++ b/README.md @@ -163,8 +163,8 @@ An example to configure a local mirror of the stable release: --- icinga::repos: icinga-stable-release: - baseurl: 'http://repo.example.com/icinga/epel/$releasever/release/' - gpgkey: http://repo.example.com/icinga/icinga.key + baseurl: 'https://repo.example.com/icinga/epel/$releasever/release/' + gpgkey: https://repo.example.com/icinga/icinga.key ``` IMPORTANT: The configuration hash depends on the platform an requires one of the following resources: @@ -183,7 +183,7 @@ apt::confs: content: 'Acquire::Check-Valid-Until no;' priority: 99 notify_update: true -apt::backports::location: 'http://archive.debian.org/debian' +apt::backports::location: 'https://archive.debian.org/debian' ``` ### icinga::server / icinga::worker / icinga::agent diff --git a/data/Debian/Ubuntu/common.yaml b/data/Debian/Ubuntu/common.yaml index a458182..1880201 100644 --- a/data/Debian/Ubuntu/common.yaml +++ b/data/Debian/Ubuntu/common.yaml @@ -1,12 +1,12 @@ --- icinga::repos: 'icinga-stable-release': - location: http://packages.icinga.com/ubuntu + location: https://packages.icinga.com/ubuntu 'icinga-testing-builds': - location: http://packages.icinga.com/ubuntu + location: https://packages.icinga.com/ubuntu 'icinga-snapshot-builds': - location: http://packages.icinga.com/ubuntu + location: https://packages.icinga.com/ubuntu 'netways-plugins-release': - location: http://packages.netways.de/plugins/ubuntu + location: https://packages.netways.de/plugins/ubuntu 'netways-extras-release': - location: http://packages.netways.de/extras/ubuntu + location: https://packages.netways.de/extras/ubuntu diff --git a/data/Debian/common.yaml b/data/Debian/common.yaml index 1d80cb1..ec2ec75 100644 --- a/data/Debian/common.yaml +++ b/data/Debian/common.yaml @@ -1,35 +1,35 @@ --- icinga::repos: 'icinga-stable-release': - location: http://packages.icinga.com/debian + location: https://packages.icinga.com/debian release: 'icinga-%{facts.os.distro.codename}' repos: main key: id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - source: http://packages.icinga.com/icinga.key + source: https://packages.icinga.com/icinga.key 'icinga-testing-builds': - location: http://packages.icinga.com/debian + location: https://packages.icinga.com/debian release: 'icinga-%{facts.os.distro.codename}-testing' repos: main key: id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - source: http://packages.icinga.com/icinga.key + source: https://packages.icinga.com/icinga.key 'icinga-snapshot-builds': - location: http://packages.icinga.com/debian + location: https://packages.icinga.com/debian release: 'icinga-%{facts.os.distro.codename}-snapshots' repos: main key: id: F51A91A5EE001AA5D77D53C4C6E319C334410682 - source: http://packages.icinga.com/icinga.key + source: https://packages.icinga.com/icinga.key 'netways-plugins-release': - location: http://packages.netways.de/plugins/debian + location: https://packages.netways.de/plugins/debian release: '%{facts.os.distro.codename}' repos: main key: id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E source: https://packages.netways.de/netways-repo.asc 'netways-extras-release': - location: http://packages.netways.de/extras/debian + location: https://packages.netways.de/extras/debian release: '%{facts.os.distro.codename}' repos: main key: diff --git a/data/RedHat/Fedora/common.yaml b/data/RedHat/Fedora/common.yaml index a5fa49d..6e19cd1 100644 --- a/data/RedHat/Fedora/common.yaml +++ b/data/RedHat/Fedora/common.yaml @@ -1,11 +1,11 @@ --- icinga::repos: icinga-stable-release: - baseurl: 'http://packages.icinga.com/fedora/$releasever/release/' + baseurl: 'https://packages.icinga.com/fedora/$releasever/release/' descr: ICINGA (stable release for fedora) icinga-testing-builds: - baseurl: 'http://packages.icinga.com/fedora/$releasever/testing/' + baseurl: 'https://packages.icinga.com/fedora/$releasever/testing/' descr: ICINGA (testing builds for fedora) icinga-snapshot-builds: - baseurl: 'http://packages.icinga.com/fedora/$releasever/snapshot/' + baseurl: 'https://packages.icinga.com/fedora/$releasever/snapshot/' descr: ICINGA (snapshot builds for fedora) diff --git a/manifests/repos/apt.pp b/manifests/repos/apt.pp index 5f8f4fa..315deea 100644 --- a/manifests/repos/apt.pp +++ b/manifests/repos/apt.pp @@ -16,7 +16,7 @@ if $configure_backports { include ::apt::backports - Apt::Source['backports'] -> Package <| |> + Apt::Source['backports'] -> Package <| title != 'apt-transport-https' |> } # fix issue 21, 33 @@ -26,7 +26,7 @@ $repos.each |String $repo_name, Hash $repo_config| { if $managed[$repo_name] { - Apt::Source[$repo_name] -> Package <| |> + Apt::Source[$repo_name] -> Package <| title != 'apt-transport-https' |> apt::source { $repo_name: * => merge({ ensure => present }, $repo_config), require => File['/etc/apt/sources.list.d/netways-plugins.list', '/etc/apt/sources.list.d/netways-extras.list'], diff --git a/metadata.json b/metadata.json index e560dcc..ac7b5c8 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "icinga-icinga", - "version": "2.5.0", + "version": "2.6.0", "author": "Icinga", "summary": "Puppet Module to manage the Icinga Software Stack", "license": "Apache-2.0",