(#12809) $release should use $lsbdistcodename and fall back to manual input

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

diff --git a/manifests/init.pp b/manifests/init.pp
index b0acdd0927f60de80bd6abfc0236fa4bea37ae32..b41d359fbdeb22652a42db531ea387cf9abf05cb 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,11 +3,16 @@
 # This module manages the initial configuration of apt.
 #
 # Parameters:
-#   Both of the parameters listed here are not required in general and were
+#   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:
@@ -16,22 +21,25 @@
 #  class { 'apt': }
 class apt(
   $always_apt_update = false,
-  $disable_keys = false,
+  $disable_keys = undef,
   $proxy_host = false,
   $proxy_port = '8080',
-  $purge = false
+  $purge_sources_list = false,
+  $purge_sources_list_d = false
 ) {
 
   include apt::params
 
-  validate_bool($purge)
+  validate_bool($purge_sources_list, $purge_sources_list_d)
 
   $refresh_only_apt_update = $always_apt_update? {
     true => false,
     false => true
   }
 
-  package { "python-software-properties": }
+  if ! defined(Package["python-software-properties"]) {
+    package { "python-software-properties": }
+  }
 
   file { "sources.list":
     path => "${apt::params::root}/sources.list",
@@ -39,7 +47,7 @@ class apt(
     owner => root,
     group => root,
     mode => 644,
-    content => $purge ? {
+    content => $purge_sources_list ? {
       false =>  undef,
       true  => "# Repos managed by puppet.\n",
     },
@@ -50,8 +58,8 @@ class apt(
     ensure => directory,
     owner => root,
     group => root,
-    purge => $purge,
-    recurse => $purge,
+    purge => $purge_sources_list_d,
+    recurse => $purge_sources_list_d,
   }
 
   exec { "apt_update":
@@ -59,11 +67,23 @@ class apt(
     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'
+
+  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") }
   }
 
   if($proxy_host) {