From: Morgan Haskel <morgan@puppetlabs.com>
Date: Sun, 15 Feb 2015 17:09:47 +0000 (-0800)
Subject: Starting to clean up init.pp
X-Git-Tag: 2.0.0~45^2~16
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6cdbe562ab6dc6a75ae57bacbc2d5f44dcedcd10;p=puppet-modules%2Fpuppetlabs-apt.git

Starting to clean up init.pp
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 5f33fdb..faaecc7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,62 +1,7 @@
-# == Class: apt
-#
-# This module manages the initial configuration of apt.
-#
-# The parameters listed here are not required in general and were
-# added for use cases related to development environments.
-#
-# === 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
 #
 class apt(
   $always_apt_update    = false,
   $apt_update_frequency = 'reluctantly',
-  $disable_keys         = undef,
-  $proxy_host           = undef,
-  $proxy_port           = '8080',
   $purge_sources_list   = false,
   $purge_sources_list_d = false,
   $purge_preferences    = false,
@@ -64,17 +9,16 @@ class apt(
   $update_timeout       = undef,
   $update_tries         = undef,
   $sources              = undef,
-  $fancy_progress       = undef
-) {
+) inherits ::apt::params {
 
   if $::osfamily != 'Debian' {
     fail('This module only works on Debian or derivatives like Ubuntu')
   }
 
+  include apt::update
+
   $frequency_options = ['always','daily','weekly','reluctantly']
   validate_re($apt_update_frequency, $frequency_options)
-  include apt::params
-  include apt::update
 
   validate_bool($purge_sources_list, $purge_sources_list_d,
                 $purge_preferences, $purge_preferences_d)
@@ -140,69 +84,6 @@ 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 => template('apt/_header.erb', 'apt/unauth.erb'),
-        path    => "${apt_conf_d}/99unauth",
-      }
-    }
-    false: {
-      file { '99unauth':
-        ensure => absent,
-        path   => "${apt_conf_d}/99unauth",
-      }
-    }
-    undef:   { } # do nothing
-    default: { fail('Valid values for disable_keys are true or false') }
-  }
-
-  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 { 'old-proxy-file':
-    ensure => absent,
-    path   => "${apt_conf_d}/proxy",
-    notify => Exec['apt_update'],
-  }
-
   # Need anchor to provide containment for dependencies.
   anchor { 'apt::update':
     require => Class['apt::update'],
diff --git a/templates/proxy.erb b/templates/proxy.erb
deleted file mode 100644
index accb0cc..0000000
--- a/templates/proxy.erb
+++ /dev/null
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://<%= @proxy_host %>:<%= @proxy_port %>";