- Release 0.0.1
+###Summary
+
+* d4fec56 Modify apt::source release parameter test
+* 1132a07 (#12917) Add contributors to README
+* 8cdaf85 (#12823) Add apt::key defined type and modify apt::source to use it
+* 7c0d10b (#12809) $release should use $lsbdistcodename and fall back to manual input
+* be2cc3e (#12522) Adjust spec test for splitting purge
+* 7dc60ae (#12522) Split purge option to spare sources.list
+* 9059c4e Fix source specs to test all key permutations
+* 8acb202 Add test for python-software-properties package
+* a4af11f Check if python-software-properties is defined before attempting to define it.
+* 1dcbf3d Add tests for required_packages change
+* f3735d2 Allow duplicate $required_packages
+* 74c8371 (#12430) Add tests for changes to apt module
+* 97ebb2d Test two sources with the same key
+* 1160bcd (#12526) Add ability to reverse apt { disable_keys => true }
+* 2842d73 Add Modulefile to puppet-apt
+* c657742 Allow the use of the same key in multiple sources
+* 8c27963 (#12522) Adding purge option to apt class
+* 997c9fd (#12529) Add unit test for apt proxy settings
+* 50f3cca (#12529) Add parameter to support setting a proxy for apt
+* d522877 (#12094) Replace chained .with_* with a hash
+* 8cf1bd0 (#12094) Remove deprecated spec.opts file
+* 2d688f4 (#12094) Add rspec-puppet tests for apt
+* 0fb5f78 (#12094) Replace name with path in file resources
+* f759bc0 (#11953) Apt::force passes $version to aptitude
+* f71db53 (#11413) Add spec test for apt::force to verify changes to unless
+* 2f5d317 (#11413) Update dpkg query used by apt::force
+* cf6caa1 (#10451) Add test coverage to apt::ppa
+* 0dd697d include_src parameter in example; Whitespace cleanup
+* b662eb8 fix typos in "repositories"
+* 1be7457 Fix (#10451) - apt::ppa fails to "apt-get update" when new PPA source is added
+* 864302a Set the pin priority before adding the source (Fix #10449)
+* 1de4e0a Refactored as per mlitteken
+* 1af9a13 Added some crazy bash madness to check if the ppa is installed already. Otherwise the manifest tries to add it on every run!
+* 52ca73e (#8720) Replace Apt::Ppa with Apt::Builddep
+* 5c05fa0 added builddep command.
+* a11af50 added the ability to specify the content of a key
+* c42db0f Fixes ppa test.
+* 77d2b0d reformatted whitespace to match recommended style of 2 space indentation.
+* 27ebdfc ignore swap files.
+* 377d58a added smoke tests for module.
+* 18f614b reformatted apt::ppa according to recommended style.
+* d8a1e4e Created a params class to hold global data.
+* 636ae85 Added two params for apt class
+* 148fc73 Update LICENSE.
+* ed2d19e Support ability to add more than one PPA
+* 420d537 Add call to apt-update after add-apt-repository in apt::ppa
+* 945be77 Add package definition for python-software-properties
+* 71fc425 Abs paths for all commands
+* 9d51cd1 Adding LICENSE
+* 71796e3 Heading fix in README
+* 87777d8 Typo in README
+* f848bac First commit
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..bfeaa701ca
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,220 @@
+Checklist (and a short version for the impatient)
+=================================================
+
+ * Commits:
+
+ - Make commits of logical units.
+
+ - Check for unnecessary whitespace with "git diff --check" before
+ committing.
+
+ - Commit using Unix line endings (check the settings around "crlf" in
+ git-config(1)).
+
+ - Do not check in commented out code or unneeded files.
+
+ - The first line of the commit message should be a short
+ description (50 characters is the soft limit, excluding ticket
+ number(s)), and should skip the full stop.
+
+ - Associate the issue in the message. The first line should include
+ the issue number in the form "(#XXXX) Rest of message".
+
+ - The body should provide a meaningful commit message, which:
+
+ - uses the imperative, present tense: "change", not "changed" or
+ "changes".
+
+ - includes motivation for the change, and contrasts its
+ implementation with the previous behavior.
+
+ - Make sure that you have tests for the bug you are fixing, or
+ feature you are adding.
+
+ - Make sure the test suites passes after your commit:
+ `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
+
+ - When introducing a new feature, make sure it is properly
+ documented in the README.md
+
+ * Submission:
+
+ * Pre-requisites:
+
+ - Make sure you have a [GitHub account](https://github.com/join)
+
+ - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
+
+ * Preferred method:
+
+ - Fork the repository on GitHub.
+
+ - Push your changes to a topic branch in your fork of the
+ repository. (the format ticket/1234-short_description_of_change is
+ usually preferred for this project).
+
+ - Submit a pull request to the repository in the puppetlabs
+ organization.
+
+The long version
+================
+
+ 1. Make separate commits for logically separate changes.
+
+ Please break your commits down into logically consistent units
+ which include new or changed tests relevant to the rest of the
+ change. The goal of doing this is to make the diff easier to
+ read for whoever is reviewing your code. In general, the easier
+ your diff is to read, the more likely someone will be happy to
+ review it and get it into the code base.
+
+ If you are going to refactor a piece of code, please do so as a
+ separate commit from your feature or bug fix changes.
+
+ We also really appreciate changes that include tests to make
+ sure the bug is not re-introduced, and that the feature is not
+ accidentally broken.
+
+ Describe the technical detail of the change(s). If your
+ description starts to get too long, that is a good sign that you
+ probably need to split up your commit into more finely grained
+ pieces.
+
+ Commits which plainly describe the things which help
+ reviewers check the patch and future developers understand the
+ code are much more likely to be merged in with a minimum of
+ bike-shedding or requested changes. Ideally, the commit message
+ would include information, and be in a form suitable for
+ inclusion in the release notes for the version of Puppet that
+ includes them.
+
+ Please also check that you are not introducing any trailing
+ whitespace or other "whitespace errors". You can do this by
+ running "git diff --check" on your changes before you commit.
+
+ 2. Sending your patches
+
+ To submit your changes via a GitHub pull request, we _highly_
+ recommend that you have them on a topic branch, instead of
+ directly on "master".
+ It makes things much easier to keep track of, especially if
+ you decide to work on another thing before your first change
+ is merged in.
+
+ GitHub has some pretty good
+ [general documentation](http://help.github.com/) on using
+ their site. They also have documentation on
+ [creating pull requests](http://help.github.com/send-pull-requests/).
+
+ In general, after pushing your topic branch up to your
+ repository on GitHub, you can switch to the branch in the
+ GitHub UI and click "Pull Request" towards the top of the page
+ in order to open a pull request.
+
+
+ 3. Update the related GitHub issue.
+
+ If there is a GitHub issue associated with the change you
+ submitted, then you should update the ticket to include the
+ location of your branch, along with any other commentary you
+ may wish to make.
+
+Testing
+=======
+
+Getting Started
+---------------
+
+Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
+package manager such as [bundler](http://bundler.io/) what Ruby packages,
+or Gems, are required to build, develop, and test this software.
+
+Please make sure you have [bundler installed](http://bundler.io/#getting-started)
+on your system, then use it to install all dependencies needed for this project,
+by running
+
+```shell
+% bundle install
+Fetching gem metadata from https://rubygems.org/........
+Fetching gem metadata from https://rubygems.org/..
+Using rake (10.1.0)
+Using builder (3.2.2)
+-- 8><-- many more --><8 --
+Using rspec-system-puppet (2.2.0)
+Using serverspec (0.6.3)
+Using rspec-system-serverspec (1.0.0)
+Using bundler (1.3.5)
+Your bundle is complete!
+Use `bundle show [gemname]` to see where a bundled gem is installed.
+```
+
+NOTE some systems may require you to run this command with sudo.
+
+If you already have those gems installed, make sure they are up-to-date:
+
+```shell
+% bundle update
+```
+
+With all dependencies in place and up-to-date we can now run the tests:
+
+```shell
+% bundle exec rake spec
+```
+
+This will execute all the [rspec tests](http://rspec-puppet.com/) tests
+under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
+and so on. rspec tests may have the same kind of dependencies as the
+module they are testing. While the module defines in its [Modulefile](./Modulefile),
+rspec tests define them in [.fixtures.yml](./fixtures.yml).
+
+Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
+tests. These tests spin up a virtual machine under
+[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
+[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
+scenarios. In order to run these, you will need both of those tools
+installed on your system.
+
+You can run them by issuing the following command
+
+```shell
+% bundle exec rake spec_clean
+% bundle exec rspec spec/acceptance
+```
+
+This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
+install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
+and then run all the tests under [spec/acceptance](./spec/acceptance).
+
+Writing Tests
+-------------
+
+XXX getting started writing tests.
+
+If you have commit access to the repository
+===========================================
+
+Even if you have commit access to the repository, you will still need to
+go through the process above, and have someone else review and merge
+in your changes. The rule is that all changes must be reviewed by a
+developer on the project (that did not write the code) to ensure that
+all changes go through a code review process.
+
+Having someone other than the author of the topic branch recorded as
+performing the merge is the record that they performed the code
+review.
+
+
+Additional Resources
+====================
+
+* [Getting additional help](http://puppetlabs.com/community/get-help)
+
+* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
+
+* [Patchwork](https://patchwork.puppetlabs.com)
+
+* [General GitHub documentation](http://help.github.com/)
+
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000..3007280c65
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,44 @@
+#This file is generated by ModuleSync, do not edit.
+
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
+
+def location_for(place, version = nil)
+ if place =~ /^(git[:@][^#]*)#(.*)/
+ [version, { :git => $1, :branch => $2, :require => false}].compact
+ elsif place =~ /^file:\/\/(.*)/
+ ['>= 0', { :path => File.expand_path($1), :require => false}]
+ else
+ [place, version, { :require => false}].compact
+ end
+end
+
+group :development, :unit_tests do
+ gem 'json', :require => false
+ gem 'metadata-json-lint', :require => false
+ gem 'puppet_facts', :require => false
+ gem 'puppet-blacksmith', :require => false
+ gem 'puppetlabs_spec_helper', :require => false
+
+ # Modulesync will override the following. This is only a temporary measure until we fix
+ # our tests for rspec-puppet 2.4.0 support.
+ # Actual update work to be done in https://tickets.puppetlabs.com/browse/FM-5035
+ gem 'rspec-puppet', '= 2.3.2', :require => false
+
+ gem 'simplecov', :require => false
+end
+group :system_tests do
+ gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
+ gem 'beaker', *location_for(ENV['BEAKER_VERSION'])
+ gem 'serverspec', :require => false
+ gem 'beaker-puppet_install_helper', :require => false
+ gem 'master_manipulator', :require => false
+ gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+end
+
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+
+
+if File.exists? "#{__FILE__}.local"
+ eval(File.read("#{__FILE__}.local"), binding)
+end
diff --git a/LICENSE b/LICENSE
index 638c347b17..d645695673 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,19 +1,202 @@
-Copyright (c) 2011 Evolving Web Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000000..8da18e1c7f
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,40 @@
+apt puppet module
+
+Copyright (C) 2014-2016 Puppet Labs, Inc.
+
+Puppet Labs can be contacted at: info@puppetlabs.com
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+
+Copyright (c) 2011 Evolving Web Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
index 8beee7cf3b..30dfed2416 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,523 @@
-# Apt module for Puppet
+# apt
-## Description
-Provides helpful definitions for dealing with Apt.
+#### Table of Contents
+
+
+2. [Module Description - What the module does and why it is useful](#module-description)
+3. [Setup - The basics of getting started with apt](#setup)
+ * [What apt affects](#what-apt-affects)
+ * [Beginning with apt](#beginning-with-apt)
+4. [Usage - Configuration options and additional functionality](#usage)
+ * [Add GPG keys](#add-gpg-keys)
+ * [Prioritize backports](#prioritize-backports)
+ * [Update the list of packages](#update-the-list-of-packages)
+ * [Pin a specific release](#pin-a-specific-release)
+ * [Add a Personal Package Archive repository](#add-a-personal-package-archive-repository)
+ * [Configure Apt from Hiera](#configure-apt-from-hiera)
+ * [Replace the default sources.list file](#replace-the-default-sourceslist-file)
+5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
+ * [Classes](#classes)
+ * [Defined Types](#defined-types)
+ * [Types](#types)
+ * [Facts](#facts)
+6. [Limitations - OS compatibility, etc.](#limitations)
+7. [Development - Guide for contributing to the module](#development)
+
+## Module Description
+
+The apt module lets you use Puppet to manage Apt sources, keys, and other configuration options.
+
+Apt (Advanced Package Tool) is a package manager available on Debian, Ubuntu, and several other operating systems. The apt module provides a series of classes, defines, types, and facts to help you automate Apt package management.
+
+**Note**: For this module to correctly autodetect which version of Debian/Ubuntu (or derivative) you're running, you need to make sure the 'lsb-release' package is installed. We highly recommend you either make this part of your provisioning layer, if you run many Debian or derivative systems, or ensure that you have Facter 2.2.0 or later installed, which will pull this dependency in for you.
+
+## Setup
+
+### What apt affects
+
+* Your system's `preferences` file and `preferences.d` directory
+* Your system's `sources.list` file and `sources.list.d` directory
+* System repositories
+* Authentication keys
+
+**Note:** This module offers `purge` parameters which, if set to 'true', **destroy** any configuration on the node's `sources.list(.d)` and `preferences(.d)` that you haven't declared through Puppet. The default for these parameters is 'false'.
+
+### Beginning with apt
+
+To use the apt module with default parameters, declare the `apt` class.
+
+```puppet
+include apt
+```
+
+**Note:** The main `apt` class is required by all other classes, types, and defined types in this module. You must declare it whenever you use the module.
## Usage
-### apt::force
-Force a package to be installed from a specific release. Useful when using repositoires like Debian unstable in Ubuntu.
-
-apt::force { "glusterfs-server":
- release => "unstable",
- version => '3.0.3',
- require => Apt::Source["debian_unstable"],
-}
-
-
-### apt::pin
-Add an apt pin for a certain release.
-
-apt::pin { "karmic": priority => 700 }
-apt::pin { "karmic-updates": priority => 700 }
-apt::pin { "karmic-security": priority => 700 }
-
-
-### apt::ppa
-Add a ppa repository using `add-apt-repository`. Somewhat experimental.
-
-apt::ppa { "ppa:drizzle-developers/ppa": }
-
-
-### apt::release
-Set the default apt release. Useful when using repositoires like Debian unstable in Ubuntu.
-
-apt::release { "karmic": }
-
-
-### apt::source
-Add an apt source to `/etc/apt/sources.list.d/`.
-
-apt::source { "debian_unstable":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "unstable",
- repos => "main contrib non-free",
- required_packages => "debian-keyring debian-archive-keyring",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
-}
-
+### Add GPG keys
+
+**Warning:** Using short key IDs presents a serious security issue, potentially leaving you open to collision attacks. We recommend you always use full fingerprints to identify your GPG keys. This module allows short keys, but issues a security warning if you use them.
+
+Declare the `apt::key` class:
+
+```puppet
+apt::key { 'puppetlabs':
+ id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ server => 'pgp.mit.edu',
+ options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
+}
+```
+
+### Prioritize backports
+
+```puppet
+class { 'apt::backports':
+ pin => 500,
+}
+```
+
+By default, the `apt::backports` class drops a pin file for backports, pinning it to a priority of 200. This is lower than the normal default of 500, so packages with `ensure => latest` don't get upgraded from backports without your explicit permission.
+
+If you raise the priority through the `pin` parameter to 500, normal policy goes into effect and Apt installs or upgrades to the newest version. This means that if a package is available from backports, it and its dependencies are pulled in from backports unless you explicitly set the `ensure` attribute of the `package` resource to `installed`/`present` or a specific version.
+
+### Update the list of packages
+
+By default, Puppet runs `apt-get update` on the first Puppet run after you include the `apt` class, and anytime `notify => Exec['apt_update']` occurs; i.e., whenever config files get updated or other relevant changes occur. If you set `update['frequency']` to 'always', the update runs on every Puppet run. You can also set `update['frequency']` to 'daily' or 'weekly':
+
+```puppet
+class { 'apt':
+ update => {
+ frequency => 'daily',
+ },
+}
+```
+
+### Pin a specific release
+
+```puppet
+apt::pin { 'karmic': priority => 700 }
+apt::pin { 'karmic-updates': priority => 700 }
+apt::pin { 'karmic-security': priority => 700 }
+```
+
+You can also specify more complex pins using distribution properties:
+
+```puppet
+apt::pin { 'stable':
+ priority => -10,
+ originator => 'Debian',
+ release_version => '3.0',
+ component => 'main',
+ label => 'Debian'
+}
+```
+
+To pin multiple packages, pass them to the `packages` parameter as an array or a space-delimited string.
+
+### Add a Personal Package Archive repository
+
+```puppet
+apt::ppa { 'ppa:drizzle-developers/ppa': }
+```
+
+### Add an Apt source to `/etc/apt/sources.list.d/`
+
+```puppet
+apt::source { 'debian_unstable':
+ comment => 'This is the iWeb Debian unstable mirror',
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'unstable',
+ repos => 'main contrib non-free',
+ pin => '-10',
+ key => {
+ 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ 'server' => 'subkeys.pgp.net',
+ },
+ include => {
+ 'src' => true,
+ 'deb' => true,
+ },
+}
+```
+
+To use the Puppet Labs Apt repository as a source:
+
+```puppet
+apt::source { 'puppetlabs':
+ location => 'http://apt.puppetlabs.com',
+ repos => 'main',
+ key => {
+ 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ 'server' => 'pgp.mit.edu',
+ },
+},
+```
+
+### Configure Apt from Hiera
+
+Instead of specifying your sources directly as resources, you can instead just
+include the `apt` class, which will pick up the values automatically from
+hiera.
+
+```yaml
+apt::sources:
+ 'debian_unstable':
+ comment: 'This is the iWeb Debian unstable mirror'
+ location: 'http://debian.mirror.iweb.ca/debian/'
+ release: 'unstable'
+ repos: 'main contrib non-free'
+ pin: '-10'
+ key:
+ id: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'
+ server: 'subkeys.pgp.net'
+ include:
+ src: true
+ deb: true
+
+ 'puppetlabs':
+ location: 'http://apt.puppetlabs.com'
+ repos: 'main'
+ key:
+ id: '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+ server: 'pgp.mit.edu'
+```
+
+### Replace the default sources.list file
+
+The following example replaces the default `/etc/apt/sources.list`. Along with this code, be sure to use the `purge` parameter, or you might get duplicate source warnings when running Apt.
+
+```puppet
+apt::source { "archive.ubuntu.com-${lsbdistcodename}":
+ location => 'http://archive.ubuntu.com/ubuntu',
+ key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ repos => 'main universe multiverse restricted',
+}
+
+apt::source { "archive.ubuntu.com-${lsbdistcodename}-security":
+ location => 'http://archive.ubuntu.com/ubuntu',
+ key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ repos => 'main universe multiverse restricted',
+ release => "${lsbdistcodename}-security"
+}
+
+apt::source { "archive.ubuntu.com-${lsbdistcodename}-updates":
+ location => 'http://archive.ubuntu.com/ubuntu',
+ key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ repos => 'main universe multiverse restricted',
+ release => "${lsbdistcodename}-updates"
+}
+
+apt::source { "archive.ubuntu.com-${lsbdistcodename}-backports":
+ location => 'http://archive.ubuntu.com/ubuntu',
+ key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ repos => 'main universe multiverse restricted',
+ release => "${lsbdistcodename}-backports"
+}
+```
+
+## Reference
+
+### Classes
+
+#### Public Classes
+
+* [`apt`](#class-apt)
+* [`apt::backports`](#class-aptbackports)
+
+#### Private Classes
+
+* `apt::params`: Provides defaults for the apt module parameters.
+* `apt::update`: Updates the list of available packages using `apt-get update`.
+
+### Defined Types
+
+* [`apt::conf`](#defined-type-aptconf)
+* [`apt::key`](#defined-type-aptkey)
+* [`apt::pin`](#defined-type-aptpin)
+* [`apt::ppa`](#defined-type-aptppa)
+* [`apt::setting`](#defined-type-aptsetting)
+* [`apt::source`](#defined-type-aptsource)
+
+### Types
+
+* [`apt_key`](#type-apt_key)
+
+### Facts
+
+* `apt_updates`: The number of installed packages with available updates.
+
+* `apt_security_updates`: The number of installed packages with available security updates.
+
+* `apt_package_updates`: The names of all installed packages with available updates. In Facter 2.0 and later this data is formatted as an array; in earlier versions it is a comma-delimited string.
+
+* `apt_update_last_success`: The date, in epochtime, of the most recent successful `apt-get update` run (based on the mtime of /var/lib/apt/periodic/update-success-stamp).
+
+* `apt_reboot_required`: Determines if a reboot is necessary after updates have been installed.
+
+#### Class: `apt`
+
+Main class, includes all other classes.
+
+##### Parameters (all optional)
+
+* `keys`: Creates new `apt::key` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}.
+
+* `ppas`: Creates new `apt::ppa` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}.
+
+* `proxy`: Configures Apt to connect to a proxy server. Valid options: a hash made up from the following keys:
+
+ * 'host': Specifies a proxy host to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a hostname. Default: undef.
+
+ * 'port': Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a port number. Default: '8080'.
+
+ * 'https': Specifies whether to enable https proxies. Valid options: 'true' and 'false'. Default: 'false'.
+
+ * 'ensure': Optional parameter. Valid options: 'file', 'present', and 'absent'. Default: 'undef'. Prefer 'file' over 'present'.
+
+* `purge`: Specifies whether to purge any existing settings that aren't managed by Puppet. Valid options: a hash made up from the following keys:
+
+ * 'sources.list': Specifies whether to purge any unmanaged entries from `sources.list`. Valid options: 'true' and 'false'. Default: 'false'.
+
+ * 'sources.list.d': Specifies whether to purge any unmanaged entries from `sources.list.d`. Valid options: 'true' and 'false'. Default: 'false'.
+
+ * 'preferences': Specifies whether to purge any unmanaged entries from `preferences`. Valid options: 'true' and 'false'. Default: 'false'.
+
+ * 'preferences.d': Specifies whether to purge any unmanaged entries from `preferences.d`. Valid options: 'true' and 'false'. Default: 'false'.
+
+* `settings`: Creates new `apt::setting` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}.
+
+* `sources`: Creates new `apt::source` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}.
+
+* `pins`: Creates new `apt::pin` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}.
+
+* `update`: Configures various update settings. Valid options: a hash made up from the following keys:
+
+ * 'frequency': Specifies how often to run `apt-get update`. If the exec resource `apt_update` is notified, `apt-get update` runs regardless of this value. Valid options: 'always' (at every Puppet run); 'daily' (if the value of `apt_update_last_success` is less than current epoch time minus 86400); 'weekly' (if the value of `apt_update_last_success` is less than current epoch time minus 604800); and 'reluctantly' (only if the exec resource `apt_update` is notified). Default: 'reluctantly'.
+
+ * 'timeout': Specifies how long to wait for the update to complete before canceling it. Valid options: an integer, in seconds. Default: 300.
+
+ * 'tries': Specifies how many times to retry the update after receiving a DNS or HTTP error. Valid options: an integer. Default: 1.
+
+#### Class: `apt::backports`
+
+Manages backports.
+
+##### Parameters (all optional on Debian and Ubuntu; all required on other operating systems, except where specified)
+
+* `key`: Specifies a key to authenticate the backports. Valid options: a string to be passed to the `id` parameter of the `apt::key` defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or `options` parameters. Defaults:
+
+ * Debian: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'
+ * Ubuntu: '630239CC130E1A7FD81A27B140976EAF437D05B5'
+
+* `location`: Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Defaults:
+
+ * Debian (squeeze): 'http://httpredir.debian.org/debian-backports'
+ * Debian (other): 'http://httpredir.debian.org/debian'
+ * Ubuntu: 'http://archive.ubuntu.com/ubuntu'
+
+* `pin`: *Optional.* Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters. Default: '200'.
+
+* `release`: Specifies a distribution of the Apt repository containing the backports to manage. Valid options: a string containing the release, used in populating the `source.list` configuration file. Default: on Debian and Ubuntu, '${lsbdistcodename}-backports'. We recommend keeping this default, except on other operating systems.
+
+* `repos`: Specifies a component of the Apt repository containing the backports to manage. Valid options: A string containing the repos to include, used in populating the `source.list` configuration file. Defaults:
+
+ * Debian: 'main contrib non-free'
+ * Ubuntu: 'main universe multiverse restricted'
+
+#### Defined Type: `apt::conf`
+
+Specifies a custom Apt configuration file.
+
+##### Parameters
+
+* `content`: *Required, unless `ensure` is set to 'absent'.* Directly supplies content for the configuration file. Valid options: a string. Default: undef.
+
+* `ensure`: Specifies whether the configuration file should exist. Valid options: 'present' and 'absent'. Default: 'present'.
+
+* `priority`: *Optional.* Determines the order in which Apt processes the configuration file. Files with lower priority numbers are loaded first. Valid options: a string containing an integer. Default: '50'.
+
+* `notify_update`: *Optional.* Specifies whether to trigger an `apt-get update` run. Valid options: 'true' and 'false'. Default: 'true'.
+
+#### Defined Type: `apt::key`
+
+Manages the GPG keys that Apt uses to authenticate packages.
+
+The `apt::key` defined type makes use of the `apt_key` type, but includes extra functionality to help prevent duplicate keys.
+
+##### Parameters (all optional)
+
+* `content`: Supplies the entire GPG key. Useful in case the key can't be fetched from a remote location and using a file resource is inconvenient. Valid options: a string. Default: undef.
+
+* `ensure`: Specifies whether the key should exist. Valid options: 'present' and 'absent'. Default: 'present'.
+
+* `id`: Specifies a GPG key to authenticate Apt package signatures. Valid options: a string containing a key ID (8 or 16 hexadecimal characters, optionally prefixed with "0x") or a full key fingerprint (40 hexadecimal characters). Default: $title.
+
+* `options`: Passes additional options to `apt-key adv --keyserver-options`. Valid options: a string. Default: undef.
+
+* `source`: Specifies the location of an existing GPG key file to copy. Valid options: a string containing a URL (ftp://, http://, or https://) or an absolute path. Default: undef.
+
+* `server`: Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or hkp://). Default: 'keyserver.ubuntu.com'.
+
+* `key`: Specifies a GPG key to authenticate Apt package signatures. Valid options: a string containing a key ID (8 or 16 hexadecimal characters, optionally prefixed with "0x") or a full key fingerprint (40 hexadecimal characters). Default: undef. **Note** This parameter is deprecated and will be removed in a future release.
+
+* `key_content`: Supplies the entire GPG key. Useful in case the key can't be fetched from a remote location and using a file resource is inconvenient. Valid options: a string. Default: undef. **Note** This parameter is deprecated and will be removed in a future release.
+
+* `key_source`: Specifies the location of an existing GPG key file to copy. Valid options: a string containing a URL (ftp://, http://, or https://) or an absolute path. Default: undef. **Note** This parameter is deprecated and will be removed in a future release.
+
+* `key_server`: Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or hkp://). Default: 'keyserver.ubuntu.com'. **Note** This parameter is deprecated and will be removed in a future release.
+
+* `key_options`: Passes additional options to `apt-key adv --keyserver-options`. Valid options: a string. Default: undef. **Note** This parameter is deprecated and will be removed in a future release.
+
+#### Defined Type: `apt::pin`
+
+Manages Apt pins. Does not trigger an `apt-get update` run.
+
+**Note:** For context on these parameters, we recommend reading the man page ['apt_preferences(5)'](http://linux.die.net/man/5/apt_preferences)
+
+##### Parameters (all optional)
+
+* `codename`: Specifies the distribution (lsbdistcodename) of the Apt repository. Valid options: a string. Default: ''.
+
+* `component`: Names the licensing component associated with the packages in the directory tree of the Release file. Valid options: a string. Default: ''.
+
+* `ensure`: Specifies whether the pin should exist. Valid options: 'file', 'present', and 'absent'. Default: 'present'.
+
+* `explanation`: Supplies a comment to explain the pin. Valid options: a string. Default: "${caller_module_name}: ${name}".
+
+* `label`: Names the label of the packages in the directory tree of the Release file. Valid options: a string (most commonly, 'debian'). Default: ''.
+
+* `order`: Determines the order in which Apt processes the pin file. Files with lower order numbers are loaded first. Valid options: an integer. Default: 50.
+
+* `origin`: Tells Apt to prefer packages from the specified server. Valid options: a string containing a hostname. Default: ''.
+
+* `originator`: Names the originator of the packages in the directory tree of the Release file. Valid options: a string (most commonly, 'debian'). Default: ''.
+
+* `packages`: Specifies which package(s) to pin. Valid options: a string or an array. Default: '*'.
+
+* `priority`: Sets the priority of the package. If multiple versions of a given package are available, `apt-get` installs the one with the highest priority number (subject to dependency constraints). Valid options: an integer. Default: 0.
+
+* `release`: Tells Apt to prefer packages that support the specified release. Typical values include 'stable', 'testing', and 'unstable' Valid options: a string. Default: ''.
+
+* `release_version`: Tells Apt to prefer packages that support the specified operating system release version (e.g., Debian release version 7). Valid options: a string. Default: ''.
+
+* `version`: Tells Apt to prefer a specified package version or version range. Valid options: a string. Default: ''.
+
+#### Defined Type: `apt::ppa`
+
+Manages PPA repositories using `add-apt-repository`. Not supported on Debian.
+
+##### Parameters (all optional, except where specified)
+
+* `ensure`: Specifies whether the PPA should exist. Valid options: 'present' and 'absent'. Default: 'present'.
+
+* `options`: Supplies options to be passed to the `add-apt-repository` command. Valid options: a string. Defaults:
+
+ * Lucid: undef
+ * All others: '-y'
+
+* `package_manage`: Specifies whether Puppet should manage the package that provides `apt-add-repository`. Valid options: 'true' and 'false'. Default: 'false'.
+
+* `package_name`: Names the package that provides the `apt-add-repository` command. Valid options: a string. Defaults:
+
+ * Lucid and Precise: 'python-software-properties'
+ * Trusty, Utopic, and Vivid: 'software-properties-common'
+ * All others: undef
+
+* `release`: *Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint).* Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename. Default: "$lsbdistcodename".
+
+#### Defined Type: `apt::setting`
+
+Manages Apt configuration files.
+
+##### Parameters
+
+* `content`: *Required, unless `source` is set.* Directly supplies content for the configuration file. Cannot be used in combination with `source`. Valid options: see the `content` attribute of [Puppet's native `file` type](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-content). Default: undef.
+
+* `ensure`: Specifies whether the file should exist. Valid options: 'present', 'absent', and 'file'. Default: 'file'.
+
+* `notify_update`: *Optional.* Specifies whether to trigger an `apt-get update` run. Valid options: 'true' and 'false'. Default: 'true'.
+
+* `priority`: *Optional.* Determines the order in which Apt processes the configuration file. Files with higher priority numbers are loaded first. Valid options: an integer or zero-padded integer. Default: 50.
+
+* `source`: *Required, unless `content` is set.* Specifies a source file to supply the content of the configuration file. Cannot be used in combination with `content`. Valid options: see the `source` attribute of [Puppet's native `file` type](https://docs.puppetlabs.com/references/latest/type.html#file-attribute-source). Default: undef.
+
+#### Defined Type: `apt::source`
+
+Manages the Apt sources in `/etc/apt/sources.list.d/`.
+
+##### Parameters (all optional, except where specified)
+
+* `allow_unsigned`: Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked. Valid options: 'true' and 'false'. Default: 'false'.
+
+* `architecture`: Tells Apt to only download information for specified architectures. Valid options: a string containing one or more architecture names, separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures defined in the Apt::Architectures option).
+
+* `comment`: Supplies a comment for adding to the Apt source file. Valid options: a string. Default: $name.
+
+* `ensure`: Specifies whether the Apt source file should exist. Valid options: 'present' and 'absent'. Default: 'present'.
+
+* `key`: Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key` defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or `options` parameters. Default: undef.
+
+* `include`: Configures include options. Valid options: a hash of available keys. Default: {}. Available keys are:
+
+ * 'deb' - Specifies whether to request the distribution's compiled binaries. Valid options: 'true' and 'false'. Default: 'true'.
+
+ * 'src' - Specifies whether to request the distribution's uncompiled source code. Valid options: 'true' and 'false'. Default: 'false'.
+
+* `location`: *Required, unless `ensure` is set to 'absent'.* Specifies an Apt repository. Valid options: a string containing a repository URL. Default: undef.
+
+* `pin`: Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters. Default: undef.
+
+* `release`: Specifies a distribution of the Apt repository. Valid options: a string. Default: "$lsbdistcodename".
+
+ * `repos`: Specifies a component of the Apt repository. Valid options: a string. Default: 'main'.
+
+* `include_deb`: Specify whether to request the distrubution's compiled binaries. Valid options: 'true' and 'false'. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module.
+
+* `include_src`: Specifies whether to request the distribution's uncompiled source code. Valid options: 'true' and 'false'. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module.
+
+* `required_packages`: Installs packages required for this Apt source via an exec. Default: 'false'. **Note**: This parameter is deprecated and will be removed in future versions of the module.
+
+* `key_content`: Specifies the content to be passed to `apt::key`. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module.
+
+* `key_server`: Specifies the server to be passed to `apt::key`. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module.
+
+* `key_source`: Specifies the source to be passed to `apt::key`. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module.
+
+* `trusted_source`: Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked. Valid options: 'true' and 'false'. Default: undef. This parameter is **deprecated** and will be removed in a future version of the module.
+
+#### Type: `apt_key`
+
+Manages the GPG keys that Apt uses to authenticate packages.
+
+**Note:** In most cases, we recommend using the `apt::key` defined type. It makes use of the `apt_key` type, but includes extra functionality to help prevent duplicate keys.
+
+##### Parameters (all optional)
+
+* `content`: Supplies the entire GPG key. Useful in case the key can't be fetched from a remote location and using a file resource is inconvenient. Cannot be used in combination with `source`. Valid options: a string. Default: undef.
+
+* `options`: Passes additional options to `apt-key adv --keyserver-options`. Valid options: a string. Default: undef.
+
+* `server`: Specifies a keyserver to provide Puppet's GPG key. Valid options: a string containing a domain name or a full URL. Default: 'keyserver.ubuntu.com'.
+
+* `source`: Specifies the location of an existing GPG key file to copy. Cannot be used in combination with `content`. Valid options: a string containing a URL (ftp://, http://, or https://) or an absolute path. Default: undef.
+
+## Limitations
+
+This module is tested and officially supported on Debian 6 and 7 and Ubuntu 10.04, 12.04, and 14.04. Testing on other platforms has been light and cannot be guaranteed.
+
+This module is not designed to be split across [run stages](https://docs.puppetlabs.com/puppet/latest/reference/lang_run_stages.html).
+
+### Adding new sources or PPAs
+
+If you are adding a new source or PPA and trying to install packages from the new source or PPA on the same Puppet run, your `package` resource should depend on `Class['apt::update']`, in addition to depending on the `Apt::Source` or the `Apt::Ppa`. You can also add [collectors](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html) to ensure that all packages happen after `apt::update`, but this can lead to dependency cycles and has implications for [virtual resources](https://docs.puppetlabs.com/puppet/latest/reference/lang_collectors.html#behavior).
+
+```puppet
+Class['apt::update'] -> Package <| provider == 'apt' |>
+```
+
+## Development
+Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
+
+To see who's already involved, see the [list of contributors.](https://github.com/puppetlabs/puppetlabs-apt/graphs/contributors)
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000000..7e9a13d5df
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,42 @@
+require 'puppet_blacksmith/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+require 'puppetlabs_spec_helper/rake_tasks'
+
+PuppetLint.configuration.fail_on_warnings = true
+PuppetLint.configuration.send('relative')
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+desc 'Generate pooler nodesets'
+task :gen_nodeset do
+ require 'beaker-hostgenerator'
+ require 'securerandom'
+ require 'fileutils'
+
+ agent_target = ENV['TEST_TARGET']
+ if ! agent_target
+ STDERR.puts 'TEST_TARGET environment variable is not set'
+ STDERR.puts 'setting to default value of "redhat-64default."'
+ agent_target = 'redhat-64default.'
+ end
+
+ master_target = ENV['MASTER_TEST_TARGET']
+ if ! master_target
+ STDERR.puts 'MASTER_TEST_TARGET environment variable is not set'
+ STDERR.puts 'setting to default value of "redhat7-64mdcl"'
+ master_target = 'redhat7-64mdcl'
+ end
+
+ targets = "#{master_target}-#{agent_target}"
+ cli = BeakerHostGenerator::CLI.new([targets])
+ nodeset_dir = "tmp/nodesets"
+ nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml"
+ FileUtils.mkdir_p(nodeset_dir)
+ File.open(nodeset, 'w') do |fh|
+ fh.print(cli.execute)
+ end
+ puts nodeset
+end
diff --git a/examples/backports.pp b/examples/backports.pp
new file mode 100644
index 0000000000..0dfe084850
--- /dev/null
+++ b/examples/backports.pp
@@ -0,0 +1,11 @@
+# Set up a backport for linuxmint qiana
+class { 'apt': }
+apt::backports { 'qiana':
+ location => 'http://us.archive.ubuntu.com/ubuntu',
+ release => 'trusty-backports',
+ repos => 'main universe multiverse restricted',
+ key => {
+ id => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ server => 'pgp.mit.edu',
+ },
+}
diff --git a/examples/builddep.pp b/examples/builddep.pp
new file mode 100644
index 0000000000..deaaef8c8f
--- /dev/null
+++ b/examples/builddep.pp
@@ -0,0 +1,3 @@
+package{ 'glusterfs-server':
+ install_options => 'build-dep',
+}
diff --git a/examples/debian_testing.pp b/examples/debian_testing.pp
new file mode 100644
index 0000000000..3ed98f21f1
--- /dev/null
+++ b/examples/debian_testing.pp
@@ -0,0 +1,18 @@
+package { 'debian-keyring':
+ ensure => present
+}
+
+package { 'debian-archive-keyring':
+ ensure => present
+}
+
+apt::source { 'debian_testing':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'testing',
+ repos => 'main contrib non-free',
+ pin => '-10',
+ key => {
+ id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ server => 'subkeys.pgp.net',
+ },
+}
diff --git a/examples/debian_unstable.pp b/examples/debian_unstable.pp
new file mode 100644
index 0000000000..b1492cd538
--- /dev/null
+++ b/examples/debian_unstable.pp
@@ -0,0 +1,18 @@
+package { 'debian-keyring':
+ ensure => present
+}
+
+package { 'debian-archive-keyring':
+ ensure => present
+}
+
+apt::source { 'debian_unstable':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'unstable',
+ repos => 'main contrib non-free',
+ pin => '-10',
+ key => {
+ id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ server => 'subkeys.pgp.net',
+ },
+}
diff --git a/examples/disable_keys.pp b/examples/disable_keys.pp
new file mode 100644
index 0000000000..50d0ea8022
--- /dev/null
+++ b/examples/disable_keys.pp
@@ -0,0 +1,5 @@
+#Note: This is generally a bad idea. You should not disable verifying repository signatures.
+apt::conf { 'unauth':
+ priority => 99,
+ content => 'APT::Get::AllowUnauthenticated 1;'
+}
diff --git a/examples/fancy_progress.pp b/examples/fancy_progress.pp
new file mode 100644
index 0000000000..db78441b6b
--- /dev/null
+++ b/examples/fancy_progress.pp
@@ -0,0 +1,4 @@
+apt::conf { 'progressbar':
+ priority => 99,
+ content => 'Dpkg::Progress-Fancy "1";',
+}
diff --git a/examples/force.pp b/examples/force.pp
new file mode 100644
index 0000000000..4cfaa96fd9
--- /dev/null
+++ b/examples/force.pp
@@ -0,0 +1,28 @@
+#if you need to specify a release
+$rel_string = '-t '
+#else
+$rel_string = ''
+
+#if you need to specify a version
+$ensure = ''
+#else
+$ensure = installed
+
+#if overwrite existing cfg files
+$config_files = '-o Dpkg::Options::="--force-confnew"'
+#elsif force use of old files
+$config_files = '-o Dpkg::Options::="--force-confold"'
+#elsif update only unchanged files
+$config_files = '-o Dpkg::Options::="--force-confdef"'
+#else
+$config_files = ''
+
+#if install missing configuration files for the package
+$config_missing = '-o Dpkg::Options::="--force-confmiss"'
+#else
+$config_missing = ''
+
+package { '':
+ ensure => $ensure,
+ install_options => "${config_files} ${config_missing} ${rel_string}",
+}
diff --git a/examples/hold.pp b/examples/hold.pp
new file mode 100644
index 0000000000..00f760c4e0
--- /dev/null
+++ b/examples/hold.pp
@@ -0,0 +1,5 @@
+apt::pin { 'hold-vim':
+ packages => 'vim',
+ version => '2:7.4.488-5',
+ priority => 1001,
+}
diff --git a/examples/key.pp b/examples/key.pp
new file mode 100644
index 0000000000..cc8681fbf8
--- /dev/null
+++ b/examples/key.pp
@@ -0,0 +1,6 @@
+# Declare Apt key for apt.puppetlabs.com source
+apt::key { 'puppetlabs':
+ id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ server => 'pgp.mit.edu',
+ options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
+}
diff --git a/examples/pin.pp b/examples/pin.pp
new file mode 100644
index 0000000000..6a9024c234
--- /dev/null
+++ b/examples/pin.pp
@@ -0,0 +1,5 @@
+# pin a release in apt, useful for unstable repositories
+apt::pin { 'foo':
+ packages => '*',
+ priority => 0,
+}
diff --git a/examples/ppa.pp b/examples/ppa.pp
new file mode 100644
index 0000000000..e728f6f10f
--- /dev/null
+++ b/examples/ppa.pp
@@ -0,0 +1,4 @@
+class { 'apt': }
+
+# Example declaration of an Apt PPA
+apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': }
diff --git a/examples/release.pp b/examples/release.pp
new file mode 100644
index 0000000000..46d6893b0d
--- /dev/null
+++ b/examples/release.pp
@@ -0,0 +1,4 @@
+apt::conf { 'release':
+ content => 'APT::Default-Release "karmic";',
+ priority => '01',
+}
diff --git a/examples/source.pp b/examples/source.pp
new file mode 100644
index 0000000000..33dc2a1938
--- /dev/null
+++ b/examples/source.pp
@@ -0,0 +1,35 @@
+# Declare the apt class to manage /etc/apt/sources.list and /etc/sources.list.d
+class { 'apt': }
+
+# Install the puppetlabs apt source
+# Release is automatically obtained from lsbdistcodename fact if available.
+apt::source { 'puppetlabs':
+ location => 'http://apt.puppetlabs.com',
+ repos => 'main',
+ key => {
+ id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ server => 'pgp.mit.edu',
+ },
+}
+
+# test two sources with the same key
+apt::source { 'debian_testing':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'testing',
+ repos => 'main contrib non-free',
+ key => {
+ id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ server => 'subkeys.pgp.net',
+ },
+ pin => '-10',
+}
+apt::source { 'debian_unstable':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'unstable',
+ repos => 'main contrib non-free',
+ key => {
+ id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ server => 'subkeys.pgp.net',
+ },
+ pin => '-10',
+}
diff --git a/examples/unattended_upgrades.pp b/examples/unattended_upgrades.pp
new file mode 100644
index 0000000000..464090415c
--- /dev/null
+++ b/examples/unattended_upgrades.pp
@@ -0,0 +1 @@
+# TODO
diff --git a/lib/facter/apt_reboot_required.rb b/lib/facter/apt_reboot_required.rb
new file mode 100644
index 0000000000..8de904af2c
--- /dev/null
+++ b/lib/facter/apt_reboot_required.rb
@@ -0,0 +1,7 @@
+# apt_reboot_required.rb
+Facter.add(:apt_reboot_required) do
+ confine :osfamily => 'Debian'
+ setcode do
+ File.file?('/var/run/reboot-required')
+ end
+end
diff --git a/lib/facter/apt_update_last_success.rb b/lib/facter/apt_update_last_success.rb
new file mode 100644
index 0000000000..21c33d5949
--- /dev/null
+++ b/lib/facter/apt_update_last_success.rb
@@ -0,0 +1,18 @@
+require 'facter'
+
+#This is derived from the file /var/lib/apt/periodic/update-success-stamp
+# This is generated upon a successful apt-get update run natively in ubuntu.
+# the Puppetlabs-apt module deploys this same functionality for other debian-ish OSes
+Facter.add('apt_update_last_success') do
+ confine :osfamily => 'Debian'
+ setcode do
+ if File.exists?('/var/lib/apt/periodic/update-success-stamp')
+ #get epoch time
+ lastsuccess = File.mtime('/var/lib/apt/periodic/update-success-stamp').to_i
+ lastsuccess
+ else
+ lastsuccess = -1
+ lastsuccess
+ end
+ end
+end
diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb
new file mode 100644
index 0000000000..014782eab2
--- /dev/null
+++ b/lib/facter/apt_updates.rb
@@ -0,0 +1,42 @@
+apt_package_updates = nil
+Facter.add("apt_has_updates") do
+ confine :osfamily => 'Debian'
+ if File.executable?("/usr/lib/update-notifier/apt-check")
+ apt_check_result = Facter::Util::Resolution.exec('/usr/lib/update-notifier/apt-check 2>&1')
+ if not apt_check_result.nil? and apt_check_result =~ /^\d+;\d+$/
+ apt_package_updates = apt_check_result.split(';')
+ end
+ end
+
+ setcode do
+ if not apt_package_updates.nil? and apt_package_updates.length == 2
+ apt_package_updates != ['0', '0']
+ end
+ end
+end
+
+Facter.add("apt_package_updates") do
+ confine :apt_has_updates => true
+ setcode do
+ packages = Facter::Util::Resolution.exec('/usr/lib/update-notifier/apt-check -p 2>&1').split("\n")
+ if Facter.version < '2.0.0'
+ packages.join(',')
+ else
+ packages
+ end
+ end
+end
+
+Facter.add("apt_updates") do
+ confine :apt_has_updates => true
+ setcode do
+ Integer(apt_package_updates[0])
+ end
+end
+
+Facter.add("apt_security_updates") do
+ confine :apt_has_updates => true
+ setcode do
+ Integer(apt_package_updates[1])
+ end
+end
diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
new file mode 100644
index 0000000000..a6d68b1732
--- /dev/null
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@ -0,0 +1,225 @@
+require 'open-uri'
+require 'net/ftp'
+require 'tempfile'
+
+if RUBY_VERSION == '1.8.7'
+ # Mothers cry, puppies die and Ruby 1.8.7's open-uri needs to be
+ # monkeypatched to support passing in :ftp_passive_mode.
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
+ 'puppet_x', 'apt_key', 'patch_openuri.rb'))
+ OpenURI::Options.merge!({:ftp_active_mode => false,})
+end
+
+Puppet::Type.type(:apt_key).provide(:apt_key) do
+
+ confine :osfamily => :debian
+ defaultfor :osfamily => :debian
+ commands :apt_key => 'apt-key'
+ commands :gpg => '/usr/bin/gpg'
+
+ def self.instances
+ cli_args = ['adv','--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode']
+
+ if RUBY_VERSION > '1.8.7'
+ key_output = apt_key(cli_args).encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '')
+ else
+ key_output = apt_key(cli_args)
+ end
+
+ pub_line, fpr_line = nil
+
+ key_array = key_output.split("\n").collect do |line|
+ if line.start_with?('pub')
+ pub_line = line
+ elsif line.start_with?('fpr')
+ fpr_line = line
+ end
+
+ next unless (pub_line and fpr_line)
+
+ line_hash = key_line_hash(pub_line, fpr_line)
+
+ # reset everything
+ pub_line, fpr_line = nil
+
+ expired = false
+
+ if line_hash[:key_expiry]
+ expired = Time.now >= line_hash[:key_expiry]
+ end
+
+ new(
+ :name => line_hash[:key_fingerprint],
+ :id => line_hash[:key_long],
+ :fingerprint => line_hash[:key_fingerprint],
+ :short => line_hash[:key_short],
+ :long => line_hash[:key_long],
+ :ensure => :present,
+ :expired => expired,
+ :expiry => line_hash[:key_expiry].nil? ? nil : line_hash[:key_expiry].strftime("%Y-%m-%d"),
+ :size => line_hash[:key_size],
+ :type => line_hash[:key_type],
+ :created => line_hash[:key_created].strftime("%Y-%m-%d")
+ )
+ end
+ key_array.compact!
+ end
+
+ def self.prefetch(resources)
+ apt_keys = instances
+ resources.keys.each do |name|
+ if name.length == 40
+ if provider = apt_keys.find{ |key| key.fingerprint == name }
+ resources[name].provider = provider
+ end
+ elsif name.length == 16
+ if provider = apt_keys.find{ |key| key.long == name }
+ resources[name].provider = provider
+ end
+ elsif name.length == 8
+ if provider = apt_keys.find{ |key| key.short == name }
+ resources[name].provider = provider
+ end
+ end
+ end
+ end
+
+ def self.key_line_hash(pub_line, fpr_line)
+ pub_split = pub_line.split(':')
+ fpr_split = fpr_line.split(':')
+
+ fingerprint = fpr_split.last
+ return_hash = {
+ :key_fingerprint => fingerprint,
+ :key_long => fingerprint[-16..-1], # last 16 characters of fingerprint
+ :key_short => fingerprint[-8..-1], # last 8 characters of fingerprint
+ :key_size => pub_split[2],
+ :key_type => nil,
+ :key_created => Time.at(pub_split[5].to_i),
+ :key_expiry => pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i),
+ }
+
+ # set key type based on types defined in /usr/share/doc/gnupg/DETAILS.gz
+ case pub_split[3]
+ when "1"
+ return_hash[:key_type] = :rsa
+ when "17"
+ return_hash[:key_type] = :dsa
+ when "18"
+ return_hash[:key_type] = :ecc
+ when "19"
+ return_hash[:key_type] = :ecdsa
+ end
+
+ return return_hash
+ end
+
+ def source_to_file(value)
+ parsedValue = URI::parse(value)
+ if parsedValue.scheme.nil?
+ fail("The file #{value} does not exist") unless File.exists?(value)
+ # Because the tempfile method has to return a live object to prevent GC
+ # of the underlying file from occuring too early, we also have to return
+ # a file object here. The caller can still call the #path method on the
+ # closed file handle to get the path.
+ f = File.open(value, 'r')
+ f.close
+ f
+ else
+ begin
+ key = parsedValue.read
+ rescue OpenURI::HTTPError, Net::FTPPermError => e
+ fail("#{e.message} for #{resource[:source]}")
+ rescue SocketError
+ fail("could not resolve #{resource[:source]}")
+ else
+ tempfile(key)
+ end
+ end
+ end
+
+ # The tempfile method needs to return the tempfile object to the caller, so
+ # that it doesn't get deleted by the GC immediately after it returns. We
+ # want the caller to control when it goes out of scope.
+ def tempfile(content)
+ file = Tempfile.new('apt_key')
+ file.write content
+ file.close
+ #confirm that the fingerprint from the file, matches the long key that is in the manifest
+ if name.size == 40
+ if File.executable? command(:gpg)
+ extracted_key = execute(["#{command(:gpg)} --with-fingerprint --with-colons #{file.path} | awk -F: '/^fpr:/ { print $10 }'"], :failonfail => false)
+ extracted_key = extracted_key.chomp
+
+ found_match = false
+ extracted_key.each_line do |line|
+ if line.chomp == name
+ found_match = true
+ end
+ end
+ if not found_match
+ fail("The id in your manifest #{resource[:name]} and the fingerprint from content/source do not match. Please check there is not an error in the id or check the content/source is legitimate.")
+ end
+ else
+ warning('/usr/bin/gpg cannot be found for verification of the id.')
+ end
+ end
+ file
+ end
+
+ def exists?
+ @property_hash[:ensure] == :present
+ end
+
+ def create
+ command = []
+ if resource[:source].nil? and resource[:content].nil?
+ # Breaking up the command like this is needed because it blows up
+ # if --recv-keys isn't the last argument.
+ command.push('adv', '--keyserver', resource[:server])
+ unless resource[:options].nil?
+ command.push('--keyserver-options', resource[:options])
+ end
+ command.push('--recv-keys', resource[:id])
+ elsif resource[:content]
+ key_file = tempfile(resource[:content])
+ command.push('add', key_file.path)
+ elsif resource[:source]
+ key_file = source_to_file(resource[:source])
+ command.push('add', key_file.path)
+ # In case we really screwed up, better safe than sorry.
+ else
+ fail("an unexpected condition occurred while trying to add the key: #{resource[:id]}")
+ end
+ apt_key(command)
+ @property_hash[:ensure] = :present
+ end
+
+ def destroy
+ begin
+ apt_key('del', resource.provider.short)
+ r = execute(["#{command(:apt_key)} list | grep '/#{resource.provider.short}\s'"], :failonfail => false)
+ end while r.exitstatus == 0
+ @property_hash.clear
+ end
+
+ def read_only(value)
+ fail('This is a read-only property.')
+ end
+
+ mk_resource_methods
+
+ # Needed until PUP-1470 is fixed and we can drop support for Puppet versions
+ # before that.
+ def expired
+ @property_hash[:expired]
+ end
+
+ # Alias the setters of read-only properties
+ # to the read_only function.
+ alias :created= :read_only
+ alias :expired= :read_only
+ alias :expiry= :read_only
+ alias :size= :read_only
+ alias :type= :read_only
+end
diff --git a/lib/puppet/type/apt_key.rb b/lib/puppet/type/apt_key.rb
new file mode 100644
index 0000000000..81b66a2638
--- /dev/null
+++ b/lib/puppet/type/apt_key.rb
@@ -0,0 +1,135 @@
+require 'pathname'
+
+Puppet::Type.newtype(:apt_key) do
+
+ @doc = <<-EOS
+ This type provides Puppet with the capabilities to manage GPG keys needed
+ by apt to perform package validation. Apt has it's own GPG keyring that can
+ be manipulated through the `apt-key` command.
+
+ apt_key { '4BD6EC30':
+ source => 'http://apt.puppetlabs.com/pubkey.gpg'
+ }
+
+ **Autorequires**:
+
+ If Puppet is given the location of a key file which looks like an absolute
+ path this type will autorequire that file.
+ EOS
+
+ ensurable
+
+ validate do
+ if self[:content] and self[:source]
+ fail('The properties content and source are mutually exclusive.')
+ end
+ if self[:id].length < 40
+ warning('The id should be a full fingerprint (40 characters), see README.')
+ end
+ end
+
+ newparam(:id, :namevar => true) do
+ desc 'The ID of the key you want to manage.'
+ # GPG key ID's should be either 32-bit (short) or 64-bit (long) key ID's
+ # and may start with the optional 0x, or they can be 40-digit key fingerprints
+ newvalues(/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/)
+ munge do |value|
+ if value.start_with?('0x')
+ id = value.partition('0x').last.upcase
+ else
+ id = value.upcase
+ end
+ id
+ end
+ end
+
+ newparam(:content) do
+ desc 'The content of, or string representing, a GPG key.'
+ end
+
+ newparam(:source) do
+ desc 'Location of a GPG key file, /path/to/file, ftp://, http:// or https://'
+ newvalues(/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/)
+ end
+
+ autorequire(:file) do
+ if self[:source] and Pathname.new(self[:source]).absolute?
+ self[:source]
+ end
+ end
+
+ newparam(:server) do
+ desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.'
+ defaultto :'keyserver.ubuntu.com'
+
+ newvalues(/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/)
+ end
+
+ newparam(:options) do
+ desc 'Additional options to pass to apt-key\'s --keyserver-options.'
+ end
+
+ newproperty(:fingerprint) do
+ desc <<-EOS
+ The 40-digit hexadecimal fingerprint of the specified GPG key.
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:long) do
+ desc <<-EOS
+ The 16-digit hexadecimal id of the specified GPG key.
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:short) do
+ desc <<-EOS
+ The 8-digit hexadecimal id of the specified GPG key.
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:expired) do
+ desc <<-EOS
+ Indicates if the key has expired.
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:expiry) do
+ desc <<-EOS
+ The date the key will expire, or nil if it has no expiry date.
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:size) do
+ desc <<-EOS
+ The key size, usually a multiple of 1024.
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:type) do
+ desc <<-EOS
+ The key type, one of: rsa, dsa, ecc, ecdsa
+
+ This property is read-only.
+ EOS
+ end
+
+ newproperty(:created) do
+ desc <<-EOS
+ Date the key was created.
+
+ This property is read-only.
+ EOS
+ end
+end
diff --git a/lib/puppet_x/apt_key/patch_openuri.rb b/lib/puppet_x/apt_key/patch_openuri.rb
new file mode 100644
index 0000000000..722c7bdeba
--- /dev/null
+++ b/lib/puppet_x/apt_key/patch_openuri.rb
@@ -0,0 +1,63 @@
+require 'uri'
+require 'stringio'
+require 'time'
+
+module URI
+ class FTP
+ def buffer_open(buf, proxy, options) # :nodoc:
+ if proxy
+ OpenURI.open_http(buf, self, proxy, options)
+ return
+ end
+ require 'net/ftp'
+
+ directories = self.path.split(%r{/}, -1)
+ directories.shift if directories[0] == '' # strip a field before leading slash
+ directories.each {|d|
+ d.gsub!(/%([0-9A-Fa-f][0-9A-Fa-f])/) { [$1].pack("H2") }
+ }
+ unless filename = directories.pop
+ raise ArgumentError, "no filename: #{self.inspect}"
+ end
+ directories.each {|d|
+ if /[\r\n]/ =~ d
+ raise ArgumentError, "invalid directory: #{d.inspect}"
+ end
+ }
+ if /[\r\n]/ =~ filename
+ raise ArgumentError, "invalid filename: #{filename.inspect}"
+ end
+ typecode = self.typecode
+ if typecode && /\A[aid]\z/ !~ typecode
+ raise ArgumentError, "invalid typecode: #{typecode.inspect}"
+ end
+
+ # The access sequence is defined by RFC 1738
+ ftp = Net::FTP.open(self.host)
+ ftp.passive = true if !options[:ftp_active_mode]
+ # todo: extract user/passwd from .netrc.
+ user = 'anonymous'
+ passwd = nil
+ user, passwd = self.userinfo.split(/:/) if self.userinfo
+ ftp.login(user, passwd)
+ directories.each {|cwd|
+ ftp.voidcmd("CWD #{cwd}")
+ }
+ if typecode
+ # xxx: typecode D is not handled.
+ ftp.voidcmd("TYPE #{typecode.upcase}")
+ end
+ if options[:content_length_proc]
+ options[:content_length_proc].call(ftp.size(filename))
+ end
+ ftp.retrbinary("RETR #{filename}", 4096) { |str|
+ buf << str
+ options[:progress_proc].call(buf.size) if options[:progress_proc]
+ }
+ ftp.close
+ buf.io.rewind
+ end
+
+ include OpenURI::OpenRead
+ end
+end
diff --git a/manifests/backports.pp b/manifests/backports.pp
new file mode 100644
index 0000000000..f7e85f59ed
--- /dev/null
+++ b/manifests/backports.pp
@@ -0,0 +1,65 @@
+class apt::backports (
+ $location = undef,
+ $release = undef,
+ $repos = undef,
+ $key = undef,
+ $pin = 200,
+){
+ if $location {
+ validate_string($location)
+ $_location = $location
+ }
+ if $release {
+ validate_string($release)
+ $_release = $release
+ }
+ if $repos {
+ validate_string($repos)
+ $_repos = $repos
+ }
+ if $key {
+ unless is_hash($key) {
+ validate_string($key)
+ }
+ $_key = $key
+ }
+ if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
+ unless $location {
+ $_location = $::apt::backports['location']
+ }
+ unless $release {
+ $_release = "${::apt::xfacts['lsbdistcodename']}-backports"
+ }
+ unless $repos {
+ $_repos = $::apt::backports['repos']
+ }
+ unless $key {
+ $_key = $::apt::backports['key']
+ }
+ } else {
+ unless $location and $release and $repos and $key {
+ fail('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')
+ }
+ }
+
+ if is_hash($pin) {
+ $_pin = $pin
+ } elsif is_numeric($pin) or is_string($pin) {
+ # apt::source defaults to pinning to origin, but we should pin to release
+ # for backports
+ $_pin = {
+ 'priority' => $pin,
+ 'release' => $_release,
+ }
+ } else {
+ fail('pin must be either a string, number or hash')
+ }
+
+ apt::source { 'backports':
+ location => $_location,
+ release => $_release,
+ repos => $_repos,
+ key => $_key,
+ pin => $_pin,
+ }
+}
diff --git a/manifests/conf.pp b/manifests/conf.pp
new file mode 100644
index 0000000000..97b70a1eeb
--- /dev/null
+++ b/manifests/conf.pp
@@ -0,0 +1,20 @@
+define apt::conf (
+ $content = undef,
+ $ensure = present,
+ $priority = '50',
+ $notify_update = undef,
+) {
+
+ unless $ensure == 'absent' {
+ unless $content {
+ fail('Need to pass in content parameter')
+ }
+ }
+
+ apt::setting { "conf-${name}":
+ ensure => $ensure,
+ priority => $priority,
+ content => template('apt/_conf_header.erb', 'apt/conf.erb'),
+ notify_update => $notify_update,
+ }
+}
diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp
deleted file mode 100644
index 8f37bd567c..0000000000
--- a/manifests/debian/testing.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# testing.pp
-
-class apt::debian::testing {
-
- # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
- # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
- # Key: 55BE302B Server: subkeys.pgp.net
- # debian-keyring
- # debian-archive-keyring
-
- apt::source { "debian_testing":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "testing",
- repos => "main contrib non-free",
- required_packages => "debian-keyring debian-archive-keyring",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
- }
-
-}
diff --git a/manifests/debian/unstable.pp b/manifests/debian/unstable.pp
deleted file mode 100644
index d0dd1ce134..0000000000
--- a/manifests/debian/unstable.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# unstable.pp
-
-class apt::debian::unstable {
-
- # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
- # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
- # Key: 55BE302B Server: subkeys.pgp.net
- # debian-keyring
- # debian-archive-keyring
-
- apt::source { "debian_unstable":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "unstable",
- repos => "main contrib non-free",
- required_packages => "debian-keyring debian-archive-keyring",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
- }
-
-}
diff --git a/manifests/force.pp b/manifests/force.pp
deleted file mode 100644
index 564ed75ff4..0000000000
--- a/manifests/force.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# force.pp
-# force a package from a specific release
-
-define apt::force(
- $release = 'testing',
- $version = false
-) {
-
- exec { "/usr/bin/aptitude -y -t ${release} install ${name}":
- unless => $version ? {
- false => "/usr/bin/dpkg -l | grep ${name}",
- default => "/usr/bin/dpkg -l | grep ${name} | grep ${version}"
- }
- }
-
-}
diff --git a/manifests/init.pp b/manifests/init.pp
index 677523bcf2..2e82502622 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,29 +1,163 @@
-# apt.pp
-
-class apt {
- $root = '/etc/apt'
- $provider = '/usr/bin/apt-get'
-
- package { "python-software-properties": }
-
- file { "sources.list":
- name => "${root}/sources.list",
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- }
-
- file { "sources.list.d":
- name => "${root}/sources.list.d",
- ensure => directory,
- owner => root,
- group => root,
- }
-
- exec { "apt_update":
- command => "${provider} update",
- subscribe => [ File["sources.list"], File["sources.list.d"] ],
- refreshonly => true,
- }
+#
+class apt(
+ $update = {},
+ $purge = {},
+ $proxy = {},
+ $sources = {},
+ $keys = {},
+ $ppas = {},
+ $pins = {},
+ $settings = {},
+) inherits ::apt::params {
+
+ $frequency_options = ['always','daily','weekly','reluctantly']
+ validate_hash($update)
+ if $update['frequency'] {
+ validate_re($update['frequency'], $frequency_options)
+ }
+ if $update['timeout'] {
+ unless is_integer($update['timeout']) {
+ fail('timeout value for update must be an integer')
+ }
+ }
+ if $update['tries'] {
+ unless is_integer($update['tries']) {
+ fail('tries value for update must be an integer')
+ }
+ }
+
+ $_update = merge($::apt::update_defaults, $update)
+ include ::apt::update
+
+ validate_hash($purge)
+ if $purge['sources.list'] {
+ validate_bool($purge['sources.list'])
+ }
+ if $purge['sources.list.d'] {
+ validate_bool($purge['sources.list.d'])
+ }
+ if $purge['preferences'] {
+ validate_bool($purge['preferences'])
+ }
+ if $purge['preferences.d'] {
+ validate_bool($purge['preferences.d'])
+ }
+
+ $_purge = merge($::apt::purge_defaults, $purge)
+
+ validate_hash($proxy)
+ if $proxy['ensure'] {
+ validate_re($proxy['ensure'], ['file', 'present', 'absent'])
+ }
+ if $proxy['host'] {
+ validate_string($proxy['host'])
+ }
+ if $proxy['port'] {
+ unless is_integer($proxy['port']) {
+ fail('$proxy port must be an integer')
+ }
+ }
+ if $proxy['https'] {
+ validate_bool($proxy['https'])
+ }
+
+ $_proxy = merge($apt::proxy_defaults, $proxy)
+
+ validate_hash($sources)
+ validate_hash($keys)
+ validate_hash($settings)
+ validate_hash($ppas)
+ validate_hash($pins)
+
+ if $_proxy['ensure'] == 'absent' or $_proxy['host'] {
+ apt::setting { 'conf-proxy':
+ ensure => $_proxy['ensure'],
+ priority => '01',
+ content => template('apt/_conf_header.erb', 'apt/proxy.erb'),
+ }
+ }
+
+ $sources_list_content = $_purge['sources.list'] ? {
+ true => "# Repos managed by puppet.\n",
+ default => undef,
+ }
+
+ $preferences_ensure = $_purge['preferences'] ? {
+ true => absent,
+ default => file,
+ }
+
+ if $_update['frequency'] == 'always' {
+ Exec <| title=='apt_update' |> {
+ refreshonly => false,
+ }
+ }
+
+ apt::setting { 'conf-update-stamp':
+ priority => 15,
+ content => template('apt/_conf_header.erb', 'apt/15update-stamp.erb'),
+ }
+
+ file { 'sources.list':
+ ensure => file,
+ path => $::apt::sources_list,
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => $sources_list_content,
+ notify => Class['apt::update'],
+ }
+
+ file { 'sources.list.d':
+ ensure => directory,
+ path => $::apt::sources_list_d,
+ owner => root,
+ group => root,
+ mode => '0644',
+ purge => $_purge['sources.list.d'],
+ recurse => $_purge['sources.list.d'],
+ notify => Class['apt::update'],
+ }
+
+ file { 'preferences':
+ ensure => $preferences_ensure,
+ path => $::apt::preferences,
+ owner => root,
+ group => root,
+ mode => '0644',
+ notify => Class['apt::update'],
+ }
+
+ file { 'preferences.d':
+ ensure => directory,
+ path => $::apt::preferences_d,
+ owner => root,
+ group => root,
+ mode => '0644',
+ purge => $_purge['preferences.d'],
+ recurse => $_purge['preferences.d'],
+ notify => Class['apt::update'],
+ }
+
+ # manage sources if present
+ if $sources {
+ create_resources('apt::source', $sources)
+ }
+ # manage keys if present
+ if $keys {
+ create_resources('apt::key', $keys)
+ }
+ # manage ppas if present
+ if $ppas {
+ create_resources('apt::ppa', $ppas)
+ }
+ # manage settings if present
+ if $settings {
+ create_resources('apt::setting', $settings)
+ }
+
+ # manage pins if present
+ if $pins {
+ create_resources('apt::pin', $pins)
+ }
}
diff --git a/manifests/key.pp b/manifests/key.pp
new file mode 100644
index 0000000000..8fbb47abd0
--- /dev/null
+++ b/manifests/key.pp
@@ -0,0 +1,111 @@
+# == Define: apt::key
+define apt::key (
+ $id = $title,
+ $ensure = present,
+ $content = undef,
+ $source = undef,
+ $server = $::apt::keyserver,
+ $options = undef,
+ $key = undef,
+ $key_content = undef,
+ $key_source = undef,
+ $key_server = undef,
+ $key_options = undef,
+) {
+
+ if $key != undef {
+ warning('$key is deprecated and will be removed in the next major release. Please use $id instead.')
+ $_id = $key
+ } else {
+ $_id = $id
+ }
+
+ if $key_content != undef {
+ warning('$key_content is deprecated and will be removed in the next major release. Please use $content instead.')
+ $_content = $key_content
+ } else {
+ $_content = $content
+ }
+
+ if $key_source != undef {
+ warning('$key_source is deprecated and will be removed in the next major release. Please use $source instead.')
+ $_source = $key_source
+ } else {
+ $_source = $source
+ }
+
+ if $key_server != undef {
+ warning('$key_server is deprecated and will be removed in the next major release. Please use $server instead.')
+ $_server = $key_server
+ } else {
+ $_server = $server
+ }
+
+ if $key_options != undef {
+ warning('$key_options is deprecated and will be removed in the next major release. Please use $options instead.')
+ $_options = $key_options
+ } else {
+ $_options = $options
+ }
+
+ validate_re($_id, ['\A(0x)?[0-9a-fA-F]{8}\Z', '\A(0x)?[0-9a-fA-F]{16}\Z', '\A(0x)?[0-9a-fA-F]{40}\Z'])
+ validate_re($ensure, ['\Aabsent|present\Z',])
+
+ if $_content {
+ validate_string($_content)
+ }
+
+ if $_source {
+ validate_re($_source, ['\Ahttps?:\/\/', '\Aftp:\/\/', '\A\/\w+'])
+ }
+
+ if $_server {
+ validate_re($_server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$'])
+ }
+
+ if $_options {
+ validate_string($_options)
+ }
+
+ case $ensure {
+ present: {
+ if defined(Anchor["apt_key ${_id} absent"]){
+ fail("key with id ${_id} already ensured as absent")
+ }
+
+ if !defined(Anchor["apt_key ${_id} present"]) {
+ apt_key { $title:
+ ensure => $ensure,
+ id => $_id,
+ source => $_source,
+ content => $_content,
+ server => $_server,
+ options => $_options,
+ } ->
+ anchor { "apt_key ${_id} present": }
+ }
+ }
+
+ absent: {
+ if defined(Anchor["apt_key ${_id} present"]){
+ fail("key with id ${_id} already ensured as present")
+ }
+
+ if !defined(Anchor["apt_key ${_id} absent"]){
+ apt_key { $title:
+ ensure => $ensure,
+ id => $_id,
+ source => $_source,
+ content => $_content,
+ server => $_server,
+ options => $_options,
+ } ->
+ anchor { "apt_key ${_id} absent": }
+ }
+ }
+
+ default: {
+ fail "Invalid 'ensure' value '${ensure}' for apt::key"
+ }
+ }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
new file mode 100644
index 0000000000..a8f014b8f3
--- /dev/null
+++ b/manifests/params.pp
@@ -0,0 +1,162 @@
+class apt::params {
+
+ if $::osfamily != 'Debian' {
+ fail('This module only works on Debian or derivatives like Ubuntu')
+ }
+
+ # prior to puppet 3.5.0, defined couldn't test if a variable was defined
+ # strict variables wasn't added until 3.5.0, so this should be fine.
+ if ! $::settings::strict_variables {
+ $xfacts = {
+ 'lsbdistcodename' => $::lsbdistcodename,
+ 'lsbdistrelease' => $::lsbdistrelease,
+ 'lsbmajdistrelease' => $::lsbmajdistrelease,
+ 'lsbdistdescription' => $::lsbdistdescription,
+ 'lsbminordistrelease' => $::lsbminordistrelease,
+ 'lsbdistid' => $::lsbdistid,
+ }
+ } else {
+ # Strict variables facts lookup compatibility
+ $xfacts = {
+ 'lsbdistcodename' => defined('$lsbdistcodename') ? {
+ true => $::lsbdistcodename,
+ default => undef,
+ },
+ 'lsbdistrelease' => defined('$lsbdistrelease') ? {
+ true => $::lsbdistrelease,
+ default => undef,
+ },
+ 'lsbmajdistrelease' => defined('$lsbmajdistrelease') ? {
+ true => $::lsbmajdistrelease,
+ default => undef,
+ },
+ 'lsbdistdescription' => defined('$lsbdistdescription') ? {
+ true => $::lsbdistdescription,
+ default => undef,
+ },
+ 'lsbminordistrelease' => defined('$lsbminordistrelease') ? {
+ true => $::lsbminordistrelease,
+ default => undef,
+ },
+ 'lsbdistid' => defined('$lsbdistid') ? {
+ true => $::lsbdistid,
+ default => undef,
+ },
+ }
+ }
+
+ $root = '/etc/apt'
+ $provider = '/usr/bin/apt-get'
+ $sources_list = "${root}/sources.list"
+ $sources_list_d = "${root}/sources.list.d"
+ $conf_d = "${root}/apt.conf.d"
+ $preferences = "${root}/preferences"
+ $preferences_d = "${root}/preferences.d"
+ $keyserver = 'keyserver.ubuntu.com'
+
+ $config_files = {
+ 'conf' => {
+ 'path' => $conf_d,
+ 'ext' => '',
+ },
+ 'pref' => {
+ 'path' => $preferences_d,
+ 'ext' => '.pref',
+ },
+ 'list' => {
+ 'path' => $sources_list_d,
+ 'ext' => '.list',
+ }
+ }
+
+ $update_defaults = {
+ 'frequency' => 'reluctantly',
+ 'timeout' => undef,
+ 'tries' => undef,
+ }
+
+ $proxy_defaults = {
+ 'ensure' => undef,
+ 'host' => undef,
+ 'port' => 8080,
+ 'https' => false,
+ }
+
+ $purge_defaults = {
+ 'sources.list' => false,
+ 'sources.list.d' => false,
+ 'preferences' => false,
+ 'preferences.d' => false,
+ }
+
+ $source_key_defaults = {
+ 'server' => $keyserver,
+ 'options' => undef,
+ 'content' => undef,
+ 'source' => undef,
+ }
+
+ $include_defaults = {
+ 'deb' => true,
+ 'src' => false,
+ }
+
+ case $xfacts['lsbdistid'] {
+ 'debian': {
+ case $xfacts['lsbdistcodename'] {
+ 'squeeze': {
+ $backports = {
+ 'location' => 'http://httpredir.debian.org/debian-backports',
+ 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ 'repos' => 'main contrib non-free',
+ }
+ }
+ default: {
+ $backports = {
+ 'location' => 'http://httpredir.debian.org/debian',
+ 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ 'repos' => 'main contrib non-free',
+ }
+ }
+ }
+
+ $ppa_options = undef
+ $ppa_package = undef
+
+ }
+ 'ubuntu': {
+ $backports = {
+ 'location' => 'http://archive.ubuntu.com/ubuntu',
+ 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ 'repos' => 'main universe multiverse restricted',
+ }
+
+ case $xfacts['lsbdistcodename'] {
+ 'lucid': {
+ $ppa_options = undef
+ $ppa_package = 'python-software-properties'
+ }
+ 'precise': {
+ $ppa_options = '-y'
+ $ppa_package = 'python-software-properties'
+ }
+ 'trusty', 'utopic', 'vivid', 'wily': {
+ $ppa_options = '-y'
+ $ppa_package = 'software-properties-common'
+ }
+ default: {
+ $ppa_options = '-y'
+ $ppa_package = 'python-software-properties'
+ }
+ }
+ }
+ undef: {
+ fail('Unable to determine lsbdistid, please install lsb-release first')
+ }
+ default: {
+ $ppa_options = undef
+ $ppa_package = undef
+ $backports = undef
+ }
+ }
+}
diff --git a/manifests/pin.pp b/manifests/pin.pp
index e8b251f7c8..cc896896d7 100644
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -2,19 +2,79 @@
# pin a release in apt, useful for unstable repositories
define apt::pin(
- $packages = '*',
- $priority = 0
+ $ensure = present,
+ $explanation = undef,
+ $order = undef,
+ $packages = '*',
+ $priority = 0,
+ $release = '', # a=
+ $origin = '',
+ $version = '',
+ $codename = '', # n=
+ $release_version = '', # v=
+ $component = '', # c=
+ $originator = '', # o=
+ $label = '' # l=
) {
+ if $order and !is_integer($order) {
+ fail('Only integers are allowed in the apt::pin order param')
+ }
- include apt
+ if $explanation {
+ $_explanation = $explanation
+ } else {
+ if defined('$caller_module_name') { # strict vars check
+ $_explanation = "${caller_module_name}: ${name}"
+ } else {
+ $_explanation = ": ${name}"
+ }
+ }
- file { "${name}.pref":
- name => "${apt::root}/preferences.d/${name}",
- ensure => file,
- owner => root,
- group => root,
- mode => 644,
- content => "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}",
- }
+ $pin_release_array = [
+ $release,
+ $codename,
+ $release_version,
+ $component,
+ $originator,
+ $label]
+ $pin_release = join($pin_release_array, '')
+ # Read the manpage 'apt_preferences(5)', especially the chapter
+ # 'The Effect of APT Preferences' to understand the following logic
+ # and the difference between specific and general form
+ if is_array($packages) {
+ $packages_string = join($packages, ' ')
+ } else {
+ $packages_string = $packages
+ }
+
+ if $packages_string != '*' { # specific form
+ if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
+ ( $version != '' and ( $pin_release != '' or $origin != '' )) {
+ fail('parameters release, origin, and version are mutually exclusive')
+ }
+ } else { # general form
+ if $version != '' {
+ fail('parameter version cannot be used in general form')
+ }
+ if ( $pin_release != '' and $origin != '' ) {
+ fail('parameters release and origin are mutually exclusive')
+ }
+ }
+
+ # According to man 5 apt_preferences:
+ # The files have either no or "pref" as filename extension
+ # and only contain alphanumeric, hyphen (-), underscore (_) and period
+ # (.) characters. Otherwise APT will print a notice that it has ignored a
+ # file, unless that file matches a pattern in the
+ # Dir::Ignore-Files-Silently configuration list - in which case it will
+ # be silently ignored.
+ $file_name = regsubst($title, '[^0-9a-z\-_\.]', '_', 'IG')
+
+ apt::setting { "pref-${file_name}":
+ ensure => $ensure,
+ priority => $order,
+ content => template('apt/_header.erb', 'apt/pin.pref.erb'),
+ notify_update => false,
+ }
}
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 9c277e9bd4..7069e2ed09 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,18 +1,72 @@
# ppa.pp
-
define apt::ppa(
-
+ $ensure = 'present',
+ $options = $::apt::ppa_options,
+ $release = $::apt::xfacts['lsbdistcodename'],
+ $package_name = $::apt::ppa_package,
+ $package_manage = false,
) {
- require apt
+ unless $release {
+ fail('lsbdistcodename fact not available: release parameter required')
+ }
+
+ if $::apt::xfacts['lsbdistid'] == 'Debian' {
+ fail('apt::ppa is not currently supported on Debian.')
+ }
+
+ $ubuntu_release_year = regsubst($::apt::xfacts['lsbdistrelease'], '\.\d+$', '', 'G') + 0
+ $ubuntu_release_month = regsubst($::apt::xfacts['lsbdistrelease'], '^\d+\.', '', 'G') + 0
+
+ if $ubuntu_release_year >= 15 and $ubuntu_release_month >= 10 {
+ $distid = downcase($::apt::xfacts['lsbdistid'])
+ $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}")
+ } else {
+ $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2-${release}")
+ }
+
+ $filename_no_slashes = regsubst($filename, '/', '-', 'G')
+ $filename_no_specialchars = regsubst($filename_no_slashes, '[\.\+]', '_', 'G')
+ $sources_list_d_filename = "${filename_no_specialchars}.list"
+
+ if $ensure == 'present' {
+ if $package_manage {
+ ensure_packages($package_name)
- exec { "apt-update-${name}":
- command => "/usr/bin/aptitude update",
- refreshonly => true,
+ $_require = [File['sources.list.d'], Package[$package_name]]
+ } else {
+ $_require = File['sources.list.d']
+ }
+
+ $_proxy = $::apt::_proxy
+ if $_proxy['host'] {
+ if $_proxy['https'] {
+ $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$_proxy['port']}"]
+ } else {
+ $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}"]
+ }
+ } else {
+ $_proxy_env = []
}
exec { "add-apt-repository-${name}":
- command => "/usr/bin/add-apt-repository ${name}",
- notify => Exec["apt-update-${name}"],
+ environment => $_proxy_env,
+ command => "/usr/bin/add-apt-repository ${options} ${name}",
+ unless => "/usr/bin/test -s ${::apt::sources_list_d}/${sources_list_d_filename}",
+ user => 'root',
+ logoutput => 'on_failure',
+ notify => Class['apt::update'],
+ require => $_require,
}
-}
+ file { "${::apt::sources_list_d}/${sources_list_d_filename}":
+ ensure => file,
+ require => Exec["add-apt-repository-${name}"],
+ }
+ }
+ else {
+ file { "${::apt::sources_list_d}/${sources_list_d_filename}":
+ ensure => 'absent',
+ notify => Class['apt::update'],
+ }
+ }
+}
diff --git a/manifests/release.pp b/manifests/release.pp
deleted file mode 100644
index cdd3da025d..0000000000
--- a/manifests/release.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# release.pp
-
-define apt::release (
-
-) {
- include apt
-
- file { "${apt::root}/apt.conf.d/01release":
- owner => root,
- group => root,
- mode => 644,
- content => "APT::Default-Release \"${name}\";"
- }
-}
diff --git a/manifests/setting.pp b/manifests/setting.pp
new file mode 100644
index 0000000000..b0fb62b1de
--- /dev/null
+++ b/manifests/setting.pp
@@ -0,0 +1,64 @@
+define apt::setting (
+ $priority = 50,
+ $ensure = file,
+ $source = undef,
+ $content = undef,
+ $notify_update = true,
+) {
+
+ include 'apt::params'
+ if $content and $source {
+ fail('apt::setting cannot have both content and source')
+ }
+
+ if !$content and !$source {
+ fail('apt::setting needs either of content or source')
+ }
+
+ validate_re($ensure, ['file', 'present', 'absent'])
+ validate_bool($notify_update)
+
+ $title_array = split($title, '-')
+ $setting_type = $title_array[0]
+ $base_name = join(delete_at($title_array, 0), '-')
+
+ validate_re($setting_type, ['\Aconf\z', '\Apref\z', '\Alist\z'], "apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
+
+ unless is_integer($priority) {
+ # need this to allow zero-padded priority.
+ validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer')
+ }
+
+ if $source {
+ validate_string($source)
+ }
+
+ if $content {
+ validate_string($content)
+ }
+
+ if ($setting_type == 'list') or ($setting_type == 'pref') {
+ $_priority = ''
+ } else {
+ $_priority = $priority
+ }
+
+ $_path = $::apt::params::config_files[$setting_type]['path']
+ $_ext = $::apt::params::config_files[$setting_type]['ext']
+
+ if $notify_update {
+ $_notify = Class['apt::update']
+ } else {
+ $_notify = undef
+ }
+
+ file { "${_path}/${_priority}${base_name}${_ext}":
+ ensure => $ensure,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ content => $content,
+ source => $source,
+ notify => $_notify,
+ }
+}
diff --git a/manifests/source.pp b/manifests/source.pp
index d6d93e4886..1307a3a552 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,50 +1,156 @@
# source.pp
# add an apt source
-
define apt::source(
- $location = '',
- $release = 'karmic',
- $repos = 'main',
- $include_src = true,
- $required_packages = false,
- $key = false,
- $key_server = 'keyserver.ubuntu.com',
- $pin = false
+ $location = undef,
+ $comment = $name,
+ $ensure = present,
+ $release = undef,
+ $repos = 'main',
+ $include = {},
+ $key = undef,
+ $pin = undef,
+ $architecture = undef,
+ $allow_unsigned = false,
+ $include_src = undef,
+ $include_deb = undef,
+ $required_packages = undef,
+ $key_server = undef,
+ $key_content = undef,
+ $key_source = undef,
+ $trusted_source = undef,
) {
+ validate_string($architecture, $comment, $location, $repos)
+ validate_bool($allow_unsigned)
+ validate_hash($include)
+
+ # This is needed for compat with 1.8.x
+ include ::apt
+
+ $_before = Apt::Setting["list-${title}"]
+
+ if $include_src != undef {
+ warning("\$include_src is deprecated and will be removed in the next major release, please use \$include => { 'src' => ${include_src} } instead")
+ }
+
+ if $include_deb != undef {
+ warning("\$include_deb is deprecated and will be removed in the next major release, please use \$include => { 'deb' => ${include_deb} } instead")
+ }
+
+ if $required_packages != undef {
+ warning('$required_packages is deprecated and will be removed in the next major release, please use package resources instead.')
+ exec { "Required packages: '${required_packages}' for ${name}":
+ command => "${::apt::params::provider} -y install ${required_packages}",
+ logoutput => 'on_failure',
+ refreshonly => true,
+ tries => 3,
+ try_sleep => 1,
+ before => $_before,
+ }
+ }
+
+ if $key_server != undef {
+ warning("\$key_server is deprecated and will be removed in the next major release, please use \$key => { 'server' => ${key_server} } instead.")
+ }
+
+ if $key_content != undef {
+ warning("\$key_content is deprecated and will be removed in the next major release, please use \$key => { 'content' => ${key_content} } instead.")
+ }
+
+ if $key_source != undef {
+ warning("\$key_source is deprecated and will be removed in the next major release, please use \$key => { 'source' => ${key_source} } instead.")
+ }
+
+ if $trusted_source != undef {
+ warning('$trusted_source is deprecated and will be removed in the next major release, please use $allow_unsigned instead.')
+ $_allow_unsigned = $trusted_source
+ } else {
+ $_allow_unsigned = $allow_unsigned
+ }
+
+ if ! $release {
+ $_release = $::apt::params::xfacts['lsbdistcodename']
+ unless $_release {
+ fail('lsbdistcodename fact not available: release parameter required')
+ }
+ } else {
+ $_release = $release
+ }
+
+ if $ensure == 'present' and ! $location {
+ fail('cannot create a source entry without specifying a location')
+ }
+
+ if $include_src != undef and $include_deb != undef {
+ $_deprecated_include = {
+ 'src' => $include_src,
+ 'deb' => $include_deb,
+ }
+ } elsif $include_src != undef {
+ $_deprecated_include = { 'src' => $include_src }
+ } elsif $include_deb != undef {
+ $_deprecated_include = { 'deb' => $include_deb }
+ } else {
+ $_deprecated_include = {}
+ }
+
+ $_include = merge($::apt::params::include_defaults, $_deprecated_include, $include)
+
+ $_deprecated_key = {
+ 'key_server' => $key_server,
+ 'key_content' => $key_content,
+ 'key_source' => $key_source,
+ }
+
+ if $key {
+ if is_hash($key) {
+ unless $key['id'] {
+ fail('key hash must contain at least an id entry')
+ }
+ $_key = merge($::apt::params::source_key_defaults, $_deprecated_key, $key)
+ } else {
+ validate_string($key)
+ $_key = merge( { 'id' => $key }, $_deprecated_key)
+ }
+ }
+
+ apt::setting { "list-${name}":
+ ensure => $ensure,
+ content => template('apt/_header.erb', 'apt/source.list.erb'),
+ }
- include apt
-
- file { "${name}.list":
- name => "${apt::root}/sources.list.d/${name}.list",
- ensure => file,
- owner => root,
- group => root,
- mode => 644,
- content => template("apt/source.list.erb"),
- }
-
- if $pin != false {
- apt::pin { "${release}": priority => "${pin}" }
- }
-
- exec { "${name} apt update":
- command => "${apt::provider} update",
- subscribe => File["${name}.list"],
- refreshonly => true,
- }
-
- if $required_packages != false {
- exec { "${apt::provider} -y install ${required_packages}":
- subscribe => File["${name}.list"],
- refreshonly => true,
- }
- }
-
- if $key != false {
- exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
- unless => "/usr/bin/apt-key list | grep ${key}",
- before => File["${name}.list"],
- }
- }
+ if $pin {
+ if is_hash($pin) {
+ $_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
+ } elsif (is_numeric($pin) or is_string($pin)) {
+ $url_split = split($location, '/')
+ $host = $url_split[2]
+ $_pin = {
+ 'ensure' => $ensure,
+ 'priority' => $pin,
+ 'before' => $_before,
+ 'origin' => $host,
+ }
+ } else {
+ fail('Received invalid value for pin parameter')
+ }
+ create_resources('apt::pin', { "${name}" => $_pin })
+ }
+ # We do not want to remove keys when the source is absent.
+ if $key and ($ensure == 'present') {
+ if is_hash($_key) {
+ apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
+ ensure => present,
+ id => $_key['id'],
+ server => $_key['server'],
+ content => $_key['content'],
+ source => $_key['source'],
+ options => $_key['options'],
+ key_server => $_key['key_server'],
+ key_content => $_key['key_content'],
+ key_source => $_key['key_source'],
+ before => $_before,
+ }
+ }
+ }
}
diff --git a/manifests/update.pp b/manifests/update.pp
new file mode 100644
index 0000000000..9b1f686709
--- /dev/null
+++ b/manifests/update.pp
@@ -0,0 +1,61 @@
+class apt::update {
+ #TODO: to catch if $::apt_update_last_success has the value of -1 here. If we
+ #opt to do this, a info/warn would likely be all you'd need likely to happen
+ #on the first run, but if it's not run in awhile something is likely borked
+ #with apt and we'd want to know about it.
+
+ case $::apt::_update['frequency'] {
+ 'always': {
+ $_kick_apt = true
+ }
+ 'daily': {
+ #compare current date with the apt_update_last_success fact to determine
+ #if we should kick apt_update.
+ $daily_threshold = (strftime('%s') - 86400)
+ if $::apt_update_last_success {
+ if $::apt_update_last_success < $daily_threshold {
+ $_kick_apt = true
+ } else {
+ $_kick_apt = false
+ }
+ } else {
+ #if apt-get update has not successfully run, we should kick apt_update
+ $_kick_apt = true
+ }
+ }
+ 'weekly':{
+ #compare current date with the apt_update_last_success fact to determine
+ #if we should kick apt_update.
+ $weekly_threshold = (strftime('%s') - 604800)
+ if $::apt_update_last_success {
+ if ( $::apt_update_last_success < $weekly_threshold ) {
+ $_kick_apt = true
+ } else {
+ $_kick_apt = false
+ }
+ } else {
+ #if apt-get update has not successfully run, we should kick apt_update
+ $_kick_apt = true
+ }
+ }
+ default: {
+ #catches 'reluctantly', and any other value (which should not occur).
+ #do nothing.
+ $_kick_apt = false
+ }
+ }
+
+ if $_kick_apt {
+ $_refresh = false
+ } else {
+ $_refresh = true
+ }
+ exec { 'apt_update':
+ command => "${::apt::provider} update",
+ logoutput => 'on_failure',
+ refreshonly => $_refresh,
+ timeout => $::apt::_update['timeout'],
+ tries => $::apt::_update['tries'],
+ try_sleep => 1
+ }
+}
diff --git a/metadata.json b/metadata.json
new file mode 100644
index 0000000000..168eb29cba
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,41 @@
+{
+ "name": "puppetlabs-apt",
+ "version": "2.2.2",
+ "author": "Puppet Labs",
+ "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
+ "license": "Apache-2.0",
+ "source": "https://github.com/puppetlabs/puppetlabs-apt",
+ "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
+ "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+ "dependencies": [
+ {"name":"puppetlabs/stdlib","version_requirement":">= 4.5.0 < 5.0.0"}
+ ],
+ "operatingsystem_support": [
+ {
+ "operatingsystem": "Debian",
+ "operatingsystemrelease": [
+ "6",
+ "7",
+ "8"
+ ]
+ },
+ {
+ "operatingsystem": "Ubuntu",
+ "operatingsystemrelease": [
+ "10.04",
+ "12.04",
+ "14.04"
+ ]
+ }
+ ],
+ "requirements": [
+ {
+ "name": "pe",
+ "version_requirement": ">= 3.3.0 < 2015.4.0"
+ },
+ {
+ "name": "puppet",
+ "version_requirement": ">= 3.0.0 < 5.0.0"
+ }
+ ]
+}
diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
new file mode 100644
index 0000000000..f1f232e7a9
--- /dev/null
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -0,0 +1,738 @@
+require 'spec_helper_acceptance'
+
+PUPPETLABS_GPG_KEY_SHORT_ID = '4BD6EC30'
+PUPPETLABS_GPG_KEY_LONG_ID = '1054B7A24BD6EC30'
+PUPPETLABS_GPG_KEY_FINGERPRINT = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+PUPPETLABS_APT_URL = 'apt.puppetlabs.com'
+PUPPETLABS_GPG_KEY_FILE = 'pubkey.gpg'
+CENTOS_GPG_KEY_SHORT_ID = 'C105B9DE'
+CENTOS_GPG_KEY_LONG_ID = '0946FCA2C105B9DE'
+CENTOS_GPG_KEY_FINGERPRINT = 'C1DAC52D1664E8A4386DBA430946FCA2C105B9DE'
+CENTOS_REPO_URL = 'ftp.cvut.cz/centos'
+CENTOS_GPG_KEY_FILE = 'RPM-GPG-KEY-CentOS-6'
+
+SHOULD_NEVER_EXIST_ID = '4BD6EC30'
+
+KEY_CHECK_COMMAND = "apt-key adv --list-keys --with-colons --fingerprint | grep "
+PUPPETLABS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{PUPPETLABS_GPG_KEY_FINGERPRINT}"
+CENTOS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{CENTOS_GPG_KEY_FINGERPRINT}"
+
+describe 'apt_key' do
+ before(:each) do
+ # Delete twice to make sure everything is cleaned
+ # up after the short key collision
+ shell("apt-key del #{PUPPETLABS_GPG_KEY_SHORT_ID}",
+ :acceptable_exit_codes => [0,1,2])
+ shell("apt-key del #{PUPPETLABS_GPG_KEY_SHORT_ID}",
+ :acceptable_exit_codes => [0,1,2])
+ end
+
+ describe 'default options' do
+ key_versions = {
+ '32bit key id' => '4BD6EC30',
+ '64bit key id' => '1054B7A24BD6EC30',
+ '160bit key fingerprint' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ '32bit lowercase key id' => '4bd6ec30',
+ '64bit lowercase key id' => '1054b7a24bd6ec30',
+ '160bit lowercase key fingerprint' => '47b320eb4c7c375aa9dae1a01054b7a24bd6ec30',
+ '0x formatted 32bit key id' => '0x4BD6EC30',
+ '0x formatted 64bit key id' => '0x1054B7A24BD6EC30',
+ '0x formatted 160bit key fingerprint' => '0x47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ '0x formatted 32bit lowercase key id' => '0x4bd6ec30',
+ '0x formatted 64bit lowercase key id' => '0x1054b7a24bd6ec30',
+ '0x formatted 160bit lowercase key fingerprint' => '0x47b320eb4c7c375aa9dae1a01054b7a24bd6ec30',
+ }
+
+ key_versions.each do |key, value|
+ context "#{key}" do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{value}',
+ ensure => 'present',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_changes => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+ end
+ end
+
+ context 'invalid length key id' do
+ it 'fails' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '4B7A24BD6EC30',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/Valid values match/)
+ end
+ end
+ end
+ end
+
+ describe 'ensure =>' do
+ context 'absent' do
+ it 'is removed' do
+ pp = <<-EOS
+ apt_key { 'centos':
+ id => '#{CENTOS_GPG_KEY_LONG_ID}',
+ ensure => 'absent',
+ }
+ EOS
+
+ # Install the key first
+ shell("apt-key adv --keyserver keyserver.ubuntu.com \
+ --recv-keys #{CENTOS_GPG_KEY_FINGERPRINT}")
+ shell(CENTOS_KEY_CHECK_COMMAND)
+
+ # Time to remove it using Puppet
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+
+ shell(CENTOS_KEY_CHECK_COMMAND,
+ :acceptable_exit_codes => [1])
+
+ shell("apt-key adv --keyserver keyserver.ubuntu.com \
+ --recv-keys #{CENTOS_GPG_KEY_FINGERPRINT}")
+ end
+ end
+
+ context 'absent, added with long key', :unless => (fact('operatingsystem') == 'Debian' and fact('operatingsystemmajrelease') == '6') do
+ it 'is removed' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'absent',
+ }
+ EOS
+
+ # Install the key first
+ shell("apt-key adv --keyserver keyserver.ubuntu.com \
+ --recv-keys #{PUPPETLABS_GPG_KEY_LONG_ID}")
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+
+ # Time to remove it using Puppet
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+
+ shell(PUPPETLABS_KEY_CHECK_COMMAND,
+ :acceptable_exit_codes => [1])
+ end
+ end
+ end
+
+ describe 'content =>' do
+ context 'puppetlabs gpg key' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
+ ensure => 'present',
+ content => "-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEw3u0ABEAC1+aJQpU59fwZ4mxFjqNCgfZgDhONDSYQFMRnYC1dzBpJHzI6b
+fUBQeaZ8rh6N4kZ+wq1eL86YDXkCt4sCvNTP0eF2XaOLbmxtV9bdpTIBep9bQiKg
+5iZaz+brUZlFk/MyJ0Yz//VQ68N1uvXccmD6uxQsVO+gx7rnarg/BGuCNaVtGwy+
+S98g8Begwxs9JmGa8pMCcSxtC7fAfAEZ02cYyrw5KfBvFI3cHDdBqrEJQKwKeLKY
+GHK3+H1TM4ZMxPsLuR/XKCbvTyl+OCPxU2OxPjufAxLlr8BWUzgJv6ztPe9imqpH
+Ppp3KuLFNorjPqWY5jSgKl94W/CO2x591e++a1PhwUn7iVUwVVe+mOEWnK5+Fd0v
+VMQebYCXS+3dNf6gxSvhz8etpw20T9Ytg4EdhLvCJRV/pYlqhcq+E9le1jFOHOc0
+Nc5FQweUtHGaNVyn8S1hvnvWJBMxpXq+Bezfk3X8PhPT/l9O2lLFOOO08jo0OYiI
+wrjhMQQOOSZOb3vBRvBZNnnxPrcdjUUm/9cVB8VcgI5KFhG7hmMCwH70tpUWcZCN
+NlI1wj/PJ7Tlxjy44f1o4CQ5FxuozkiITJvh9CTg+k3wEmiaGz65w9jRl9ny2gEl
+f4CR5+ba+w2dpuDeMwiHJIs5JsGyJjmA5/0xytB7QvgMs2q25vWhygsmUQARAQAB
+tEdQdXBwZXQgTGFicyBSZWxlYXNlIEtleSAoUHVwcGV0IExhYnMgUmVsZWFzZSBL
+ZXkpIDxpbmZvQHB1cHBldGxhYnMuY29tPokCPgQTAQIAKAUCTDe7QAIbAwUJA8Jn
+AAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQEFS3okvW7DAZaw//aLmE/eob
+pXpIUVyCUWQxEvPtM/h/SAJsG3KoHN9u216ews+UHsL/7F91ceVXQQdD2e8CtYWF
+eLNM0RSM9i/KM60g4CvIQlmNqdqhi1HsgGqInZ72/XLAXun0gabfC36rLww2kel+
+aMpRf58SrSuskY321NnMEJl4OsHV2hfNtAIgw2e/zm9RhoMpGKxoHZCvFhnP7u2M
+2wMq7iNDDWb6dVsLpzdlVf242zCbubPCxxQXOpA56rzkUPuJ85mdVw4i19oPIFIZ
+VL5owit1SxCOxBg4b8oaMS36hEl3qtZG834rtLfcqAmqjhx6aJuJLOAYN84QjDEU
+3NI5IfNRMvluIeTcD4Dt5FCYahN045tW1Rc6s5GAR8RW45GYwQDzG+kkkeeGxwEh
+qCW7nOHuwZIoVJufNhd28UFn83KGJHCQt4NBBr3K5TcY6bDQEIrpSplWSDBbd3p1
+IaoZY1WSDdP9OTVOSbsz0JiglWmUWGWCdd/CMSW/D7/3VUOJOYRDwptvtSYcjJc8
+1UV+1zB+rt5La/OWe4UOORD+jU1ATijQEaFYxBbqBBkFboAEXq9btRQyegqk+eVp
+HhzacP5NYFTMThvHuTapNytcCso5au/cMywqCgY1DfcMJyjocu4bCtrAd6w4kGKN
+MUdwNDYQulHZDI+UjJInhramyngdzZLjdeGJARwEEAECAAYFAkw3wEYACgkQIVr+
+UOQUcDKvEwgAoBuOPnPioBwYp8oHVPTo/69cJn1225kfraUYGebCcrRwuoKd8Iyh
+R165nXYJmD8yrAFBk8ScUVKsQ/pSnqNrBCrlzQD6NQvuIWVFegIdjdasrWX6Szj+
+N1OllbzIJbkE5eo0WjCMEKJVI/GTY2AnTWUAm36PLQC5HnSATykqwxeZDsJ/s8Rc
+kd7+QN5sBVytG3qb45Q7jLJpLcJO6KYH4rz9ZgN7LzyyGbu9DypPrulADG9OrL7e
+lUnsGDG4E1M8Pkgk9Xv9MRKao1KjYLD5zxOoVtdeoKEQdnM+lWMJin1XvoqJY7FT
+DJk6o+cVqqHkdKL+sgsscFVQljgCEd0EgIkCHAQQAQgABgUCTPlA6QAKCRBcE9bb
+kwUuAxdYD/40FxAeNCYByxkr/XRT0gFT+NCjPuqPWCM5tf2NIhSapXtb2+32WbAf
+DzVfqWjC0G0RnQBve+vcjpY4/rJu4VKIDGIT8CtnKOIyEcXTNFOehi65xO4ypaei
+BPSb3ip3P0of1iZZDQrNHMW5VcyL1c+PWT/6exXSGsePtO/89tc6mupqZtC05f5Z
+XG4jswMF0U6Q5s3S0tG7Y+oQhKNFJS4sH4rHe1o5CxKwNRSzqccA0hptKy3MHUZ2
++zeHzuRdRWGjb2rUiVxnIvPPBGxF2JHhB4ERhGgbTxRZ6wZbdW06BOE8r7pGrUpU
+fCw/WRT3gGXJHpGPOzFAvr3Xl7VcDUKTVmIajnpd3SoyD1t2XsvJlSQBOWbViucH
+dvE4SIKQ77vBLRlZIoXXVb6Wu7Vq+eQs1ybjwGOhnnKjz8llXcMnLzzN86STpjN4
+qGTXQy/E9+dyUP1sXn3RRwb+ZkdI77m1YY95QRNgG/hqh77IuWWg1MtTSgQnP+F2
+7mfo0/522hObhdAe73VO3ttEPiriWy7tw3bS9daP2TAVbYyFqkvptkBb1OXRUSzq
+UuWjBmZ35UlXjKQsGeUHlOiEh84aondF90A7gx0X/ktNIPRrfCGkHJcDu+HVnR7x
+Kk+F0qb9+/pGLiT3rqeQTr8fYsb4xLHT7uEg1gVFB1g0kd+RQHzV74kCPgQTAQIA
+KAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAk/x5PoFCQtIMjoACgkQEFS3
+okvW7DAIKQ/9HvZyf+LHVSkCk92Kb6gckniin3+5ooz67hSr8miGBfK4eocqQ0H7
+bdtWjAILzR/IBY0xj6OHKhYP2k8TLc7QhQjt0dRpNkX+Iton2AZryV7vUADreYz4
+4B0bPmhiE+LL46ET5IThLKu/KfihzkEEBa9/t178+dO9zCM2xsXaiDhMOxVE32gX
+vSZKP3hmvnK/FdylUY3nWtPedr+lHpBLoHGaPH7cjI+MEEugU3oAJ0jpq3V8n4w0
+jIq2V77wfmbD9byIV7dXcxApzciK+ekwpQNQMSaceuxLlTZKcdSqo0/qmS2A863Y
+ZQ0ZBe+Xyf5OI33+y+Mry+vl6Lre2VfPm3udgR10E4tWXJ9Q2CmG+zNPWt73U1FD
+7xBI7PPvOlyzCX4QJhy2Fn/fvzaNjHp4/FSiCw0HvX01epcersyun3xxPkRIjwwR
+M9m5MJ0o4hhPfa97zibXSh8XXBnosBQxeg6nEnb26eorVQbqGx0ruu/W2m5/JpUf
+REsFmNOBUbi8xlKNS5CZypH3Zh88EZiTFolOMEh+hT6s0l6znBAGGZ4m/Unacm5y
+DHmg7unCk4JyVopQ2KHMoqG886elu+rm0ASkhyqBAk9sWKptMl3NHiYTRE/m9VAk
+ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
+=a34C
+-----END PGP PUBLIC KEY BLOCK-----",
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+ end
+
+ context 'multiple keys' do
+ it 'runs without errors' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
+ ensure => 'present',
+ content => "-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+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
+=Gl+v
+-----END PGP PUBLIC KEY BLOCK-----",
+ }
+ EOS
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+ end
+
+ context 'bogus key' do
+ it 'fails' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ content => 'For posterity: such content, much bogus, wow',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/no valid OpenPGP data found/)
+ end
+ end
+ end
+ end
+
+ describe 'server =>' do
+ context 'pgp.mit.edu' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ server => 'pgp.mit.edu',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+ end
+
+ context 'hkp://pgp.mit.edu:80' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
+ ensure => 'present',
+ server => 'hkp://pgp.mit.edu:80',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+ end
+
+ context 'nonexistant.key.server' do
+ it 'fails' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ server => 'nonexistant.key.server',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/(Host not found|Couldn't resolve host)/)
+ end
+ end
+ end
+
+ context 'key server start with dot' do
+ it 'fails' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ server => '.pgp.key.server',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/Invalid value \".pgp.key.server\"/)
+ end
+ end
+ end
+ end
+
+ describe 'source =>' do
+ context 'http://' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => 'http://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+
+ it 'fails with a 404' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => 'http://#{PUPPETLABS_APT_URL}/herpderp.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/404 Not Found/)
+ end
+ end
+
+ it 'fails with a socket error' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => 'http://apt.puppetlabss.com/herpderp.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/could not resolve/)
+ end
+ end
+ end
+
+ context 'ftp://' do
+ before(:each) do
+ shell("apt-key del #{CENTOS_GPG_KEY_LONG_ID}",
+ :acceptable_exit_codes => [0,1,2])
+ end
+
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'CentOS 6':
+ id => '#{CENTOS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => 'ftp://#{CENTOS_REPO_URL}/#{CENTOS_GPG_KEY_FILE}',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(CENTOS_KEY_CHECK_COMMAND)
+ end
+
+ it 'fails with a 550' do
+ pp = <<-EOS
+ apt_key { 'CentOS 6':
+ id => '#{SHOULD_NEVER_EXIST_ID}',
+ ensure => 'present',
+ source => 'ftp://#{CENTOS_REPO_URL}/herpderp.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/550 Failed to open/)
+ end
+ end
+
+ it 'fails with a socket error' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => 'ftp://apt.puppetlabss.com/herpderp.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/could not resolve/)
+ end
+ end
+ end
+
+ context 'https://' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => 'https://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+
+ it 'fails with a 404' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{SHOULD_NEVER_EXIST_ID}',
+ ensure => 'present',
+ source => 'https://#{PUPPETLABS_APT_URL}/herpderp.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/404 Not Found/)
+ end
+ end
+
+ it 'fails with a socket error' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{SHOULD_NEVER_EXIST_ID}',
+ ensure => 'present',
+ source => 'https://apt.puppetlabss.com/herpderp.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/could not resolve/)
+ end
+ end
+ end
+
+ context '/path/that/exists' do
+ before(:each) do
+ shell("curl -o /tmp/puppetlabs-pubkey.gpg \
+ http://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}")
+ end
+
+ after(:each) do
+ shell('rm /tmp/puppetlabs-pubkey.gpg')
+ end
+
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '4BD6EC30',
+ ensure => 'present',
+ source => '/tmp/puppetlabs-pubkey.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+ end
+
+ context '/path/that/does/not/exist' do
+ it 'fails' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => '/tmp/totally_bogus.file',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/does not exist/)
+ end
+ end
+ end
+
+ context '/path/that/exists/with/bogus/content' do
+ before(:each) do
+ shell('echo "here be dragons" > /tmp/fake-key.gpg')
+ end
+
+ after(:each) do
+ shell('rm /tmp/fake-key.gpg')
+ end
+ it 'fails' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ source => '/tmp/fake-key.gpg',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/no valid OpenPGP data found/)
+ end
+ end
+ end
+ end
+
+ describe 'options =>' do
+ context 'debug' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ options => 'debug',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ shell(PUPPETLABS_KEY_CHECK_COMMAND)
+ end
+
+ it 'fails on invalid options' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_LONG_ID}',
+ ensure => 'present',
+ options => 'this is totally bonkers',
+ }
+ EOS
+
+ shell("apt-key del #{PUPPETLABS_GPG_KEY_FINGERPRINT}", :acceptable_exit_codes => [0,1,2])
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/--keyserver-options this is totally/)
+ end
+ end
+ end
+ end
+
+ describe 'fingerprint validation against source/content' do
+ context 'fingerprint in id matches fingerprint from remote key' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}',
+ ensure => 'present',
+ source => 'https://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ end
+ end
+
+ context 'fingerprint in id does NOT match fingerprint from remote key' do
+ it 'works' do
+ pp = <<-EOS
+ apt_key { 'puppetlabs':
+ id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6E666',
+ ensure => 'present',
+ source => 'https://#{PUPPETLABS_APT_URL}/#{PUPPETLABS_GPG_KEY_FILE}',
+ }
+ EOS
+
+ apply_manifest(pp, :expect_failures => true) do |r|
+ expect(r.stderr).to match(/do not match/)
+ end
+ end
+ end
+ end
+
+end
diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
new file mode 100644
index 0000000000..d3bd76174c
--- /dev/null
+++ b/spec/acceptance/apt_spec.rb
@@ -0,0 +1,60 @@
+require 'spec_helper_acceptance'
+
+describe 'apt class' do
+
+ context 'reset' do
+ it 'fixes the sources.list' do
+ shell('cp /etc/apt/sources.list /tmp')
+ end
+ end
+
+ context 'all the things' do
+ it 'should work with no errors' do
+ pp = <<-EOS
+ if $::lsbdistcodename == 'lucid' {
+ $sources = undef
+ } else {
+ $sources = {
+ 'puppetlabs' => {
+ 'ensure' => present,
+ 'location' => 'http://apt.puppetlabs.com',
+ 'repos' => 'main',
+ 'key' => {
+ 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+ 'server' => 'pgp.mit.edu',
+ },
+ },
+ }
+ }
+ class { 'apt':
+ update => {
+ 'frequency' => 'always',
+ 'timeout' => '400',
+ 'tries' => '3',
+ },
+ purge => {
+ 'sources.list' => true,
+ 'sources.list.d' => true,
+ 'preferences' => true,
+ 'preferences.d' => true,
+ },
+ sources => $sources,
+ }
+ EOS
+
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ end
+ it 'should still work' do
+ shell('apt-get update')
+ shell('apt-get -y --force-yes upgrade')
+ end
+ end
+
+ context 'reset' do
+ it 'fixes the sources.list' do
+ shell('cp /tmp/sources.list /etc/apt')
+ end
+ end
+
+end
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
new file mode 100644
index 0000000000..f228e4c456
--- /dev/null
+++ b/spec/acceptance/class_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper_acceptance'
+
+describe 'apt class' do
+
+ context 'default parameters' do
+ # Using puppet_apply as a helper
+ it 'should work with no errors' do
+ pp = <<-EOS
+ class { 'apt': }
+ EOS
+
+ # Run it twice and test for idempotency
+ apply_manifest(pp, :catch_failures => true)
+ apply_manifest(pp, :catch_failures => true)
+ end
+ end
+end
diff --git a/spec/acceptance/nodesets/centos-59-x64.yml b/spec/acceptance/nodesets/centos-59-x64.yml
new file mode 100644
index 0000000000..2ad90b86aa
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ centos-59-x64:
+ roles:
+ - master
+ platform: el-5-x86_64
+ box : centos-59-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: git
diff --git a/spec/acceptance/nodesets/centos-64-x64-pe.yml b/spec/acceptance/nodesets/centos-64-x64-pe.yml
new file mode 100644
index 0000000000..7d9242f1b9
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ centos-64-x64:
+ roles:
+ - master
+ - database
+ - dashboard
+ platform: el-6-x86_64
+ box : centos-64-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: pe
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
new file mode 100644
index 0000000000..4e2cb809e8
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ centos-65-x64:
+ roles:
+ - master
+ platform: el-6-x86_64
+ box : centos-65-x64-vbox436-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss
diff --git a/spec/acceptance/nodesets/debian-70rc1-x64.yml b/spec/acceptance/nodesets/debian-70rc1-x64.yml
new file mode 100644
index 0000000000..4b55677f4c
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-70rc1-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ debian-70rc1-x64:
+ roles:
+ - master
+ platform: debian-70rc1-x64
+ box : debian-70rc1-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss
diff --git a/spec/acceptance/nodesets/debian-73-x64.yml b/spec/acceptance/nodesets/debian-73-x64.yml
new file mode 100644
index 0000000000..d71434551a
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-73-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+ debian-73-x64:
+ roles:
+ - master
+ platform: debian-7-amd64
+ box : debian-73-x64-virtualbox-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ log_level: debug
+ type: git
\ No newline at end of file
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
new file mode 100644
index 0000000000..45af989347
--- /dev/null
+++ b/spec/acceptance/nodesets/default.yml
@@ -0,0 +1,11 @@
+HOSTS:
+ ubuntu-server-12042-x64:
+ roles:
+ - master
+ platform: ubuntu-server-12.04-amd64
+ box : ubuntu-server-12042-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss
+ vagrant_ssh_port_random: true
diff --git a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
new file mode 100644
index 0000000000..5ca1514e40
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ ubuntu-server-10044-x64:
+ roles:
+ - master
+ platform: ubuntu-10.04-amd64
+ box : ubuntu-server-10044-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
new file mode 100644
index 0000000000..d065b304f8
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ ubuntu-server-12042-x64:
+ roles:
+ - master
+ platform: ubuntu-12.04-amd64
+ box : ubuntu-server-12042-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
new file mode 100644
index 0000000000..cba1cd04c2
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+ ubuntu-server-1404-x64:
+ roles:
+ - master
+ platform: ubuntu-14.04-amd64
+ box : puppetlabs/ubuntu-14.04-64-nocm
+ box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+ hypervisor : vagrant
+CONFIG:
+ log_level : debug
+ type: git
diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
new file mode 100644
index 0000000000..496fec0cdf
--- /dev/null
+++ b/spec/classes/apt_backports_spec.rb
@@ -0,0 +1,268 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+describe 'apt::backports', :type => :class do
+ let (:pre_condition) { "class{ '::apt': }" }
+ describe 'debian/ubuntu tests' do
+ context 'defaults on deb' do
+ let(:facts) do
+ {
+ :lsbdistid => 'Debian',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :puppetversion => Puppet.version,
+ }
+ end
+ it { is_expected.to contain_apt__source('backports').with({
+ :location => 'http://httpredir.debian.org/debian',
+ :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ :repos => 'main contrib non-free',
+ :release => 'wheezy-backports',
+ :pin => { 'priority' => 200, 'release' => 'wheezy-backports' },
+ })
+ }
+ end
+ context 'defaults on squeeze' do
+ let(:facts) do
+ {
+ :lsbdistid => 'Debian',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'squeeze',
+ :puppetversion => Puppet.version,
+ }
+ end
+ it { is_expected.to contain_apt__source('backports').with({
+ :location => 'http://httpredir.debian.org/debian-backports',
+ :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ :repos => 'main contrib non-free',
+ :release => 'squeeze-backports',
+ :pin => { 'priority' => 200, 'release' => 'squeeze-backports' },
+ })
+ }
+ end
+ context 'defaults on ubuntu' do
+ let(:facts) do
+ {
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'trusty',
+ :puppetversion => Puppet.version,
+ }
+ end
+ it { is_expected.to contain_apt__source('backports').with({
+ :location => 'http://archive.ubuntu.com/ubuntu',
+ :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ :repos => 'main universe multiverse restricted',
+ :release => 'trusty-backports',
+ :pin => { 'priority' => 200, 'release' => 'trusty-backports' },
+ })
+ }
+ end
+ context 'set everything' do
+ let(:facts) do
+ {
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'trusty',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) do
+ {
+ :location => 'http://archive.ubuntu.com/ubuntu-test',
+ :release => 'vivid',
+ :repos => 'main',
+ :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ :pin => '90',
+ }
+ end
+ it { is_expected.to contain_apt__source('backports').with({
+ :location => 'http://archive.ubuntu.com/ubuntu-test',
+ :key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ :repos => 'main',
+ :release => 'vivid',
+ :pin => { 'priority' => 90, 'release' => 'vivid' },
+ })
+ }
+ end
+ context 'set things with hashes' do
+ let(:facts) do
+ {
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'trusty',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) do
+ {
+ :key => {
+ 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+ },
+ :pin => {
+ 'priority' => '90',
+ },
+ }
+ end
+ it { is_expected.to contain_apt__source('backports').with({
+ :key => { 'id' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' },
+ :pin => { 'priority' => '90' },
+ })
+ }
+ end
+ end
+ describe 'mint tests' do
+ let(:facts) do
+ {
+ :lsbdistid => 'linuxmint',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'qiana',
+ :puppetversion => Puppet.version,
+ }
+ end
+ context 'sets all the needed things' do
+ let(:params) do
+ {
+ :location => 'http://archive.ubuntu.com/ubuntu',
+ :release => 'trusty-backports',
+ :repos => 'main universe multiverse restricted',
+ :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ }
+ end
+ it { is_expected.to contain_apt__source('backports').with({
+ :location => 'http://archive.ubuntu.com/ubuntu',
+ :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ :repos => 'main universe multiverse restricted',
+ :release => 'trusty-backports',
+ :pin => { 'priority' => 200, 'release' => 'trusty-backports' },
+ })
+ }
+ end
+ context 'missing location' do
+ let(:params) do
+ {
+ :release => 'trusty-backports',
+ :repos => 'main universe multiverse restricted',
+ :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key/)
+ end
+ end
+ context 'missing release' do
+ let(:params) do
+ {
+ :location => 'http://archive.ubuntu.com/ubuntu',
+ :repos => 'main universe multiverse restricted',
+ :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key/)
+ end
+ end
+ context 'missing repos' do
+ let(:params) do
+ {
+ :location => 'http://archive.ubuntu.com/ubuntu',
+ :release => 'trusty-backports',
+ :key => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key/)
+ end
+ end
+ context 'missing key' do
+ let(:params) do
+ {
+ :location => 'http://archive.ubuntu.com/ubuntu',
+ :release => 'trusty-backports',
+ :repos => 'main universe multiverse restricted',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key/)
+ end
+ end
+ end
+ describe 'validation' do
+ let(:facts) do
+ {
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistcodename => 'trusty',
+ :puppetversion => Puppet.version,
+ }
+ end
+ context 'invalid location' do
+ let(:params) do
+ {
+ :location => true
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /is not a string/)
+ end
+ end
+ context 'invalid release' do
+ let(:params) do
+ {
+ :release => true
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /is not a string/)
+ end
+ end
+ context 'invalid repos' do
+ let(:params) do
+ {
+ :repos => true
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /is not a string/)
+ end
+ end
+ context 'invalid key' do
+ let(:params) do
+ {
+ :key => true
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /is not a string/)
+ end
+ end
+ context 'invalid pin' do
+ let(:params) do
+ {
+ :pin => true
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /pin must be either a string, number or hash/)
+ end
+ end
+ end
+end
diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
new file mode 100644
index 0000000000..cc2264bc7a
--- /dev/null
+++ b/spec/classes/apt_spec.rb
@@ -0,0 +1,307 @@
+require 'spec_helper'
+describe 'apt' do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version} }
+
+ context 'defaults' do
+ it { is_expected.to contain_file('sources.list').that_notifies('Class[Apt::Update]').only_with({
+ :ensure => 'file',
+ :path => '/etc/apt/sources.list',
+ :owner => 'root',
+ :group => 'root',
+ :mode => '0644',
+ :notify => 'Class[Apt::Update]',
+ })}
+
+ it { is_expected.to contain_file('sources.list.d').that_notifies('Class[Apt::Update]').only_with({
+ :ensure => 'directory',
+ :path => '/etc/apt/sources.list.d',
+ :owner => 'root',
+ :group => 'root',
+ :mode => '0644',
+ :purge => false,
+ :recurse => false,
+ :notify => 'Class[Apt::Update]',
+ })}
+
+ it { is_expected.to contain_file('preferences').that_notifies('Class[Apt::Update]').only_with({
+ :ensure => 'file',
+ :path => '/etc/apt/preferences',
+ :owner => 'root',
+ :group => 'root',
+ :mode => '0644',
+ :notify => 'Class[Apt::Update]',
+ })}
+
+ it { is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with({
+ :ensure => 'directory',
+ :path => '/etc/apt/preferences.d',
+ :owner => 'root',
+ :group => 'root',
+ :mode => '0644',
+ :purge => false,
+ :recurse => false,
+ :notify => 'Class[Apt::Update]',
+ })}
+
+ it 'should lay down /etc/apt/apt.conf.d/15update-stamp' do
+ is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with({
+ :group => 'root',
+ :mode => '0644',
+ :owner => 'root',
+ }).with_content(/APT::Update::Post-Invoke-Success \{"touch \/var\/lib\/apt\/periodic\/update-success-stamp 2>\/dev\/null \|\| true";\};/)
+ end
+
+ it { is_expected.to contain_exec('apt_update').with({
+ :refreshonly => 'true',
+ })}
+
+ it { is_expected.not_to contain_apt__setting('conf-proxy') }
+ end
+
+ describe 'proxy=' do
+ context 'host=localhost' do
+ let(:params) { { :proxy => { 'host' => 'localhost'} } }
+ it { is_expected.to contain_apt__setting('conf-proxy').with({
+ :priority => '01',
+ }).with_content(
+ /Acquire::http::proxy "http:\/\/localhost:8080\/";/
+ ).without_content(
+ /Acquire::https::proxy/
+ )}
+ end
+
+ context 'host=localhost and port=8180' do
+ let(:params) { { :proxy => { 'host' => 'localhost', 'port' => 8180} } }
+ it { is_expected.to contain_apt__setting('conf-proxy').with({
+ :priority => '01',
+ }).with_content(
+ /Acquire::http::proxy "http:\/\/localhost:8180\/";/
+ ).without_content(
+ /Acquire::https::proxy/
+ )}
+ end
+
+ context 'host=localhost and https=true' do
+ let(:params) { { :proxy => { 'host' => 'localhost', 'https' => true} } }
+ it { is_expected.to contain_apt__setting('conf-proxy').with({
+ :priority => '01',
+ }).with_content(
+ /Acquire::http::proxy "http:\/\/localhost:8080\/";/
+ ).with_content(
+ /Acquire::https::proxy "https:\/\/localhost:8080\/";/
+ )}
+ end
+
+ context 'ensure=absent' do
+ let(:params) { { :proxy => { 'ensure' => 'absent'} } }
+ it { is_expected.to contain_apt__setting('conf-proxy').with({
+ :ensure => 'absent',
+ :priority => '01',
+ })}
+ end
+ end
+ context 'lots of non-defaults' do
+ let :params do
+ {
+ :update => { 'frequency' => 'always', 'timeout' => 1, 'tries' => 3 },
+ :purge => { 'sources.list' => false, 'sources.list.d' => false,
+ 'preferences' => false, 'preferences.d' => false, },
+ }
+ end
+
+ it { is_expected.to contain_file('sources.list').with({
+ :content => nil,
+ })}
+
+ it { is_expected.to contain_file('sources.list.d').with({
+ :purge => false,
+ :recurse => false,
+ })}
+
+ it { is_expected.to contain_file('preferences').with({
+ :ensure => 'file',
+ })}
+
+ it { is_expected.to contain_file('preferences.d').with({
+ :purge => false,
+ :recurse => false,
+ })}
+
+ it { is_expected.to contain_exec('apt_update').with({
+ :refreshonly => false,
+ :timeout => 1,
+ :tries => 3,
+ })}
+
+ end
+
+ context 'with sources defined on valid osfamily' do
+ let :facts do
+ { :osfamily => 'Debian',
+ :lsbdistcodename => 'precise',
+ :lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :sources => {
+ 'debian_unstable' => {
+ 'location' => 'http://debian.mirror.iweb.ca/debian/',
+ 'release' => 'unstable',
+ 'repos' => 'main contrib non-free',
+ 'key' => { 'id' => '150C8614919D8446E01E83AF9AA38DCD55BE302B', 'server' => 'subkeys.pgp.net' },
+ 'pin' => '-10',
+ 'include' => {'src' => true,},
+ },
+ 'puppetlabs' => {
+ 'location' => 'http://apt.puppetlabs.com',
+ 'repos' => 'main',
+ 'key' => { 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', 'server' => 'pgp.mit.edu' },
+ }
+ } } }
+
+ it {
+ is_expected.to contain_apt__setting('list-debian_unstable').with({
+ :ensure => 'present',
+ })
+ }
+
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(/^deb http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/debian_unstable.list').with_content(/^deb-src http:\/\/debian.mirror.iweb.ca\/debian\/ unstable main contrib non-free$/) }
+
+ it {
+ is_expected.to contain_apt__setting('list-puppetlabs').with({
+ :ensure => 'present',
+ })
+ }
+
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(/^deb http:\/\/apt.puppetlabs.com precise main$/) }
+ end
+
+ context 'with keys defined on valid osfamily' do
+ let :facts do
+ { :osfamily => 'Debian',
+ :lsbdistcodename => 'precise',
+ :lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :keys => {
+ '55BE302B' => {
+ 'server' => 'subkeys.pgp.net',
+ },
+ '4BD6EC30' => {
+ 'server' => 'pgp.mit.edu',
+ }
+ } } }
+
+ it { is_expected.to contain_apt__key('55BE302B').with({
+ :server => 'subkeys.pgp.net',
+ })}
+
+ it { is_expected.to contain_apt__key('4BD6EC30').with({
+ :server => 'pgp.mit.edu',
+ })}
+ end
+
+ context 'with ppas defined on valid osfamily' do
+ let :facts do
+ { :osfamily => 'Debian',
+ :lsbdistcodename => 'precise',
+ :lsbdistid => 'ubuntu',
+ :lsbdistrelease => '12.04',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :ppas => {
+ 'ppa:drizzle-developers/ppa' => {},
+ 'ppa:nginx/stable' => {},
+ } } }
+
+ it { is_expected.to contain_apt__ppa('ppa:drizzle-developers/ppa')}
+ it { is_expected.to contain_apt__ppa('ppa:nginx/stable')}
+ end
+
+ context 'with settings defined on valid osfamily' do
+ let :facts do
+ { :osfamily => 'Debian',
+ :lsbdistcodename => 'precise',
+ :lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :settings => {
+ 'conf-banana' => { 'content' => 'banana' },
+ 'pref-banana' => { 'content' => 'banana' },
+ } } }
+
+ it { is_expected.to contain_apt__setting('conf-banana')}
+ it { is_expected.to contain_apt__setting('pref-banana')}
+ end
+
+ context 'with pins defined on valid osfamily' do
+ let :facts do
+ { :osfamily => 'Debian',
+ :lsbdistcodename => 'precise',
+ :lsbdistid => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :pins => {
+ 'stable' => { 'priority' => 600, 'order' => 50 },
+ 'testing' => { 'priority' => 700, 'order' => 100 },
+ } } }
+
+ it { is_expected.to contain_apt__pin('stable') }
+ it { is_expected.to contain_apt__pin('testing') }
+ end
+
+ describe 'failing tests' do
+ context "purge['sources.list']=>'banana'" do
+ let(:params) { { :purge => { 'sources.list' => 'banana' }, } }
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error)
+ end
+ end
+
+ context "purge['sources.list.d']=>'banana'" do
+ let(:params) { { :purge => { 'sources.list.d' => 'banana' }, } }
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error)
+ end
+ end
+
+ context "purge['preferences']=>'banana'" do
+ let(:params) { { :purge => { 'preferences' => 'banana' }, } }
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error)
+ end
+ end
+
+ context "purge['preferences.d']=>'banana'" do
+ let(:params) { { :purge => { 'preferences.d' => 'banana' }, } }
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error)
+ end
+ end
+
+ context 'with unsupported osfamily' do
+ let :facts do
+ { :osfamily => 'Darwin', :puppetversion => Puppet.version,}
+ end
+
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /This module only works on Debian or derivatives like Ubuntu/)
+ end
+ end
+ end
+end
diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
new file mode 100644
index 0000000000..d031104ddd
--- /dev/null
+++ b/spec/classes/apt_update_spec.rb
@@ -0,0 +1,75 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+describe 'apt::update', :type => :class do
+ context "and apt::update['frequency']='always'" do
+ { 'a recent run' => Time.now.to_i, 'we are due for a run' => 1406660561,'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
+ context "and $::apt_update_last_success indicates #{desc}" do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :apt_update_last_success => factval, :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let (:pre_condition) { "class{'::apt': update => {'frequency' => 'always' },}" }
+ it 'should trigger an apt-get update run' do
+ #set the apt_update exec's refreshonly attribute to false
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => false})
+ end
+ end
+ end
+ context 'when $::apt_update_last_success is nil' do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let (:pre_condition) { "class{ '::apt': update => {'frequency' => 'always' },}" }
+ it 'should trigger an apt-get update run' do
+ #set the apt_update exec\'s refreshonly attribute to false
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => false})
+ end
+ end
+ end
+ context "and apt::update['frequency']='reluctantly'" do
+ {'a recent run' => Time.now.to_i, 'we are due for a run' => 1406660561,'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
+ context "and $::apt_update_last_success indicates #{desc}" do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :apt_update_last_success => factval, :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version,} }
+ let (:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
+ it 'should not trigger an apt-get update run' do
+ #don't change the apt_update exec's refreshonly attribute. (it should be true)
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => true})
+ end
+ end
+ end
+ context 'when $::apt_update_last_success is nil' do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let (:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
+ it 'should not trigger an apt-get update run' do
+ #don't change the apt_update exec's refreshonly attribute. (it should be true)
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => true})
+ end
+ end
+ end
+ ['daily','weekly'].each do |update_frequency|
+ context "and apt::update['frequency'] has the value of #{update_frequency}" do
+ { 'we are due for a run' => 1406660561,'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
+ context "and $::apt_update_last_success indicates #{desc}" do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :apt_update_last_success => factval, :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let (:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
+ it 'should trigger an apt-get update run' do
+ #set the apt_update exec\'s refreshonly attribute to false
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => false})
+ end
+ end
+ end
+ context 'when the $::apt_update_last_success fact has a recent value' do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :apt_update_last_success => Time.now.to_i, :puppetversion => Puppet.version, } }
+ let (:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
+ it 'should not trigger an apt-get update run' do
+ #don't change the apt_update exec\'s refreshonly attribute. (it should be true)
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => true})
+ end
+ end
+ context 'when $::apt_update_last_success is nil' do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :apt_update_last_success => nil, :puppetversion => Puppet.version, } }
+ let (:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
+ it 'should trigger an apt-get update run' do
+ #set the apt_update exec\'s refreshonly attribute to false
+ is_expected.to contain_exec('apt_update').with({'refreshonly' => false})
+ end
+ end
+ end
+ end
+end
diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
new file mode 100644
index 0000000000..e9eb6fb9d6
--- /dev/null
+++ b/spec/classes/params_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+describe 'apt::params', :type => :class do
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let (:title) { 'my_package' }
+
+ it { is_expected.to contain_apt__params }
+
+ # There are 4 resources in this class currently
+ # there should not be any more resources because it is a params class
+ # The resources are class[apt::params], class[main], class[settings], stage[main]
+ it "Should not contain any resources" do
+ expect(subject.call.resources.size).to eq(4)
+ end
+
+ describe "With lsb-release not installed" do
+ let(:facts) { { :osfamily => 'Debian', :puppetversion => Puppet.version, } }
+ let (:title) { 'my_package' }
+
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /Unable to determine lsbdistid, please install lsb-release first/)
+ end
+ end
+end
diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
new file mode 100644
index 0000000000..c74bf1aca3
--- /dev/null
+++ b/spec/defines/conf_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+describe 'apt::conf', :type => :define do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let :title do
+ 'norecommends'
+ end
+
+ describe "when creating an apt preference" do
+ let :default_params do
+ {
+ :priority => '00',
+ :content => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
+ }
+ end
+ let :params do
+ default_params
+ end
+
+ let :filename do
+ "/etc/apt/apt.conf.d/00norecommends"
+ end
+
+ it { is_expected.to contain_file(filename).with({
+ 'ensure' => 'present',
+ 'content' => /Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;/,
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ })
+ }
+
+ context "with notify_update = true (default)" do
+ let :params do
+ default_params
+ end
+ it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(true) }
+ end
+
+ context "with notify_update = false" do
+ let :params do
+ default_params.merge({
+ :notify_update => false
+ })
+ end
+ it { is_expected.to contain_apt__setting("conf-#{title}").with_notify_update(false) }
+ end
+ end
+
+ describe "when creating a preference without content" do
+ let :params do
+ {
+ :priority => '00',
+ }
+ end
+
+ it 'fails' do
+ expect { subject.call } .to raise_error(/pass in content/)
+ end
+ end
+
+ describe "when removing an apt preference" do
+ let :params do
+ {
+ :ensure => 'absent',
+ :priority => '00',
+ }
+ end
+
+ let :filename do
+ "/etc/apt/apt.conf.d/00norecommends"
+ end
+
+ it { is_expected.to contain_file(filename).with({
+ 'ensure' => 'absent',
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ })
+ }
+ end
+end
diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
new file mode 100644
index 0000000000..872bcadcd6
--- /dev/null
+++ b/spec/defines/key_compat_spec.rb
@@ -0,0 +1,316 @@
+require 'spec_helper'
+
+describe 'apt::key', :type => :define do
+ let(:facts) { { :lsbdistid => 'Debian' } }
+ GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+
+ let :title do
+ GPG_KEY_ID
+ end
+
+ describe 'normal operation' do
+ describe 'default options' do
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => title,
+ :ensure => 'present',
+ :source => nil,
+ :server => nil,
+ :content => nil,
+ :keyserver_options => nil,
+ })
+ end
+ it 'contains the apt_key present anchor' do
+ should contain_anchor("apt_key #{title} present")
+ end
+ end
+
+ describe 'title and key =>' do
+ let :title do
+ 'puppetlabs'
+ end
+
+ let :params do {
+ :key => GPG_KEY_ID,
+ } end
+
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => GPG_KEY_ID,
+ :ensure => 'present',
+ :source => nil,
+ :server => nil,
+ :content => nil,
+ :keyserver_options => nil,
+ })
+ end
+ it 'contains the apt_key present anchor' do
+ should contain_anchor("apt_key #{GPG_KEY_ID} present")
+ end
+ end
+
+ describe 'ensure => absent' do
+ let :params do {
+ :ensure => 'absent',
+ } end
+
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => title,
+ :ensure => 'absent',
+ :source => nil,
+ :server => nil,
+ :content => nil,
+ :keyserver_options => nil,
+ })
+ end
+ it 'contains the apt_key absent anchor' do
+ should contain_anchor("apt_key #{title} absent")
+ end
+ end
+
+ describe 'set a bunch of things!' do
+ let :params do {
+ :key_content => 'GPG key content',
+ :key_source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :key_server => 'pgp.mit.edu',
+ :key_options => 'debug',
+ } end
+
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => title,
+ :ensure => 'present',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :server => 'pgp.mit.edu',
+ :content => params[:key_content],
+ :options => 'debug',
+ })
+ end
+ it 'contains the apt_key present anchor' do
+ should contain_anchor("apt_key #{title} present")
+ end
+ end
+
+ context "domain with dash" do
+ let(:params) do{
+ :key_server => 'p-gp.m-it.edu',
+ } end
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => title,
+ :server => 'p-gp.m-it.edu',
+ })
+ end
+ end
+
+ context "url" do
+ let :params do
+ {
+ :key_server => 'hkp://pgp.mit.edu',
+ }
+ end
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => title,
+ :server => 'hkp://pgp.mit.edu',
+ })
+ end
+ end
+ context "url with port number" do
+ let :params do
+ {
+ :key_server => 'hkp://pgp.mit.edu:80',
+ }
+ end
+ it 'contains the apt_key' do
+ should contain_apt_key(title).with({
+ :id => title,
+ :server => 'hkp://pgp.mit.edu:80',
+ })
+ end
+ end
+ end
+
+ describe 'validation' do
+ context "domain begin with dash" do
+ let(:params) do{
+ :key_server => '-pgp.mit.edu',
+ } end
+ it 'fails' do
+ expect { subject.call } .to raise_error(/does not match/)
+ end
+ end
+
+ context "domain begin with dot" do
+ let(:params) do{
+ :key_server => '.pgp.mit.edu',
+ } end
+ it 'fails' do
+ expect { subject.call } .to raise_error(/does not match/)
+ end
+ end
+
+ context "domain end with dot" do
+ let(:params) do{
+ :key_server => "pgp.mit.edu.",
+ } end
+ it 'fails' do
+ expect { subject.call } .to raise_error(/does not match/)
+ end
+ end
+ context "exceed character url" do
+ let :params do
+ {
+ :key_server => 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "incorrect port number url" do
+ let :params do
+ {
+ :key_server => 'hkp://pgp.mit.edu:8008080'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "incorrect protocol for url" do
+ let :params do
+ {
+ :key_server => 'abc://pgp.mit.edu:80'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "missing port number url" do
+ let :params do
+ {
+ :key_server => 'hkp://pgp.mit.edu:'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "url ending with a dot" do
+ let :params do
+ {
+ :key_server => 'hkp://pgp.mit.edu.'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "url begin with a dash" do
+ let(:params) do{
+ :key_server => "hkp://-pgp.mit.edu",
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context 'invalid key' do
+ let :title do
+ 'Out of rum. Why? Why are we out of rum?'
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ context 'invalid source' do
+ let :params do {
+ :key_source => 'afp://puppetlabs.com/key.gpg',
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ context 'invalid content' do
+ let :params do {
+ :key_content => [],
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/is not a string/)
+ end
+ end
+
+ context 'invalid server' do
+ let :params do {
+ :key_server => 'two bottles of rum',
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ context 'invalid keyserver_options' do
+ let :params do {
+ :key_options => {},
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/is not a string/)
+ end
+ end
+
+ context 'invalid ensure' do
+ let :params do
+ {
+ :ensure => 'foo',
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ describe 'duplication' do
+ context 'two apt::key resources for same key, different titles' do
+ let :pre_condition do
+ "apt::key { 'duplicate': key => '#{title}', }"
+ end
+
+ it 'contains two apt::key resources' do
+ should contain_apt__key('duplicate').with({
+ :key => title,
+ :ensure => 'present',
+ })
+ should contain_apt__key(title).with({
+ :id => title,
+ :ensure => 'present',
+ })
+ end
+
+ it 'contains only a single apt_key' do
+ should contain_apt_key('duplicate').with({
+ :id => title,
+ :ensure => 'present',
+ :source => nil,
+ :server => nil,
+ :content => nil,
+ :keyserver_options => nil,
+ })
+ should_not contain_apt_key(title)
+ end
+ end
+
+ context 'two apt::key resources, different ensure' do
+ let :pre_condition do
+ "apt::key { 'duplicate': key => '#{title}', ensure => 'absent', }"
+ end
+ it 'informs the user of the impossibility' do
+ expect { subject.call }.to raise_error(/already ensured as absent/)
+ end
+ end
+ end
+ end
+end
diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
new file mode 100644
index 0000000000..d4a85a4150
--- /dev/null
+++ b/spec/defines/key_spec.rb
@@ -0,0 +1,323 @@
+require 'spec_helper'
+
+describe 'apt::key' do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+
+ GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+
+ let :title do
+ GPG_KEY_ID
+ end
+
+ describe 'normal operation' do
+ describe 'default options' do
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => title,
+ :ensure => 'present',
+ :source => nil,
+ :server => 'keyserver.ubuntu.com',
+ :content => nil,
+ :options => nil,
+ })
+ end
+ it 'contains the apt_key present anchor' do
+ is_expected.to contain_anchor("apt_key #{title} present")
+ end
+ end
+
+ describe 'title and key =>' do
+ let :title do
+ 'puppetlabs'
+ end
+
+ let :params do {
+ :id => GPG_KEY_ID,
+ } end
+
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => GPG_KEY_ID,
+ :ensure => 'present',
+ :source => nil,
+ :server => 'keyserver.ubuntu.com',
+ :content => nil,
+ :options => nil,
+ })
+ end
+ it 'contains the apt_key present anchor' do
+ is_expected.to contain_anchor("apt_key #{GPG_KEY_ID} present")
+ end
+ end
+
+ describe 'ensure => absent' do
+ let :params do {
+ :ensure => 'absent',
+ } end
+
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => title,
+ :ensure => 'absent',
+ :source => nil,
+ :server => 'keyserver.ubuntu.com',
+ :content => nil,
+ :keyserver => nil,
+ })
+ end
+ it 'contains the apt_key absent anchor' do
+ is_expected.to contain_anchor("apt_key #{title} absent")
+ end
+ end
+
+ describe 'set a bunch of things!' do
+ let :params do {
+ :content => 'GPG key content',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :server => 'pgp.mit.edu',
+ :options => 'debug',
+ } end
+
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => title,
+ :ensure => 'present',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :server => 'pgp.mit.edu',
+ :content => params[:content],
+ :options => 'debug',
+ })
+ end
+ it 'contains the apt_key present anchor' do
+ is_expected.to contain_anchor("apt_key #{title} present")
+ end
+ end
+
+ context "domain with dash" do
+ let(:params) do{
+ :server => 'p-gp.m-it.edu',
+ } end
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => title,
+ :server => 'p-gp.m-it.edu',
+ })
+ end
+ end
+
+ context "url" do
+ let :params do
+ {
+ :server => 'hkp://pgp.mit.edu',
+ }
+ end
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => title,
+ :server => 'hkp://pgp.mit.edu',
+ })
+ end
+ end
+ context "url with port number" do
+ let :params do
+ {
+ :server => 'hkp://pgp.mit.edu:80',
+ }
+ end
+ it 'contains the apt_key' do
+ is_expected.to contain_apt_key(title).with({
+ :id => title,
+ :server => 'hkp://pgp.mit.edu:80',
+ })
+ end
+ end
+ end
+
+ describe 'validation' do
+ context "domain begin with dash" do
+ let(:params) do{
+ :server => '-pgp.mit.edu',
+ } end
+ it 'fails' do
+ expect { subject.call } .to raise_error(/does not match/)
+ end
+ end
+
+ context "domain begin with dot" do
+ let(:params) do{
+ :server => '.pgp.mit.edu',
+ } end
+ it 'fails' do
+ expect { subject.call } .to raise_error(/does not match/)
+ end
+ end
+
+ context "domain end with dot" do
+ let(:params) do{
+ :server => "pgp.mit.edu.",
+ } end
+ it 'fails' do
+ expect { subject.call } .to raise_error(/does not match/)
+ end
+ end
+ context "exceed character url" do
+ let :params do
+ {
+ :server => 'hkp://pgpiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii.mit.edu'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "incorrect port number url" do
+ let :params do
+ {
+ :server => 'hkp://pgp.mit.edu:8008080'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "incorrect protocol for url" do
+ let :params do
+ {
+ :server => 'abc://pgp.mit.edu:80'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "missing port number url" do
+ let :params do
+ {
+ :server => 'hkp://pgp.mit.edu:'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "url ending with a dot" do
+ let :params do
+ {
+ :server => 'hkp://pgp.mit.edu.'
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context "url begin with a dash" do
+ let(:params) do{
+ :server => "hkp://-pgp.mit.edu",
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+ context 'invalid key' do
+ let :title do
+ 'Out of rum. Why? Why are we out of rum?'
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ context 'invalid source' do
+ let :params do {
+ :source => 'afp://puppetlabs.com/key.gpg',
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ context 'invalid content' do
+ let :params do {
+ :content => [],
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/is not a string/)
+ end
+ end
+
+ context 'invalid server' do
+ let :params do {
+ :server => 'two bottles of rum',
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ context 'invalid options' do
+ let :params do {
+ :options => {},
+ } end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/is not a string/)
+ end
+ end
+
+ context 'invalid ensure' do
+ let :params do
+ {
+ :ensure => 'foo',
+ }
+ end
+ it 'fails' do
+ expect { subject.call }.to raise_error(/does not match/)
+ end
+ end
+
+ describe 'duplication' do
+ context 'two apt::key resources for same key, different titles' do
+ let :pre_condition do
+ "class { 'apt': }
+ apt::key { 'duplicate': id => '#{title}', }"
+ end
+
+ it 'contains two apt::key resources' do
+ is_expected.to contain_apt__key('duplicate').with({
+ :id => title,
+ :ensure => 'present',
+ })
+ is_expected.to contain_apt__key(title).with({
+ :id => title,
+ :ensure => 'present',
+ })
+ end
+
+ it 'contains only a single apt_key' do
+ is_expected.to contain_apt_key('duplicate').with({
+ :id => title,
+ :ensure => 'present',
+ :source => nil,
+ :server => 'keyserver.ubuntu.com',
+ :content => nil,
+ :options => nil,
+ })
+ is_expected.not_to contain_apt_key(title)
+ end
+ end
+
+ context 'two apt::key resources, different ensure' do
+ let :pre_condition do
+ "class { 'apt': }
+ apt::key { 'duplicate': id => '#{title}', ensure => 'absent', }"
+ end
+ it 'informs the user of the impossibility' do
+ expect { subject.call }.to raise_error(/already ensured as absent/)
+ end
+ end
+ end
+ end
+end
diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb
new file mode 100644
index 0000000000..9fb28c6652
--- /dev/null
+++ b/spec/defines/pin_spec.rb
@@ -0,0 +1,145 @@
+require 'spec_helper'
+describe 'apt::pin', :type => :define do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let(:title) { 'my_pin' }
+
+ context 'defaults' do
+ it { is_expected.to contain_apt__setting("pref-my_pin").with_content(/Explanation: : my_pin\nPackage: \*\nPin: release a=my_pin\nPin-Priority: 0\n/)}
+ it { is_expected.to contain_apt__setting("pref-my_pin") }
+ end
+
+ context 'set version' do
+ let :params do
+ {
+ 'packages' => 'vim',
+ 'version' => '1',
+ }
+ end
+ it { is_expected.to contain_apt__setting("pref-my_pin").with_content(/Explanation: : my_pin\nPackage: vim\nPin: version 1\nPin-Priority: 0\n/)}
+ it { is_expected.to contain_apt__setting("pref-my_pin") }
+ end
+
+ context 'set origin' do
+ let :params do
+ {
+ 'packages' => 'vim',
+ 'origin' => 'test',
+ }
+ end
+ it { is_expected.to contain_apt__setting("pref-my_pin").with_content(/Explanation: : my_pin\nPackage: vim\nPin: origin test\nPin-Priority: 0\n/)}
+ it { is_expected.to contain_apt__setting("pref-my_pin") }
+ end
+
+ context 'not defaults' do
+ let :params do
+ {
+ 'explanation' => 'foo',
+ 'order' => 99,
+ 'release' => '1',
+ 'codename' => 'bar',
+ 'release_version' => '2',
+ 'component' => 'baz',
+ 'originator' => 'foobar',
+ 'label' => 'foobaz',
+ 'priority' => 10,
+ }
+ end
+ it { is_expected.to contain_apt__setting("pref-my_pin").with_content(/Explanation: foo\nPackage: \*\nPin: release a=1, n=bar, v=2, c=baz, o=foobar, l=foobaz\nPin-Priority: 10\n/) }
+ it { is_expected.to contain_apt__setting("pref-my_pin").with({
+ 'priority' => 99,
+ })
+ }
+ end
+
+ context 'ensure absent' do
+ let :params do
+ {
+ 'ensure' => 'absent'
+ }
+ end
+ it { is_expected.to contain_apt__setting("pref-my_pin").with({
+ 'ensure' => 'absent',
+ })
+ }
+ end
+
+ context 'bad characters' do
+ let(:title) { 'such bad && wow!' }
+ it { is_expected.to contain_apt__setting("pref-such__bad____wow_") }
+ end
+
+ describe 'validation' do
+ context 'invalid order' do
+ let :params do
+ {
+ 'order' => 'foo',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /Only integers are allowed/)
+ end
+ end
+
+ context 'packages == * and version' do
+ let :params do
+ {
+ 'version' => '1',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /parameter version cannot be used in general form/)
+ end
+ end
+
+ context 'packages == * and release and origin' do
+ let :params do
+ {
+ 'origin' => 'test',
+ 'release' => 'foo',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /parameters release and origin are mutually exclusive/)
+ end
+ end
+
+ context 'specific form with release and origin' do
+ let :params do
+ {
+ 'release' => 'foo',
+ 'origin' => 'test',
+ 'packages' => 'vim',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /parameters release, origin, and version are mutually exclusive/)
+ end
+ end
+
+ context 'specific form with version and origin' do
+ let :params do
+ {
+ 'version' => '1',
+ 'origin' => 'test',
+ 'packages' => 'vim',
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /parameters release, origin, and version are mutually exclusive/)
+ end
+ end
+ end
+end
diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
new file mode 100644
index 0000000000..74b52ea9c9
--- /dev/null
+++ b/spec/defines/ppa_spec.rb
@@ -0,0 +1,378 @@
+require 'spec_helper'
+describe 'apt::ppa' do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+
+ describe 'defaults' do
+ let :facts do
+ {
+ :lsbdistrelease => '11.04',
+ :lsbdistcodename => 'natty',
+ :operatingsystem => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistid => 'Ubuntu',
+ :puppetversion => Puppet.version,
+ }
+ end
+
+ let(:title) { 'ppa:needs/such.substitution/wow+type' }
+ it { is_expected.to_not contain_package('python-software-properties') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow+type').that_notifies('Class[Apt::Update]').with({
+ :environment => [],
+ :command => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type',
+ :unless => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow_type-natty.list',
+ :user => 'root',
+ :logoutput => 'on_failure',
+ })
+ }
+ end
+
+ describe 'Ubuntu 15.10 sources.list filename' do
+ let :facts do
+ {
+ :lsbdistrelease => '15.10',
+ :lsbdistcodename => 'wily',
+ :operatingsystem => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistid => 'Ubuntu',
+ :puppetversion => Puppet.version,
+ }
+ end
+
+ let(:title) { 'ppa:user/foo' }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
+ :environment => [],
+ :command => '/usr/bin/add-apt-repository -y ppa:user/foo',
+ :unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-ubuntu-foo-wily.list',
+ :user => 'root',
+ :logoutput => 'on_failure',
+ })
+ }
+ end
+
+ describe 'ppa depending on ppa, MODULES-1156' do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ end
+
+ describe 'package_name => software-properties-common' do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ let :params do
+ {
+ :package_name => 'software-properties-common',
+ :package_manage => true,
+ }
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '11.04',
+ :lsbdistcodename => 'natty',
+ :operatingsystem => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistid => 'Ubuntu',
+ :puppetversion => Puppet.version,
+ }
+ end
+
+ let(:title) { 'ppa:needs/such.substitution/wow' }
+ it { is_expected.to contain_package('software-properties-common') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with({
+ 'environment' => [],
+ 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow',
+ 'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
+ 'user' => 'root',
+ 'logoutput' => 'on_failure',
+ })
+ }
+
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({
+ 'ensure' => 'file',
+ })
+ }
+ end
+
+ describe 'package_manage => true, multiple ppas, MODULES-2873' do
+ let :pre_condition do
+ 'class { "apt": }
+ apt::ppa {"ppa:user/foo":
+ package_manage => true
+ }'
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '11.04',
+ :lsbdistcodename => 'natty',
+ :operatingsystem => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistid => 'Ubuntu',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :package_manage => true,
+ }
+ end
+
+ let(:title) { 'ppa:user/bar' }
+ it { is_expected.to contain_package('python-software-properties') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:user/bar').that_notifies('Class[Apt::Update]').with({
+ 'environment' => [],
+ 'command' => '/usr/bin/add-apt-repository -y ppa:user/bar',
+ 'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/user-bar-natty.list',
+ 'user' => 'root',
+ 'logoutput' => 'on_failure',
+ })
+ }
+
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/user-bar-natty.list').that_requires('Exec[add-apt-repository-ppa:user/bar]').with({
+ 'ensure' => 'file',
+ })
+ }
+ end
+
+ describe 'package_manage => false' do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '11.04',
+ :lsbdistcodename => 'natty',
+ :operatingsystem => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistid => 'Ubuntu',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :package_manage => false,
+ }
+ end
+
+ let(:title) { 'ppa:needs/such.substitution/wow' }
+ it { is_expected.to_not contain_package('python-software-properties') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:needs/such.substitution/wow').that_notifies('Class[Apt::Update]').with({
+ 'environment' => [],
+ 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow',
+ 'unless' => '/usr/bin/test -s /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list',
+ 'user' => 'root',
+ 'logoutput' => 'on_failure',
+ })
+ }
+
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-natty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with({
+ 'ensure' => 'file',
+ })
+ }
+ end
+
+ describe 'apt included, no proxy' do
+ let :pre_condition do
+ 'class { "apt": }
+ apt::ppa { "ppa:user/foo2": }
+ '
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '14.04',
+ :lsbdistcodename => 'trusty',
+ :operatingsystem => 'Ubuntu',
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :options => '',
+ :package_manage => true,
+ :require => 'Apt::Ppa[ppa:user/foo2]',
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ it { is_expected.to compile.with_all_deps }
+ it { is_expected.to contain_package('software-properties-common') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
+ :environment => [],
+ :command => '/usr/bin/add-apt-repository ppa:user/foo',
+ :unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
+ :user => 'root',
+ :logoutput => 'on_failure',
+ })
+ }
+ end
+
+ describe 'apt included, proxy host' do
+ let :pre_condition do
+ 'class { "apt":
+ proxy => { "host" => "localhost" },
+ }'
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '14.04',
+ :lsbdistcodename => 'trusty',
+ :operatingsystem => 'Ubuntu',
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ 'options' => '',
+ 'package_manage' => true,
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ it { is_expected.to contain_package('software-properties-common') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
+ :environment => ['http_proxy=http://localhost:8080'],
+ :command => '/usr/bin/add-apt-repository ppa:user/foo',
+ :unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
+ :user => 'root',
+ :logoutput => 'on_failure',
+ })
+ }
+ end
+
+ describe 'apt included, proxy host and port' do
+ let :pre_condition do
+ 'class { "apt":
+ proxy => { "host" => "localhost", "port" => 8180 },
+ }'
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '14.04',
+ :lsbdistcodename => 'trusty',
+ :operatingsystem => 'Ubuntu',
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :options => '',
+ :package_manage => true,
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ it { is_expected.to contain_package('software-properties-common') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
+ :environment => ['http_proxy=http://localhost:8180'],
+ :command => '/usr/bin/add-apt-repository ppa:user/foo',
+ :unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
+ :user => 'root',
+ :logoutput => 'on_failure',
+ })
+ }
+ end
+
+ describe 'apt included, proxy host and port and https' do
+ let :pre_condition do
+ 'class { "apt":
+ proxy => { "host" => "localhost", "port" => 8180, "https" => true },
+ }'
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '14.04',
+ :lsbdistcodename => 'trusty',
+ :operatingsystem => 'Ubuntu',
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :options => '',
+ :package_manage => true,
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ it { is_expected.to contain_package('software-properties-common') }
+ it { is_expected.to contain_exec('add-apt-repository-ppa:user/foo').that_notifies('Class[Apt::Update]').with({
+ :environment => ['http_proxy=http://localhost:8180', 'https_proxy=https://localhost:8180'],
+ :command => '/usr/bin/add-apt-repository ppa:user/foo',
+ :unless => '/usr/bin/test -s /etc/apt/sources.list.d/user-foo-trusty.list',
+ :user => 'root',
+ :logoutput => 'on_failure',
+ })
+ }
+ end
+
+ describe 'ensure absent' do
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+ let :facts do
+ {
+ :lsbdistrelease => '14.04',
+ :lsbdistcodename => 'trusty',
+ :operatingsystem => 'Ubuntu',
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ let :params do
+ {
+ :ensure => 'absent'
+ }
+ end
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/user-foo-trusty.list').that_notifies('Class[Apt::Update]').with({
+ :ensure => 'absent',
+ })
+ }
+ end
+
+ context 'validation' do
+ describe 'no release' do
+ let :facts do
+ {
+ :lsbdistrelease => '14.04',
+ :operatingsystem => 'Ubuntu',
+ :lsbdistid => 'Ubuntu',
+ :osfamily => 'Debian',
+ :lsbdistcodeanme => nil,
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
+ end
+ end
+
+ describe 'not ubuntu' do
+ let :facts do
+ {
+ :lsbdistrelease => '6.0.7',
+ :lsbdistcodename => 'wheezy',
+ :operatingsystem => 'Debian',
+ :lsbdistid => 'debian',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:title) { 'ppa:user/foo' }
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /not currently supported on Debian/)
+ end
+ end
+ end
+end
diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
new file mode 100644
index 0000000000..a326bdbdd3
--- /dev/null
+++ b/spec/defines/setting_spec.rb
@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+describe 'apt::setting' do
+ let(:pre_condition) { 'class { "apt": }' }
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let(:title) { 'conf-teddybear' }
+
+ let(:default_params) { { :content => 'di' } }
+
+ describe 'when using the defaults' do
+ context 'without source or content' do
+ it do
+ expect { subject.call }.to raise_error(Puppet::Error, /needs either of /)
+ end
+ end
+
+ context 'with title=conf-teddybear ' do
+ let(:params) { default_params }
+ it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]') }
+ end
+
+ context 'with title=pref-teddybear' do
+ let(:title) { 'pref-teddybear' }
+ let(:params) { default_params }
+ it { is_expected.to contain_file('/etc/apt/preferences.d/teddybear.pref').that_notifies('Class[Apt::Update]') }
+ end
+
+ context 'with title=list-teddybear' do
+ let(:title) { 'list-teddybear' }
+ let(:params) { default_params }
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/teddybear.list').that_notifies('Class[Apt::Update]') }
+ end
+
+ context 'with source' do
+ let(:params) { { :source => 'puppet:///la/die/dah' } }
+ it {
+ is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with({
+ :ensure => 'file',
+ :owner => 'root',
+ :group => 'root',
+ :mode => '0644',
+ :source => "#{params[:source]}",
+ })}
+ end
+
+ context 'with content' do
+ let(:params) { default_params }
+ it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with({
+ :ensure => 'file',
+ :owner => 'root',
+ :group => 'root',
+ :mode => '0644',
+ :content => "#{params[:content]}",
+ })}
+ end
+ end
+
+ describe 'settings requiring settings, MODULES-769' do
+ let(:pre_condition) do
+ 'class { "apt": }
+ apt::setting { "list-teddybear": content => "foo" }
+ '
+ end
+ let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'wheezy', :puppetversion => Puppet.version, } }
+ let(:title) { 'conf-teddybear' }
+ let(:default_params) { { :content => 'di' } }
+
+ let(:params) { default_params.merge({ :require => 'Apt::Setting[list-teddybear]' }) }
+
+ it { is_expected.to compile.with_all_deps }
+ end
+
+ describe 'when trying to pull one over' do
+ context 'with source and content' do
+ let(:params) { default_params.merge({ :source => 'la' }) }
+ it do
+ expect { subject.call }.to raise_error(Puppet::Error, /cannot have both /)
+ end
+ end
+
+ context 'with title=ext-teddybear' do
+ let(:title) { 'ext-teddybear' }
+ let(:params) { default_params }
+ it do
+ expect { subject.call }.to raise_error(Puppet::Error, /must start with /)
+ end
+ end
+
+ context 'with ensure=banana' do
+ let(:params) { default_params.merge({ :ensure => 'banana' }) }
+ it do
+ expect { subject.call }.to raise_error(Puppet::Error, /"banana" does not /)
+ end
+ end
+
+ context 'with priority=1.2' do
+ let(:params) { default_params.merge({ :priority => 1.2 }) }
+ it do
+ expect { subject.call }.to raise_error(Puppet::Error, /be an integer /)
+ end
+ end
+ end
+
+ describe 'with priority=100' do
+ let(:params) { default_params.merge({ :priority => 100 }) }
+ it { is_expected.to contain_file('/etc/apt/apt.conf.d/100teddybear').that_notifies('Class[Apt::Update]') }
+ end
+
+ describe 'with ensure=absent' do
+ let(:params) { default_params.merge({ :ensure => 'absent' }) }
+ it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with({
+ :ensure => 'absent',
+ })}
+ end
+end
diff --git a/spec/defines/source_compat_spec.rb b/spec/defines/source_compat_spec.rb
new file mode 100644
index 0000000000..0b98176e2a
--- /dev/null
+++ b/spec/defines/source_compat_spec.rb
@@ -0,0 +1,158 @@
+require 'spec_helper'
+
+describe 'apt::source', :type => :define do
+ GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+
+ let :title do
+ 'my_source'
+ end
+
+ context 'mostly defaults' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ }
+ end
+
+ let :params do
+ {
+ 'include_deb' => false,
+ 'include_src' => true,
+ 'location' => 'http://debian.mirror.iweb.ca/debian/',
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with_content(/# my_source\ndeb-src http:\/\/debian\.mirror\.iweb\.ca\/debian\/ wheezy main\n/)
+ }
+ end
+
+ context 'no defaults' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian'
+ }
+ end
+ let :params do
+ {
+ 'comment' => 'foo',
+ 'location' => 'http://debian.mirror.iweb.ca/debian/',
+ 'release' => 'sid',
+ 'repos' => 'testing',
+ 'include_src' => false,
+ 'required_packages' => 'vim',
+ 'key' => GPG_KEY_ID,
+ 'key_server' => 'pgp.mit.edu',
+ 'key_content' => 'GPG key content',
+ 'key_source' => 'http://apt.puppetlabs.com/pubkey.gpg',
+ 'pin' => '10',
+ 'architecture' => 'x86_64',
+ 'trusted_source' => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
+ }
+
+ it { is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with({
+ 'ensure' => 'present',
+ 'priority' => '10',
+ 'origin' => 'debian.mirror.iweb.ca',
+ })
+ }
+
+ it { is_expected.to contain_exec("Required packages: 'vim' for my_source").that_comes_before('Apt::Setting[list-my_source]').with({
+ 'command' => '/usr/bin/apt-get -y install vim',
+ 'logoutput' => 'on_failure',
+ 'refreshonly' => true,
+ 'tries' => '3',
+ 'try_sleep' => '1',
+ })
+ }
+
+ it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with({
+ 'ensure' => 'present',
+ 'id' => GPG_KEY_ID,
+ 'key_server' => 'pgp.mit.edu',
+ 'key_content' => 'GPG key content',
+ 'key_source' => 'http://apt.puppetlabs.com/pubkey.gpg',
+ })
+ }
+ end
+
+ context 'trusted_source true' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian'
+ }
+ end
+ let :params do
+ {
+ 'include_src' => false,
+ 'location' => 'http://debian.mirror.iweb.ca/debian/',
+ 'trusted_source' => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with_content(/# my_source\ndeb \[trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ wheezy main\n/) }
+ end
+
+ context 'architecture equals x86_64' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian'
+ }
+ end
+ let :params do
+ {
+ 'location' => 'http://debian.mirror.iweb.ca/debian/',
+ 'architecture' => 'x86_64',
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with_content(/# my_source\ndeb \[arch=x86_64\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ wheezy main\n/)
+ }
+ end
+
+ context 'ensure => absent' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian'
+ }
+ end
+ let :params do
+ {
+ 'ensure' => 'absent',
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ 'ensure' => 'absent'
+ })
+ }
+ end
+
+ describe 'validation' do
+ context 'no release' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :osfamily => 'Debian'
+ }
+ end
+
+ it do
+ expect { subject.call }.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
+ end
+ end
+ end
+end
diff --git a/spec/defines/source_spec.rb b/spec/defines/source_spec.rb
new file mode 100644
index 0000000000..cfae55cc8f
--- /dev/null
+++ b/spec/defines/source_spec.rb
@@ -0,0 +1,391 @@
+require 'spec_helper'
+
+describe 'apt::source' do
+ GPG_KEY_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'
+
+ let :pre_condition do
+ 'class { "apt": }'
+ end
+
+ let :title do
+ 'my_source'
+ end
+
+ context 'defaults' do
+ context 'without location' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /source entry without specifying a location/)
+ end
+ end
+ context 'with location' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :location => 'hello.there', } }
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).without_content(/# my_source\ndeb-src hello.there wheezy main\n/)
+ }
+ end
+ end
+
+ describe 'no defaults' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+
+ context 'with complex pin' do
+ let :params do
+ {
+ :location => 'hello.there',
+ :pin => { 'release' => 'wishwash',
+ 'explanation' => 'wishwash',
+ 'priority' => 1001, },
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/hello.there wheezy main\n/)
+ }
+
+ it { is_expected.to contain_file('/etc/apt/sources.list.d/my_source.list').that_notifies('Class[Apt::Update]')}
+
+ it { is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :priority => 1001,
+ :explanation => 'wishwash',
+ :release => 'wishwash',
+ })
+ }
+ end
+
+ context 'with simple key' do
+ let :params do
+ {
+ :comment => 'foo',
+ :location => 'http://debian.mirror.iweb.ca/debian/',
+ :release => 'sid',
+ :repos => 'testing',
+ :key => GPG_KEY_ID,
+ :pin => '10',
+ :architecture => 'x86_64',
+ :allow_unsigned => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
+ }
+
+ it { is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :priority => '10',
+ :origin => 'debian.mirror.iweb.ca',
+ })
+ }
+
+ it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :id => GPG_KEY_ID,
+ })
+ }
+ end
+
+ context 'with complex key' do
+ let :params do
+ {
+ :comment => 'foo',
+ :location => 'http://debian.mirror.iweb.ca/debian/',
+ :release => 'sid',
+ :repos => 'testing',
+ :key => { 'id' => GPG_KEY_ID, 'server' => 'pgp.mit.edu',
+ 'content' => 'GPG key content',
+ 'source' => 'http://apt.puppetlabs.com/pubkey.gpg',},
+ :pin => '10',
+ :architecture => 'x86_64',
+ :allow_unsigned => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
+ }
+
+ it { is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :priority => '10',
+ :origin => 'debian.mirror.iweb.ca',
+ })
+ }
+
+ it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :id => GPG_KEY_ID,
+ :server => 'pgp.mit.edu',
+ :content => 'GPG key content',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ })
+ }
+ end
+
+ context 'with simple key' do
+ let :params do
+ {
+ :comment => 'foo',
+ :location => 'http://debian.mirror.iweb.ca/debian/',
+ :release => 'sid',
+ :repos => 'testing',
+ :key => GPG_KEY_ID,
+ :pin => '10',
+ :architecture => 'x86_64',
+ :allow_unsigned => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/# foo\ndeb \[arch=x86_64 trusted=yes\] http:\/\/debian\.mirror\.iweb\.ca\/debian\/ sid testing\n/).without_content(/deb-src/)
+ }
+
+ it { is_expected.to contain_apt__pin('my_source').that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :priority => '10',
+ :origin => 'debian.mirror.iweb.ca',
+ })
+ }
+
+ it { is_expected.to contain_apt__key("Add key: #{GPG_KEY_ID} from Apt::Source my_source").that_comes_before('Apt::Setting[list-my_source]').with({
+ :ensure => 'present',
+ :id => GPG_KEY_ID,
+ })
+ }
+ end
+ end
+
+ context 'allow_unsigned true' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :allow_unsigned => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/# my_source\ndeb \[trusted=yes\] hello.there wheezy main\n/)
+ }
+ end
+
+ context 'architecture equals x86_64' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :include => {'deb' => false, 'src' => true,},
+ :architecture => 'x86_64',
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/# my_source\ndeb-src \[arch=x86_64\] hello.there wheezy main\n/)
+ }
+ end
+
+ context 'include_src => true' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :include_src => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/# my_source\ndeb hello.there wheezy main\ndeb-src hello.there wheezy main\n/)
+ }
+ end
+
+ context 'include_deb => false' do
+ let :facts do
+ {
+ :lsbdistid => 'debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :include_deb => false,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).without_content(/deb-src hello.there wheezy main\n/)
+ }
+ it { is_expected.to contain_apt__setting('list-my_source').without_content(/deb hello.there wheezy main\n/) }
+ end
+
+ context 'include_src => true and include_deb => false' do
+ let :facts do
+ {
+ :lsbdistid => 'debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :include_deb => false,
+ :include_src => true,
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/deb-src hello.there wheezy main\n/)
+ }
+ it { is_expected.to contain_apt__setting('list-my_source').without_content(/deb hello.there wheezy main\n/) }
+ end
+
+ context 'include precedence' do
+ let :facts do
+ {
+ :lsbdistid => 'debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :include_deb => true,
+ :include_src => false,
+ :include => { 'deb' => false, 'src' => true },
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'present',
+ }).with_content(/deb-src hello.there wheezy main\n/)
+ }
+ it { is_expected.to contain_apt__setting('list-my_source').without_content(/deb hello.there wheezy main\n/) }
+ end
+
+ context 'ensure => absent' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :ensure => 'absent',
+ }
+ end
+
+ it { is_expected.to contain_apt__setting('list-my_source').with({
+ :ensure => 'absent'
+ })
+ }
+ end
+
+ describe 'validation' do
+ context 'no release' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let(:params) { { :location => 'hello.there', } }
+
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /lsbdistcodename fact not available: release parameter required/)
+ end
+ end
+
+ context 'invalid pin' do
+ let :facts do
+ {
+ :lsbdistid => 'Debian',
+ :lsbdistcodename => 'wheezy',
+ :osfamily => 'Debian',
+ :puppetversion => Puppet.version,
+ }
+ end
+ let :params do
+ {
+ :location => 'hello.there',
+ :pin => true,
+ }
+ end
+
+ it do
+ expect {
+ subject.call
+ }.to raise_error(Puppet::Error, /invalid value for pin/)
+ end
+ end
+
+ end
+end
diff --git a/spec/spec.opts b/spec/spec.opts
new file mode 100644
index 0000000000..91cd6427ed
--- /dev/null
+++ b/spec/spec.opts
@@ -0,0 +1,6 @@
+--format
+s
+--colour
+--loadby
+mtime
+--backtrace
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000000..22d5d689f4
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,8 @@
+#This file is generated by ModuleSync, do not edit.
+require 'puppetlabs_spec_helper/module_spec_helper'
+
+# put local configuration and setup into spec_helper_local
+begin
+ require 'spec_helper_local'
+rescue LoadError
+end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
new file mode 100644
index 0000000000..409ce68b29
--- /dev/null
+++ b/spec/spec_helper_acceptance.rb
@@ -0,0 +1,24 @@
+require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
+
+run_puppet_install_helper
+
+UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris']
+
+RSpec.configure do |c|
+ # Project root
+ proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+ # Readable test descriptions
+ c.formatter = :documentation
+
+ # Configure all nodes in nodeset
+ c.before :suite do
+ # Install module and dependencies
+ hosts.each do |host|
+ copy_module_to(host, :source => proj_root, :module_name => 'apt')
+ shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
+ on host, puppet('module install puppetlabs-stdlib --version 4.5.0'), { :acceptable_exit_codes => [0,1] }
+ end
+ end
+end
diff --git a/spec/unit/facter/apt_has_updates_spec.rb b/spec/unit/facter/apt_has_updates_spec.rb
new file mode 100644
index 0000000000..b6eee265f7
--- /dev/null
+++ b/spec/unit/facter/apt_has_updates_spec.rb
@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe 'apt_has_updates fact' do
+ subject { Facter.fact(:apt_has_updates).value }
+ after(:each) { Facter.clear }
+
+ describe 'on non-Debian distro' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'RedHat'
+ }
+ it { is_expected.to be_nil }
+ end
+
+ describe 'on Debian based distro missing update-notifier-common' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns false
+ }
+ it { is_expected.to be_nil }
+ end
+
+ describe 'on Debian based distro with broken packages' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "E: Error: BrokenCount > 0"
+ }
+ it { is_expected.to be_nil }
+ end
+
+ describe 'on Debian based distro with unknown error with semicolons' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "E: Unknown Error: 'This error contains something that could be parsed like 4;3' (10)"
+ }
+ it { is_expected.to be_nil }
+ end
+
+ describe 'on Debian based distro' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "4;3"
+ }
+ it { is_expected.to be true }
+ end
+end
+
diff --git a/spec/unit/facter/apt_package_updates_spec.rb b/spec/unit/facter/apt_package_updates_spec.rb
new file mode 100644
index 0000000000..08bfb42a34
--- /dev/null
+++ b/spec/unit/facter/apt_package_updates_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'apt_package_updates fact' do
+ subject { Facter.fact(:apt_package_updates).value }
+ after(:each) { Facter.clear }
+
+ describe 'when apt has no updates' do
+ before {
+ Facter.fact(:apt_has_updates).stubs(:value).returns false
+ }
+ it { is_expected.to be nil }
+ end
+
+ describe 'when apt has updates' do
+ before {
+ Facter.fact(:osfamily).stubs(:value).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "1;2"
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check -p 2>&1').returns "puppet-common\nlinux-generic\nlinux-image-generic"
+ }
+ it {
+ if Facter.version < '2.0.0'
+ is_expected.to eq('puppet-common,linux-generic,linux-image-generic')
+ else
+ is_expected.to eq(['puppet-common', 'linux-generic', 'linux-image-generic'])
+ end
+ }
+ end
+end
diff --git a/spec/unit/facter/apt_reboot_required_spec.rb b/spec/unit/facter/apt_reboot_required_spec.rb
new file mode 100644
index 0000000000..ed6efd075e
--- /dev/null
+++ b/spec/unit/facter/apt_reboot_required_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'apt_reboot_required fact' do
+ subject { Facter.fact(:apt_reboot_required).value }
+ after(:each) { Facter.clear }
+
+ describe 'if a reboot is required' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
+ File.stubs(:file?).returns true
+ File.expects(:file?).at_least(1).with('/var/run/reboot-required').returns true
+ }
+ it { is_expected.to eq true }
+ end
+
+ describe 'if a reboot is not required' do
+ before {
+ Facter.fact(:osfamily).expects(:value).at_least(1).returns 'Debian'
+ File.stubs(:file?).returns true
+ File.expects(:file?).at_least(1).with('/var/run/reboot-required').returns false
+ }
+ it { is_expected.to eq false }
+ end
+
+end
diff --git a/spec/unit/facter/apt_security_updates_spec.rb b/spec/unit/facter/apt_security_updates_spec.rb
new file mode 100644
index 0000000000..83aa6ff620
--- /dev/null
+++ b/spec/unit/facter/apt_security_updates_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'apt_security_updates fact' do
+ subject { Facter.fact(:apt_security_updates).value }
+ after(:each) { Facter.clear }
+
+ describe 'when apt has no updates' do
+ before {
+ Facter.fact(:apt_has_updates).stubs(:value).returns false
+ }
+ it { is_expected.to be nil }
+ end
+
+ describe 'when apt has security updates' do
+ before {
+ Facter.fact(:osfamily).stubs(:value).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "14;7"
+ }
+ it { is_expected.to eq(7) }
+ end
+
+end
diff --git a/spec/unit/facter/apt_update_last_success_spec.rb b/spec/unit/facter/apt_update_last_success_spec.rb
new file mode 100644
index 0000000000..cb32a5ef02
--- /dev/null
+++ b/spec/unit/facter/apt_update_last_success_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe 'apt_update_last_success fact' do
+ subject { Facter.fact(:apt_update_last_success).value }
+ after(:each) { Facter.clear }
+
+ describe 'on Debian based distro which has not yet created the update-success-stamp file' do
+ before {
+ Facter.fact(:osfamily).stubs(:value).returns 'Debian'
+ File.stubs(:exists?).returns false
+ }
+ it 'should have a value of -1' do
+ is_expected.to eq(-1)
+ end
+ end
+
+ describe 'on Debian based distro which has created the update-success-stamp' do
+ before {
+ Facter.fact(:osfamily).stubs(:value).returns 'Debian'
+ File.stubs(:exists?).returns true
+ File.stubs(:mtime).returns 1407660561
+ }
+ it 'should have the value of the mtime of the file' do
+ is_expected.to eq(1407660561)
+ end
+ end
+
+end
diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb
new file mode 100644
index 0000000000..781ffd6972
--- /dev/null
+++ b/spec/unit/facter/apt_updates_spec.rb
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe 'apt_updates fact' do
+ subject { Facter.fact(:apt_updates).value }
+ after(:each) { Facter.clear }
+
+ describe 'when apt has no updates' do
+ before {
+ Facter.fact(:apt_has_updates).stubs(:value).returns false
+ }
+ it { is_expected.to be nil }
+ end
+
+ describe 'when apt has updates' do
+ before {
+ Facter.fact(:osfamily).stubs(:value).returns 'Debian'
+ File.stubs(:executable?) # Stub all other calls
+ Facter::Util::Resolution.stubs(:exec) # Catch all other calls
+ File.expects(:executable?).with('/usr/lib/update-notifier/apt-check').returns true
+ Facter::Util::Resolution.expects(:exec).with('/usr/lib/update-notifier/apt-check 2>&1').returns "14;7"
+ }
+ it { is_expected.to eq(14) }
+ end
+
+end
diff --git a/spec/unit/puppet/type/apt_key_spec.rb b/spec/unit/puppet/type/apt_key_spec.rb
new file mode 100644
index 0000000000..e412b50664
--- /dev/null
+++ b/spec/unit/puppet/type/apt_key_spec.rb
@@ -0,0 +1,181 @@
+require 'spec_helper'
+require 'puppet'
+
+describe Puppet::Type::type(:apt_key) do
+ context 'only namevar 32bit key id' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30'
+ )}
+ it 'id is set' do
+ expect(resource[:id]).to eq '4BD6EC30'
+ end
+
+ it 'name is set to id' do
+ expect(resource[:name]).to eq '4BD6EC30'
+ end
+
+ it 'keyserver is default' do
+ expect(resource[:server]).to eq :'keyserver.ubuntu.com'
+ end
+
+ it 'source is not set' do
+ expect(resource[:source]).to eq nil
+ end
+
+ it 'content is not set' do
+ expect(resource[:content]).to eq nil
+ end
+ end
+
+ context 'with a lowercase 32bit key id' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '4bd6ec30'
+ )}
+ it 'id is set' do
+ expect(resource[:id]).to eq '4BD6EC30'
+ end
+ end
+
+ context 'with a 64bit key id' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => 'FFFFFFFF4BD6EC30'
+ )}
+ it 'id is set' do
+ expect(resource[:id]).to eq 'FFFFFFFF4BD6EC30'
+ end
+ end
+
+ context 'with a 0x formatted key id' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '0x4BD6EC30'
+ )}
+ it 'id is set' do
+ expect(resource[:id]).to eq '4BD6EC30'
+ end
+ end
+
+ context 'with a 0x formatted lowercase key id' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '0x4bd6ec30'
+ )}
+ it 'id is set' do
+ expect(resource[:id]).to eq '4BD6EC30'
+ end
+ end
+
+ context 'with a 0x formatted 64bit key id' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '0xFFFFFFFF4BD6EC30'
+ )}
+ it 'id is set' do
+ expect(resource[:id]).to eq 'FFFFFFFF4BD6EC30'
+ end
+ end
+
+ context 'with source' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg'
+ )}
+
+ it 'source is set to the URL' do
+ expect(resource[:source]).to eq 'http://apt.puppetlabs.com/pubkey.gpg'
+ end
+ end
+
+ context 'with content' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :content => 'http://apt.puppetlabs.com/pubkey.gpg'
+ )}
+
+ it 'content is set to the string' do
+ expect(resource[:content]).to eq 'http://apt.puppetlabs.com/pubkey.gpg'
+ end
+ end
+
+ context 'with keyserver' do
+ let(:resource) { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :server => 'http://keyring.debian.org'
+ )}
+
+ it 'keyserver is set to Debian' do
+ expect(resource[:server]).to eq 'http://keyring.debian.org'
+ end
+ end
+
+ context 'validation' do
+ it 'raises an error if content and source are set' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :content => 'Completely invalid as a GPG key'
+ )}.to raise_error(/content and source are mutually exclusive/)
+ end
+
+ it 'raises an error if a weird length key is used' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => 'F4BD6EC30',
+ :source => 'http://apt.puppetlabs.com/pubkey.gpg',
+ :content => 'Completely invalid as a GPG key'
+ )}.to raise_error(/Valid values match/)
+ end
+
+ it 'raises an error when an invalid URI scheme is used in source' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'hkp://pgp.mit.edu'
+ )}.to raise_error(/Valid values match/)
+ end
+
+ it 'allows the http URI scheme in source' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'http://pgp.mit.edu'
+ )}.to_not raise_error
+ end
+
+ it 'allows the https URI scheme in source' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'https://pgp.mit.edu'
+ )}.to_not raise_error
+ end
+
+ it 'allows the https URI with username and password' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'https://testme:Password2@pgp.mit.edu'
+ )}.to_not raise_error
+ end
+
+ it 'allows the ftp URI scheme in source' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'ftp://pgp.mit.edu'
+ )}.to_not raise_error
+ end
+
+ it 'allows an absolute path in source' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => '/path/to/a/file'
+ )}.to_not raise_error
+ end
+
+ it 'allows 5-digit ports' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :source => 'http://pgp.mit.edu:12345/key'
+ )}.to_not raise_error
+ end
+
+ it 'allows 5-digit ports when using key servers' do
+ expect { Puppet::Type.type(:apt_key).new(
+ :id => '4BD6EC30',
+ :server => 'http://pgp.mit.edu:12345'
+ )}.to_not raise_error
+ end
+ end
+end
diff --git a/templates/15update-stamp.erb b/templates/15update-stamp.erb
new file mode 100644
index 0000000000..14ead83763
--- /dev/null
+++ b/templates/15update-stamp.erb
@@ -0,0 +1 @@
+APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};
diff --git a/templates/_conf_header.erb b/templates/_conf_header.erb
new file mode 100644
index 0000000000..bfa365e23e
--- /dev/null
+++ b/templates/_conf_header.erb
@@ -0,0 +1 @@
+// This file is managed by Puppet. DO NOT EDIT.
diff --git a/templates/_header.erb b/templates/_header.erb
new file mode 100644
index 0000000000..487e581c7b
--- /dev/null
+++ b/templates/_header.erb
@@ -0,0 +1 @@
+# This file is managed by Puppet. DO NOT EDIT.
diff --git a/templates/conf.erb b/templates/conf.erb
new file mode 100644
index 0000000000..a35d1d4f84
--- /dev/null
+++ b/templates/conf.erb
@@ -0,0 +1 @@
+<%= @content -%>
diff --git a/templates/pin.pref.erb b/templates/pin.pref.erb
new file mode 100644
index 0000000000..76936d7ca4
--- /dev/null
+++ b/templates/pin.pref.erb
@@ -0,0 +1,21 @@
+<%-
+@pin = "release a=#{@name}" # default value
+if @pin_release.length > 0
+ options = []
+ options.push("a=#{@release}") if @release.length > 0
+ options.push("n=#{@codename}") if @codename.length > 0
+ options.push("v=#{@release_version}") if @release_version.length > 0
+ options.push("c=#{@component}") if @component.length > 0
+ options.push("o=#{@originator}") if @originator.length > 0
+ options.push("l=#{@label}") if @label.length > 0
+ @pin = "release #{options.join(', ')}"
+elsif @version.length > 0
+ @pin = "version #{@version}"
+elsif @origin.length > 0
+ @pin = "origin #{@origin}"
+end
+-%>
+Explanation: <%= @_explanation %>
+Package: <%= @packages_string %>
+Pin: <%= @pin %>
+Pin-Priority: <%= @priority %>
diff --git a/templates/proxy.erb b/templates/proxy.erb
new file mode 100644
index 0000000000..670e3a7e87
--- /dev/null
+++ b/templates/proxy.erb
@@ -0,0 +1,4 @@
+Acquire::http::proxy "http://<%= @_proxy['host'] %>:<%= @_proxy['port'] %>/";
+<%- if @_proxy['https'] %>
+Acquire::https::proxy "https://<%= @_proxy['host'] %>:<%= @_proxy['port'] %>/";
+<%- end -%>
diff --git a/templates/source.list.erb b/templates/source.list.erb
index 345269162b..84cd2cf728 100644
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,5 +1,9 @@
-# <%= name %>
-deb <%= location %> <%= release %> <%= repos %>
-<%- if include_src then -%>
-deb-src <%= location %> <%= release %> <%= repos %>
+# <%= @comment %>
+<%- if @_include['deb'] then -%>
+deb <%- if @architecture or @_allow_unsigned -%>
+[<%- if @architecture %>arch=<%= @architecture %><% end %><%if @architecture and @_allow_unsigned %> <% end%><% if @_allow_unsigned %>trusted=yes<% end %>] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
+<%- end -%>
+<%- if @_include['src'] then -%>
+deb-src <%- if @architecture or @_allow_unsigned -%>
+[<%- if @architecture %>arch=<%= @architecture %><% end %><%if @architecture and @_allow_unsigned %> <% end%><% if @_allow_unsigned %>trusted=yes<% end %>] <%- end %><%= @location %> <%= @_release %> <%= @repos %>
<%- end -%>