Manage apt sources with apt module

5 files changed, 43 insertions, 48 deletions

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a2c5546..41e307a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -1,4 +1,10 @@
 ---
+apt:
+  purge:
+    sources.list: true
+    sources.list.d: true
+    preferences: true
+    preferences.d: true
 profiles::base::users:
   jandd:
     username: jandd
diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp
index 14efbaa..9eba3ab 100644
--- a/sitemodules/profiles/manifests/base.pp
+++ b/sitemodules/profiles/manifests/base.pp
@@ -125,31 +125,41 @@ class profiles::base (
       { 'prompttemplate' => 'fire' }),
   }
 
-  file { '/etc/apt/sources.list':
-    ensure  => file,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => epp(
-      'profiles/base/apt_sources.list.epp',
-      { 'oscodename' => $facts['os']['distro']['codename'] }),
-    require => Package['lsb-release'],
-  }
-  file { '/etc/apt/sources.list.d/puppetlabs-pc1.list':
-    ensure => absent,
-  }
-  file { '/etc/apt/sources.list.d/puppet5.list':
-    ensure => absent,
-  }
-  file { '/etc/apt/sources.list.d/puppet6.list':
-    ensure  => file,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => epp(
-      'profiles/base/apt_sources_puppet6.list.epp',
-      { 'oscodename' => $facts['os']['distro']['codename'] }),
-    require => Package['lsb-release'],
+  include apt
+  apt::key { 'puppetlabs':
+    id      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+    server  => 'pgp.mit.edu',
+    options => 'http-proxy=http://proxyout:3128/',
+  }
+  apt::source { "ftp.nl.debian.org-${::lsbdistcodename}":
+    location => 'http://ftp.nl.debian.org/debian',
+    key      => '067E3C456BAE240ACEE88F6FEF0F382A1A7B6500',
+    repos    => 'main',
+    release  => $::lsbdistcodename,
+  }
+  apt::source { "ftp.nl.debian.org-${::lsbdistcodename}-updates":
+    location => 'http://ftp.nl.debian.org/debian',
+    key      => '16E90B3FDF65EDE3AA7F323C04EE7237B7D453EC',
+    repos    => 'main',
+    release  => "${::lsbdistcodename}-updates",
+  }
+  apt::source { "security.debian.org-${::lsbdistcodename}-security":
+    location => 'http://security.debian.org/debian-security',
+    key      => '379483D8B60160B155B372DDAA8E81B4331F7F50',
+    repos    => 'main',
+    release  => "${::lsbdistcodename}/updates",
+  }
+  apt::source { "ftp.nl.debian.org-${::lsbdistcodename}-backports":
+    location => 'http://ftp.nl.debian.org/debian',
+    key      => '16E90B3FDF65EDE3AA7F323C04EE7237B7D453EC',
+    repos    => 'main',
+    release  => "${::lsbdistcodename}-backports",
+  }
+  apt::source { "puppet6-${::lsbdistcodename}":
+    location => 'http://apt.puppetlabs.com',
+    key      => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+    repos    => 'puppet6',
+    release  => $::lsbdistcodename,
   }
 
   file { '/etc/apt/preferences.d/blacklist_systemd-sysv.pref':
diff --git a/sitemodules/profiles/manifests/icinga2_master.pp b/sitemodules/profiles/manifests/icinga2_master.pp
index e26c5b8..9250a89 100644
--- a/sitemodules/profiles/manifests/icinga2_master.pp
+++ b/sitemodules/profiles/manifests/icinga2_master.pp
@@ -55,8 +55,6 @@ class profiles::icinga2_master (
   String $host_certificate,
   String $host_csr,
 ) {
-  include apt
-
   debconf { 'icinga2-ido-pgsql/pgsql/app-pass':
     package => 'icinga2-ido-pgsql',
     type    => 'password',
@@ -113,11 +111,11 @@ class profiles::icinga2_master (
     }
   }
   package { 'icinga2':
-    ensure  => installed,
+    ensure  => latest,
     require => Apt::Pin['icinga2_backports'],
   }
   package { 'icinga2-ido-pgsql':
-    ensure  => installed,
+    ensure  => latest,
     require => [
       Apt::Pin['icinga2_backports'],
       Debconf['icinga2-ido-pgsql/pgsql/app-pass'],
diff --git a/sitemodules/profiles/templates/base/apt_sources.list.epp b/sitemodules/profiles/templates/base/apt_sources.list.epp
deleted file mode 100644
index 9c2f0ee..0000000
--- a/sitemodules/profiles/templates/base/apt_sources.list.epp
+++ /dev/null
@@ -1,7 +0,0 @@
-<%- | String $oscodename = "" | -%>
-# THIS FILE IS MANAGED BY PUPPET, MANUAL CHANGES WILL BE OVERWRITTEN AT THE
-# NEXT PUPPET RUN.
-deb http://ftp.nl.debian.org/debian <%= $oscodename %> main
-deb http://ftp.nl.debian.org/debian <%= $oscodename %>-backports main
-deb http://ftp.nl.debian.org/debian <%= $oscodename %>-updates main
-deb http://security.debian.org/debian-security <%= $oscodename %>/updates main
diff --git a/sitemodules/profiles/templates/base/apt_sources_puppet6.list.epp b/sitemodules/profiles/templates/base/apt_sources_puppet6.list.epp
deleted file mode 100644
index 1deaafb..0000000
--- a/sitemodules/profiles/templates/base/apt_sources_puppet6.list.epp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%- | String $oscodename = "" |-%>
-# THIS FILE IS MANAGED BY PUPPET, MANUAL CHANGES WILL BE OVERWRITTEN AT THE
-# NEXT PUPPET RUN.
-# Puppet 6 <%= $oscodename %> Repository
-deb http://apt.puppetlabs.com <%= $oscodename %> puppet6
-
-# Puppet 6 <%= $oscodename %> Source Repository
-# The source repos are commented out by default because we
-# do not always make sources available for all packages or
-# for all platforms. If you want to access the source repos,
-# uncomment the following line.
-#deb-src http://apt.puppetlabs.com <%= $oscodename %> puppet6