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 03ef116193745f4f52f842b27483eb3c79b53bc5..86e49c8f4ea48ff029e0251da34f01c39d0e5d44 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,57 +1,107 @@
-# Class: apt
 #
-# This module manages the initial configuration of apt.
-#
-# Parameters:
-#   Both of 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
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  class { 'apt': }
 class apt(
-  $disable_keys = false,
-  $always_apt_update = false
-) {
-
-  include apt::params
-
-  $refresh_only_apt_update = $always_apt_update? {
-    true => false,
-    false => true
-  }
-
-  package { "python-software-properties": }
-
-       file { "sources.list":
-               ensure => present,
-               owner => root,
-               group => root,
-               mode => 644,
-       }
-    name => "${apt::params::root}/sources.list",
-
-       file { "sources.list.d":
-               ensure => directory,
-               owner => root,
-               group => root,
-       }
-    name => "${apt::params::root}/sources.list.d",
-
-  exec { "apt_update":
-    command => "${apt::params::provider} update",
-    subscribe => [ File["sources.list"], File["sources.list.d"] ],
-    refreshonly => $refresh_only_apt_update,
-  }
-  if($disable_keys) {
-    exec { 'make-apt-insecure':
-      command => '/bin/echo "APT::Get::AllowUnauthenticated 1;" >> /etc/apt/apt.conf.d/99unauth',
-      creates => '/etc/apt/apt.conf.d/99unauth'
+  $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
+
+  $frequency_options = ['always','daily','weekly','reluctantly']
+  validate_re($apt_update_frequency, $frequency_options)
+
+  validate_bool($purge_sources_list, $purge_sources_list_d,
+                $purge_preferences, $purge_preferences_d)
+
+  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'])
+  }
+
+  $_proxy = merge($apt::proxy_defaults, $proxy)
+
+  if $proxy['host'] {
+    apt::setting { 'conf-proxy':
+      priority => '01',
+      content  => template('apt/_header.erb', 'apt/proxy.erb'),
+    }
+  }
+
+  $sources_list_content = $purge_sources_list ? {
+    false => undef,
+    true  => "# Repos managed by puppet.\n",
+  }
+
+  if $always_apt_update == true {
+    Exec <| title=='apt_update' |> {
+      refreshonly => false,
+    }
+  }
+
+  apt::setting { 'conf-update-stamp':
+    priority => 15,
+    content  => template('apt/_header.erb', 'apt/15update-stamp.erb'),
+  }
+
+  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 $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)
+  }
 }