Merge pull request #7 from cwarden/patch-1

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

diff --git a/manifests/init.pp b/manifests/init.pp
index 7513983c785bd9c0579428a4031c7656cbede021..8042c8be198a2e1c50938899c76151700d63abde 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,27 +1,57 @@
-# apt.pp
+# 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
+) {
 
-class apt {
-       $root = '/etc/apt'
-       $provider = '/usr/bin/apt-get'
+  include apt::params
 
-       file { "sources.list":
-               name => "${root}/sources.list",
-               ensure => present,
-               owner => root,
-               group => root,
-               mode => 644,
-       }
+  $refresh_only_apt_update = $always_apt_update? {
+    true => false,
+    false => true
+  }
 
-       file { "sources.list.d":
-               name => "${root}/sources.list.d",
-               ensure => directory,
-               owner => root,
-               group => root,
-       }
+  package { "python-software-properties": }
 
-       exec { "apt_update":
-               command => "${provider} update",
-               subscribe => [ File["sources.list"], File["sources.list.d"] ],
-               refreshonly => true,
-       }
+  file { "sources.list":
+    name => "${apt::params::root}/sources.list",
+    ensure => present,
+    owner => root,
+    group => root,
+    mode => 644,
+  }
+
+  file { "sources.list.d":
+    name => "${apt::params::root}/sources.list.d",
+    ensure => directory,
+    owner => root,
+    group => root,
+  }
+
+  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'
+    }
+  }
 }