diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-31 13:32:29 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-31 13:32:29 -0300 |
commit | 20fe7a78717cb186661d27cb72ce0bf7272161d6 (patch) | |
tree | b4496e49e84dacde51de91e19154c60ae678b43c /manifests | |
parent | 3c9a04a70f753e4f0745f27a2f73b0dbf4434800 (diff) | |
download | puppet-nodo-20fe7a78717cb186661d27cb72ce0bf7272161d6.tar.gz puppet-nodo-20fe7a78717cb186661d27cb72ce0bf7272161d6.tar.bz2 |
Do not abstract apt inclusion
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/base.pp | 6 | ||||
-rw-r--r-- | manifests/subsystem/apt.pp | 89 |
2 files changed, 0 insertions, 95 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index b738899..f7e80b8 100644 --- 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 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, - } -} |