From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 2 Jan 2018 23:50:47 +0000 (-0200)
Subject: Use https://deb.debian.org by default
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d3400106d91ea075e515f7ed6912d8190f14cd87;p=puppet-nodo.git

Use https://deb.debian.org by default
---

diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp
index f162705..04d6626 100644
--- a/manifests/subsystem/apt.pp
+++ b/manifests/subsystem/apt.pp
@@ -3,8 +3,12 @@ class nodo::subsystem::apt(
   $auto_upgrade = present,
   $hour         = 2,
   $minute       = 0,
-  $mirror       = 'http://deb.debian.org',
+  $mirror       = 'https://deb.debian.org',
 ) {
+  package { 'apt-transport-https':
+    ensure => installed,
+  }
+
   # See https://www.cyberciti.biz/faq/howto-use-apt-get-with-ipv6-or-ipv4-transport-on-ubuntu-debian/
   #     https://unix.stackexchange.com/questions/370750/wget-uses-ipv6-address-and-takes-too-long-to-complete
   file { '/etc/apt/apt.conf.d/1000-force-ipv4-transport':
@@ -21,7 +25,7 @@ class nodo::subsystem::apt(
     group   => root,
     mode    => '0644',
     notify  => Exec['nodo-apt-auto-update'],
-    require => File['/etc/apt/apt.conf.d/1000-force-ipv4-transport'],
+    require => [ File['/etc/apt/apt.conf.d/1000-force-ipv4-transport'], Package['apt-transport-https'] ],
     content => $ensure ? {
       'present' => template("nodo/apt/${::operatingsystem}.sources.list.erb"),
        default  => undef,
@@ -47,8 +51,4 @@ class nodo::subsystem::apt(
     hour        => $hour,
     minute      => $minute,
   }
-
-  package { 'apt-transport-https':
-    ensure => installed,
-  }
 }