X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=0b4a0bc6267aad080422786c4dea95c0f9fffecb;hb=d261d8f11b85407c149924a8b03b0e681777f65a;hp=c778b6fd4b17c0fe66344277edf0a4169c00adbc;hpb=e337a243897dfd5d009fc3937c69d3c814a84305;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index c778b6f..0b4a0bc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,51 +1,21 @@
-# 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.
-#
-# Actions:
-#
-# Requires:
-#   puppetlabs/stdlib
-# Sample Usage:
-#  class { 'apt': }
-
 class apt(
   $always_apt_update    = false,
-  $disable_keys         = undef,
-  $proxy_host           = undef,
-  $proxy_port           = '8080',
+  $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
-) {
-
-  if $::osfamily != 'Debian' {
-    fail('This module only works on Debian or derivatives like Ubuntu')
-  }
+  $sources              = undef,
+) inherits ::apt::params {
 
-  include 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)
 
@@ -60,15 +30,14 @@ class apt(
     }
   }
 
-  $root           = $apt::params::root
-  $apt_conf_d     = $apt::params::apt_conf_d
-  $sources_list_d = $apt::params::sources_list_d
-  $preferences_d  = $apt::params::preferences_d
-  $provider       = $apt::params::provider
+  apt::setting { 'conf-update-stamp':
+    priority => 15,
+    content  => template('apt/_header.erb', 'apt/15update-stamp.erb'),
+  }
 
   file { 'sources.list':
     ensure  => present,
-    path    => "${root}/sources.list",
+    path    => $::apt::sources_list,
     owner   => root,
     group   => root,
     mode    => '0644',
@@ -78,7 +47,7 @@ class apt(
 
   file { 'sources.list.d':
     ensure  => directory,
-    path    => $sources_list_d,
+    path    => $::apt::sources_list_d,
     owner   => root,
     group   => root,
     purge   => $purge_sources_list_d,
@@ -86,61 +55,22 @@ class apt(
     notify  => Exec['apt_update'],
   }
 
-  if $purge_preferences == true {
+  if $purge_preferences {
     file { 'apt-preferences':
-      ensure  => absent,
-      path    => "${root}/preferences",
+      ensure => absent,
+      path   => $::apt::preferences,
     }
   }
 
   file { 'preferences.d':
     ensure  => directory,
-    path    => $preferences_d,
+    path    => $::apt::preferences_d,
     owner   => root,
     group   => root,
     purge   => $purge_preferences_d,
     recurse => $purge_preferences_d,
   }
 
-  case $disable_keys {
-    true: {
-      file { '99unauth':
-        ensure  => present,
-        content => "APT::Get::AllowUnauthenticated 1;\n",
-        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') }
-  }
-
-  $proxy_set = $proxy_host ? {
-    undef   => absent,
-    default => present
-  }
-
-  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'],
-  }
-
   # Need anchor to provide containment for dependencies.
   anchor { 'apt::update':
     require => Class['apt::update'],