X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=5f33fdba703920ddf94d2ea540ffc4ef2ed3497c;hb=3799e3a23c7d4e74c99aa4ec7e42de0b486ffe67;hp=48b62d178a30056b83d4edbde6598397bfad4497;hpb=ee0233066e7dd11e22ce85bbf5afd4257e9adff6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index 48b62d1..5f33fdb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,32 +1,59 @@ -# Class: apt +# == 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 true, Puppet will purge all unmanaged entries from sources.list.d -# update_timeout - Overrides the exec timeout in seconds for apt-get update. -# If not set defaults to Exec's default (300) -# update_tries - Number of times that `apt-get update` will be tried. Use this -# to work around transient DNS and HTTP errors. By default, the command -# will only be run once. +# The parameters listed here are not required in general and were +# added for use cases related to development environments. # -# Actions: +# === Parameters +# +# [*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) +# +# [*apt_update_frequency*] +# String: Supported values: +# **always**: Will fire `apt-get update` at every puppet run. Intended to +# deprecate the `always_apt_update` parameter. +# *daily**: Trigger `apt-get update` if the value of the fact +# `apt_update_last_success` is less than current epoch time - 86400. +# *notifying the apt_update exec will trigger apt-get update regardless* +# *weekly**: Trigger `apt-get update` if the value of the fact +# `apt_update_last_success` is less than current epoch time - 604800. +# *notifying the apt_update exec will trigger apt-get update regardless* +# *reluctantly**: *Default* only run apt-get update if the exec resource `apt_update` is notified. +# +# [*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 true, Puppet will purge all unmanaged entries from sources.list.d +# +# [*update_timeout*] +# Overrides the exec timeout in seconds for apt-get update. +# If not set defaults to Exec's default (300) +# +# [*update_tries*] +# Number of times that `apt-get update` will be tried. Use this +# to work around transient DNS and HTTP errors. By default, the command +# will only be run once. +# +# === Examples +# +# class { 'apt': } +# +# === Requires +# +# puppetlabs/stdlib >= 2.2.1 # -# Requires: -# puppetlabs/stdlib -# Sample Usage: -# class { 'apt': } - class apt( $always_apt_update = false, + $apt_update_frequency = 'reluctantly', $disable_keys = undef, $proxy_host = undef, $proxy_port = '8080', @@ -36,13 +63,16 @@ class apt( $purge_preferences_d = false, $update_timeout = undef, $update_tries = undef, - $sources = undef + $sources = undef, + $fancy_progress = undef ) { if $::osfamily != 'Debian' { fail('This module only works on Debian or derivatives like Ubuntu') } + $frequency_options = ['always','daily','weekly','reluctantly'] + validate_re($apt_update_frequency, $frequency_options) include apt::params include apt::update @@ -60,6 +90,14 @@ class apt( } } + file { '/etc/apt/apt.conf.d/15update-stamp': + ensure => 'file', + content => template('apt/_header.erb', 'apt/15update-stamp.erb'), + group => 'root', + mode => '0644', + owner => 'root', + } + $root = $apt::params::root $apt_conf_d = $apt::params::apt_conf_d $sources_list_d = $apt::params::sources_list_d @@ -88,8 +126,8 @@ class apt( if $purge_preferences { file { 'apt-preferences': - ensure => absent, - path => "${root}/preferences", + ensure => absent, + path => "${root}/preferences", } } @@ -102,11 +140,29 @@ class apt( recurse => $purge_preferences_d, } + case $fancy_progress { + true: { + file { '99progressbar': + ensure => present, + content => template('apt/_header.erb', 'apt/progressbar.erb'), + path => "${apt_conf_d}/99progressbar", + } + } + false: { + file { '99progressbar': + ensure => absent, + path => "${apt_conf_d}/99progressbar", + } + } + undef: {} # do nothing + default: { fail('Valid values for fancy_progress are true or false') } + } + case $disable_keys { true: { file { '99unauth': ensure => present, - content => "APT::Get::AllowUnauthenticated 1;\n", + content => template('apt/_header.erb', 'apt/unauth.erb'), path => "${apt_conf_d}/99unauth", } } @@ -120,25 +176,31 @@ class apt( default: { fail('Valid values for disable_keys are true or false') } } - $proxy_set = $proxy_host ? { - undef => absent, - default => present + case $proxy_host { + false, '', undef: { + file { '01proxy': + ensure => absent, + path => "${apt_conf_d}/01proxy", + notify => Exec['apt_update'], + } + } + default: { + file { '01proxy': + ensure => present, + path => "${apt_conf_d}/01proxy", + content => template('apt/_header.erb', 'apt/proxy.erb'), + notify => Exec['apt_update'], + mode => '0644', + owner => root, + group => root, + } + } } - file { '01proxy': - ensure => $proxy_set, - path => "${apt_conf_d}/01proxy", - content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n", - notify => Exec['apt_update'], - mode => '0644', - owner => root, - group => root, - } - file { 'old-proxy-file': - ensure => absent, - path => "${apt_conf_d}/proxy", - notify => Exec['apt_update'], + ensure => absent, + path => "${apt_conf_d}/proxy", + notify => Exec['apt_update'], } # Need anchor to provide containment for dependencies.