apt: Add proxy support on the class.

[puppet-modules/puppetlabs-apt.git] / manifests / init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index b41d359fbdeb22652a42db531ea387cf9abf05cb..86e49c8f4ea48ff029e0251da34f01c39d0e5d44 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,95 +1,107 @@
-# Class: apt
 #
-# This module manages the initial configuration of apt.
-#
-# Parameters:
-#   The parameters listed here are not required in general and were
-#     added for use cases related to development environments.
-#   disable_keys - disables the requirement for all packages to be signed
-#   always_apt_update - rather apt should be updated on every run (intended
-#     for development environments where package updates are frequent
-#   purge_sources_list - Accepts true or false. Defaults to false If set to
-#     true, Puppet will purge all unmanaged entries from sources.list"
-#   purge_sources_list_d - Accepts true or false. Defaults to false. If set
-#     to false, Puppet will purge all unmanaged entries from sources.list.d
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  class { 'apt': }
 class apt(
-  $always_apt_update = false,
-  $disable_keys = undef,
-  $proxy_host = false,
-  $proxy_port = '8080',
-  $purge_sources_list = false,
-  $purge_sources_list_d = false
-) {
+  $proxy                = {},
+  $always_apt_update    = false,
+  $apt_update_frequency = 'reluctantly',
+  $purge_sources_list   = false,
+  $purge_sources_list_d = false,
+  $purge_preferences    = false,
+  $purge_preferences_d  = false,
+  $update_timeout       = undef,
+  $update_tries         = undef,
+  $sources              = undef,
+) inherits ::apt::params {
+
+  include apt::update
 
-  include apt::params
+  $frequency_options = ['always','daily','weekly','reluctantly']
+  validate_re($apt_update_frequency, $frequency_options)
 
-  validate_bool($purge_sources_list, $purge_sources_list_d)
+  validate_bool($purge_sources_list, $purge_sources_list_d,
+                $purge_preferences, $purge_preferences_d)
 
-  $refresh_only_apt_update = $always_apt_update? {
-    true => false,
-    false => true
+  validate_hash($proxy)
+  if $proxy['host'] {
+    validate_string($proxy['host'])
+  }
+  if $proxy['port'] {
+    unless is_integer($proxy['port']) {
+      fail('$proxy port must be an integer')
+    }
+  }
+  if $proxy['https'] {
+    validate_bool($proxy['https'])
   }
 
-  if ! defined(Package["python-software-properties"]) {
-    package { "python-software-properties": }
+  $_proxy = merge($apt::proxy_defaults, $proxy)
+
+  if $proxy['host'] {
+    apt::setting { 'conf-proxy':
+      priority => '01',
+      content  => template('apt/_header.erb', 'apt/proxy.erb'),
+    }
   }
 
-  file { "sources.list":
-    path => "${apt::params::root}/sources.list",
-    ensure => present,
-    owner => root,
-    group => root,
-    mode => 644,
-    content => $purge_sources_list ? {
-      false =>  undef,
-      true  => "# Repos managed by puppet.\n",
-    },
+  $sources_list_content = $purge_sources_list ? {
+    false => undef,
+    true  => "# Repos managed by puppet.\n",
   }
 
-  file { "sources.list.d":
-    path => "${apt::params::root}/sources.list.d",
-    ensure => directory,
-    owner => root,
-    group => root,
-    purge => $purge_sources_list_d,
-    recurse => $purge_sources_list_d,
+  if $always_apt_update == true {
+    Exec <| title=='apt_update' |> {
+      refreshonly => false,
+    }
   }
 
-  exec { "apt_update":
-    command => "${apt::params::provider} update",
-    subscribe => [ File["sources.list"], File["sources.list.d"] ],
-    refreshonly => $refresh_only_apt_update,
+  apt::setting { 'conf-update-stamp':
+    priority => 15,
+    content  => template('apt/_header.erb', 'apt/15update-stamp.erb'),
   }
 
-  case $disable_keys {
-    true: {
-      file { "99unauth":
-        content => "APT::Get::AllowUnauthenticated 1;\n",
-        ensure  => present,
-        path    => "/etc/apt/apt.conf.d/99unauth",
-      }
-    }
-    false: {
-      file { "99unauth":
-        ensure => absent,
-        path   => "/etc/apt/apt.conf.d/99unauth",
-      }
-    }
-    undef: { } # do nothing
-    default: { fail("Valid values for disable_keys are true or false") }
+  file { 'sources.list':
+    ensure  => present,
+    path    => $::apt::sources_list,
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    content => $sources_list_content,
+    notify  => Exec['apt_update'],
+  }
+
+  file { 'sources.list.d':
+    ensure  => directory,
+    path    => $::apt::sources_list_d,
+    owner   => root,
+    group   => root,
+    purge   => $purge_sources_list_d,
+    recurse => $purge_sources_list_d,
+    notify  => Exec['apt_update'],
   }
 
-  if($proxy_host) {
-    file { 'configure-apt-proxy':
-      path    => '/etc/apt/apt.conf.d/proxy',
-      content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
+  if $purge_preferences {
+    file { 'apt-preferences':
+      ensure => absent,
+      path   => $::apt::preferences,
     }
   }
+
+  file { 'preferences.d':
+    ensure  => directory,
+    path    => $::apt::preferences_d,
+    owner   => root,
+    group   => root,
+    purge   => $purge_preferences_d,
+    recurse => $purge_preferences_d,
+  }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { 'apt::update':
+    require => Class['apt::update'],
+  }
+
+  # manage sources if present
+  if $sources != undef {
+    validate_hash($sources)
+    create_resources('apt::source', $sources)
+  }
 }