fix #50 Update to https repos for Debian

voxpupuli · Jan 5, 2022 · c143ce9 · c143ce9
1 parent 0874fca
commit c143ce9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",