Do not abstract apt inclusion

diff --git a/manifests/base.pp b/manifests/base.pp
index b73889974b9b1d97372db1f4a564d88dc3c7ff8b..f7e80b8e677a31287244ad6c5e5877c202fbc6b2 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -13,12 +13,6 @@ class nodo::base {
   include nodo::subsystem::hostname
   include nodo::subsystem::local
 
-  # Apt module
-  #$apt = hiera('nodo::subsystem::apt', true)
-  #if $apt == true {
-  #  include nodo::subsystem::apt
-  #}
-
   # Declare subsystem classes
   #class { 'nodo::subsystem::hosts': }
   class { 'nodo::subsystem::motd': }

diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp
deleted file mode 100644 (file)
index 2c463b6..0000000
--- a/manifests/subsystem/apt.pp
+++ /dev/null
@@ -1,89 +0,0 @@
-class nodo::subsystem::apt {
-  #
-  # Apt configuration
-  #
-  class { '::apt':
-    include_src      => hiera('nodo::subsystem::apt::include_src',      false),
-    use_next_release => hiera('nodo::subsystem::apt::use_next_release', false),
-    custom_key_dir   => hiera('nodo::subsystem::apt::custom_key_dir',   'puppet:///modules/site_apt/keys.d')
-  }
-
-  class { '::apt::unattended_upgrades': }
-
-  $apt_domain_source = hiera('nodo::subsystem::apt::domain_source', false)
-
-  ::apt::sources_list { "${::domain}.list":
-    source => [ "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::lsbdistcodename}/${::domain}.list",
-                "puppet:///modules/site_apt/sources.list.d/${::operatingsystem}/${::domain}.list",
-                "puppet:///modules/nodo/etc/sources.list.d/domain.list", ],
-    ensure => $apt_domain_source ? {
-      true    => present,
-      default => absent,
-    }
-  }
-
-  # Preferences file can't have dots in the filename
-  $apt_domain_preferences = regsubst($::domain, '\.', '-', 'G')
-
-  file { "/etc/apt/preferences.d/${apt_domain_preferences}":
-    source => [ "puppet:///modules/site_apt/preferences.d/${::operatingsystem}/${::domain}",
-                "puppet:///modules/nodo/preferences.d/custom" ],
-    ensure => $apt_domain_source ? {
-      true    => present,
-      default => absent,
-    },
-    owner => root,
-    group => root,
-    mode  => 0644,
-  }
-
-  $apt_proxy = hiera('nodo::subsystem::apt::proxy', false)
-
-  if $apt_proxy != false {
-    class { 'apt::proxy_client':
-      proxy => $apt_proxy,
-      port  => hiera('nodo::subsystem::apt::proxy_port', '3142'),
-    }
-  } else {
-    class { 'apt::proxy_client':
-      proxy  => 'none',
-      ensure => absent,
-    }
-  }
-
-  $apt_include_sid = hiera('nodo::subsystem::apt::include_sid', false)
-
-  ::apt::sources_list { 'sid.list':
-    content => "deb http://http.debian.net/debian/ unstable main contrib non-free\n",
-    ensure  => $apt_include_sid ? {
-      true    => present,
-      default => absent,
-    },
-  }
-
-  #$squeeze_lts = 'http://http.debian.net/debian/ squeeze-lts main contrib non-free'
-  #
-  ## See https://wiki.debian.org/LTS/Using
-  #::apt::sources_list { 'squeeze-lts.list':
-  #  content => "deb ${squeeze_lts}\ndeb-src ${squeeze_lts}",
-  #  ensure  => $::lsbdistcodename ? {
-  #    'squeeze' => present,
-  #    default   => absent,
-  #  }
-  #}
-  #
-  #file { '/etc/apt/apt.conf.d/80default-release':
-  #  owner   => root,
-  #  group   => root,
-  #  mode    => 0644,
-  #  content => "APT::Default-Release \"squeeze-lts\";\n",
-  #  ensure  => $::lsbdistcodename ? {
-  #    'squeeze' => present,
-  #    default   => absent,
-  #  }
-  #}
-
-  package { 'apt-transport-https':
-    ensure => present,
-  }
-}