diff -Nru puppet-module-puppetlabs-apt-4.5.1/CHANGELOG.md puppet-module-puppetlabs-apt-6.1.1/CHANGELOG.md --- puppet-module-puppetlabs-apt-4.5.1/CHANGELOG.md 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/CHANGELOG.md 2018-10-02 09:50:52.000000000 +0000 @@ -1,7 +1,75 @@ -# Changelog +# Change log -All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org). +All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). + +## [6.1.1](https://github.com/puppetlabs/puppetlabs-apt/tree/6.1.1) (2018-10-01) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.1.0...6.1.1) + +### Fixed + +- Revert "\(MODULES-6408\) - Fix dirmngr install failing" [\#808](https://github.com/puppetlabs/puppetlabs-apt/pull/808) ([eimlav](https://github.com/eimlav)) + +## [6.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/6.1.0) (2018-09-28) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/6.0.0...6.1.0) + +### Added + +- pdksync - \(FM-7392\) - Puppet 6 Testing Changes [\#800](https://github.com/puppetlabs/puppetlabs-apt/pull/800) ([pmcmaw](https://github.com/pmcmaw)) +- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#798](https://github.com/puppetlabs/puppetlabs-apt/pull/798) ([tphoney](https://github.com/tphoney)) +- \(MODULES-3307\) - Auto update expired keys [\#795](https://github.com/puppetlabs/puppetlabs-apt/pull/795) ([eimlav](https://github.com/eimlav)) +- \(FM-7316\) - Implementation of the i18n process [\#789](https://github.com/puppetlabs/puppetlabs-apt/pull/789) ([david22swan](https://github.com/david22swan)) +- Introduce an Apt::Proxy type to validate the hash [\#773](https://github.com/puppetlabs/puppetlabs-apt/pull/773) ([ekohl](https://github.com/ekohl)) + +### Fixed + +- \(MODULES-6408\) - Fix dirmngr install failing [\#801](https://github.com/puppetlabs/puppetlabs-apt/pull/801) ([eimlav](https://github.com/eimlav)) +- \(MODULES-1630\) - Expanding source list fix to cover all needed versions [\#788](https://github.com/puppetlabs/puppetlabs-apt/pull/788) ([david22swan](https://github.com/david22swan)) + +## [6.0.0](https://github.com/puppetlabs/puppetlabs-apt/tree/6.0.0) (2018-08-24) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/5.0.1...6.0.0) + +### Changed + +- \(MODULES-7668\) Remove support for Puppet 4.7 [\#780](https://github.com/puppetlabs/puppetlabs-apt/pull/780) ([jarretlavallee](https://github.com/jarretlavallee)) + +### Added + +- Check existence of gpg key in apt:ppa [\#774](https://github.com/puppetlabs/puppetlabs-apt/pull/774) ([wenzhengjiang](https://github.com/wenzhengjiang)) +- Make sure PPA source file is absent when apt-add-repository fails [\#768](https://github.com/puppetlabs/puppetlabs-apt/pull/768) ([wenzhengjiang](https://github.com/wenzhengjiang)) + +## 5.0.1 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/5.0.0...5.0.1) + +### Fixed + +- \(MODULES-7540\) - add apt-transport-https with https [\#775](https://github.com/puppetlabs/puppetlabs-apt/pull/775) ([tphoney](https://github.com/tphoney)) + +## [5.0.0](https://github.com/puppetlabs/puppetlabs-apt/tree/5.0.0) (2018-07-18) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/4.5.1...5.0.0) + +### Changed + +- \[FM-6956\] Removal of unsupported Debian 7 from apt [\#760](https://github.com/puppetlabs/puppetlabs-apt/pull/760) ([david22swan](https://github.com/david22swan)) + +### Added + +- \(MODULES-7467\) Update apt to support Ubuntu 18.04 [\#769](https://github.com/puppetlabs/puppetlabs-apt/pull/769) ([david22swan](https://github.com/david22swan)) +- Support managing login configurations in /etc/apt/auth.conf [\#752](https://github.com/puppetlabs/puppetlabs-apt/pull/752) ([antaflos](https://github.com/antaflos)) + +### Fixed + +- \(MODULES-7327\) - Update README with supported OS [\#767](https://github.com/puppetlabs/puppetlabs-apt/pull/767) ([pmcmaw](https://github.com/pmcmaw)) +- \(bugfix\) Dont run ftp tests in travis [\#766](https://github.com/puppetlabs/puppetlabs-apt/pull/766) ([tphoney](https://github.com/tphoney)) +- \(maint\) make apt testing more stable, cleanup [\#764](https://github.com/puppetlabs/puppetlabs-apt/pull/764) ([tphoney](https://github.com/tphoney)) +- Remove .length from variable $pin\_release in app [\#754](https://github.com/puppetlabs/puppetlabs-apt/pull/754) ([paladox](https://github.com/paladox)) +- Replace UTF-8 whitespace in comment [\#748](https://github.com/puppetlabs/puppetlabs-apt/pull/748) ([bernhardschmidt](https://github.com/bernhardschmidt)) +- Fix "E: Unable to locate package -y" [\#747](https://github.com/puppetlabs/puppetlabs-apt/pull/747) ([aboks](https://github.com/aboks)) +- Fix automatic coercion warning [\#743](https://github.com/puppetlabs/puppetlabs-apt/pull/743) ([smortex](https://github.com/smortex)) ## Supported Release [4.5.1] ### Summary @@ -656,8 +724,14 @@ * 87777d8 Typo in README * f848bac First commit +[5.0.1]:https://github.com/puppetlabs/puppetlabs-apt/compare/5.0.0...5.0.1 +[5.0.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.5.1...5.0.0 +[4.5.1]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.5.0...4.5.1 [4.5.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.4.1...4.5.0 [4.4.1]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.4.0...4.4.1 [4.4.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.3.0...4.4.0 [4.3.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.2.0...4.3.0 [4.2.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.1.0...4.2.0 + + +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff -Nru puppet-module-puppetlabs-apt-4.5.1/checksums.json puppet-module-puppetlabs-apt-6.1.1/checksums.json --- puppet-module-puppetlabs-apt-4.5.1/checksums.json 2018-02-05 19:29:47.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/checksums.json 2018-10-02 09:52:04.000000000 +0000 @@ -1,12 +1,14 @@ { - "CHANGELOG.md": "210cb579a20941c360dc6897e74952ac", + "CHANGELOG.md": "6be8e4cecc0686e7b9635d5560a72973", "CONTRIBUTING.md": "4d17f3c942e7c93d1577cc4438a231e4", - "Gemfile": "47f2bb73e730d42a921e7bca4449f5aa", + "Gemfile": "e35aeaf9f7e4200bbd4ef8fbbde3a3f2", + "HISTORY.md": "0e80b98698dacc680a1af56fd0566b3b", "LICENSE": "3b83ef96387f14655fc854ddc3c6bd57", "MAINTAINERS.md": "35674b233c6d12c0f56ee8afbdae29e4", "NOTICE": "9533d13591355591f69619be28e9cfce", - "README.md": "8bd71b883c237bda10a1f345fddbc78c", - "Rakefile": "df4172642435e770c27019d9d15d59bd", + "README.md": "f77626d04a66ec5265fd02441e050032", + "REFERENCE.md": "027eb3115ec96c780b877ddcc58ea5ec", + "Rakefile": "5a645b196705e2e8d973114d1552e5ef", "examples/backports.pp": "af57ea62ed1b73f540858e00327e6517", "examples/builddep.pp": "eddb8b7d7c0ef7383d85a74c1cd0de3f", "examples/debian_testing.pp": "2e50a41180e2afeac2de15ade05ddaa1", @@ -23,63 +25,70 @@ "examples/unattended_upgrades.pp": "e7a797388ef03077f110f4f268f5ecd1", "lib/facter/apt_reboot_required.rb": "e7dbcd3849c380cdd08dbc866079c211", "lib/facter/apt_update_last_success.rb": "f259aac4abdf82c1c6f13e0031bf551a", - "lib/facter/apt_updates.rb": "3c71621f2b03075187c512c42add634b", - "lib/puppet/provider/apt_key/apt_key.rb": "69c1c1861111471ff14f8176505a8697", - "lib/puppet/type/apt_key.rb": "af34d8297da8013b1dd1e21e951d646f", + "lib/facter/apt_updates.rb": "11be6c6ace6c11cef55127564ecc6d91", + "lib/puppet/provider/apt_key/apt_key.rb": "22b0747873120a29f7a51a2dc21e65d4", + "lib/puppet/type/apt_key.rb": "f9c0befebd9261aa1945b02d45695b7d", "locales/config.yaml": "bda37c45d7414bd4e2a6e1c01044e2e6", - "manifests/backports.pp": "2ec31325c4ab15271b9670049d6798d5", - "manifests/conf.pp": "e040cbed191ca66294d7f88ba7c29035", - "manifests/init.pp": "320d40323654450113c2072f4b5be169", - "manifests/key.pp": "96d07fbb816d37fe225a07ca7e409a6d", - "manifests/params.pp": "bdd14319baf4293d476d53ded19cf8cd", - "manifests/pin.pp": "f54f1c6cee012103960f21d411f91f77", - "manifests/ppa.pp": "5c05b41477ba7613af1855ec38be5971", - "manifests/setting.pp": "fd82a93821ce14d1be631ef7eb972a97", - "manifests/source.pp": "3d4c5f4f17062189f5316fec3b2cbd77", - "manifests/update.pp": "78b7f698a8cee3b86906e7c5cfe115f7", - "metadata.json": "6e8bb0ed4641e19e6d4e46e6c4dbb7b3", - "spec/acceptance/apt_key_provider_spec.rb": "3ca9408fa41dd5beea68282b13866ccc", - "spec/acceptance/apt_spec.rb": "8fb011463609160a6a57e2ffa5627671", - "spec/acceptance/class_spec.rb": "b63ac7a092085ee607aa74c55963004f", + "locales/ja/puppetlabs-apt.po": "69899f56f361d43b709cce860f04a5bf", + "locales/puppetlabs-apt.pot": "ce6a37eaa3865b2d36b4d4cb549a326f", + "manifests/backports.pp": "0940aab318d22cdd25ad400719a3018f", + "manifests/conf.pp": "b1ce82c9f2e16f6580a49cf1d81aa5c6", + "manifests/init.pp": "7de676f9d915be704c708d127401d968", + "manifests/key.pp": "a9a519aad883d8104f52ad094b5f2710", + "manifests/params.pp": "b654f48b63388ce4d44c779d2a2be538", + "manifests/pin.pp": "23fc805f31b56eb52466487f7ceb065a", + "manifests/ppa.pp": "b2a686c6ed43b1dcc1def3b1c3d6a79c", + "manifests/setting.pp": "6715dbb5fb795415294d55f45577ec85", + "manifests/source.pp": "f003da1ea7314904c3624e330c76ba02", + "manifests/update.pp": "93ef29d0da40610a36205821229d3304", + "metadata.json": "178177abba0f0db34b879d1bf4012525", + "spec/acceptance/01_apt_class_spec.rb": "b63ac7a092085ee607aa74c55963004f", + "spec/acceptance/apt_key_provider_spec.rb": "30ab42ebb6a14213d6441fb1b315c05a", + "spec/acceptance/apt_spec.rb": "5ac45a8bd80652788fccf40d504b2aa7", "spec/acceptance/init_task_spec.rb": "0a9d390d5e801bf0ac5be96a3d90c2b4", + "spec/acceptance/locales_spec.rb": "dfe832c34c9ddf542449130edfad9a3b", "spec/acceptance/nodesets/centos-7-x64.yml": "a713f3abd3657f0ae2878829badd23cd", "spec/acceptance/nodesets/debian-8-x64.yml": "d2d2977900989f30086ad251a14a1f39", "spec/acceptance/nodesets/default.yml": "b42da5a1ea0c964567ba7495574b8808", "spec/acceptance/nodesets/docker/centos-7.yml": "8a3892807bdd62306ae4774f41ba11ae", "spec/acceptance/nodesets/docker/debian-8.yml": "ac8e871d1068c96de5e85a89daaec6df", "spec/acceptance/nodesets/docker/ubuntu-14.04.yml": "dc42ee922a96908d85b8f0f08203ce58", - "spec/classes/apt_backports_spec.rb": "67b53fc63b82de28fdd4b7bba653bf61", - "spec/classes/apt_spec.rb": "0b10725314a439d2894fd861eb2acaa1", - "spec/classes/apt_update_spec.rb": "bd7c58cf878c2781f4a01fd2f27f3a36", - "spec/defines/conf_spec.rb": "f5bdeb742fbb63f1f2b4540d6b184bcb", - "spec/defines/key_compat_spec.rb": "265b1b8e50d408a8aed79b60ea7094f0", - "spec/defines/key_spec.rb": "60098bfb8ac33968448441fb89d1a989", - "spec/defines/pin_spec.rb": "0c5d2575b3b1b8c9e3a38779863299a4", - "spec/defines/ppa_spec.rb": "205e53544380679fab739ed5fa6c32f5", - "spec/defines/setting_spec.rb": "8da56cd826a127fd8e390eb7b4e53caf", - "spec/defines/source_compat_spec.rb": "65a508f640f5333bbe0da6bdebeb8e42", - "spec/defines/source_spec.rb": "47f8ff347d797347927cb3014c1bfdae", - "spec/spec_helper.rb": "898577ed31fbf848330924de64091e60", - "spec/spec_helper_acceptance.rb": "8b2ab6fb6bd01d92375fbda13d22a018", + "spec/classes/apt_backports_spec.rb": "8b68574926585ba042934d936fa42281", + "spec/classes/apt_spec.rb": "bdca7b975f8a85f7ec045f999af40fc1", + "spec/classes/apt_update_spec.rb": "6b0e1dcc4bc46e089037a6aebcf9316c", + "spec/default_facts.yml": "b1ca07fac7dcb249d641d8b63239ef7c", + "spec/defines/conf_spec.rb": "81dab32425ed53d0cb48a63c6f2c8ab3", + "spec/defines/key_compat_spec.rb": "e49cadca852b67fac314f16daabca9f5", + "spec/defines/key_spec.rb": "cc08433e453dd379aabf1189e9adac8f", + "spec/defines/pin_spec.rb": "44513118fde2543e2677addea6f82ff5", + "spec/defines/ppa_spec.rb": "252fa211f18e31d3abaa98ae741e2fb6", + "spec/defines/setting_spec.rb": "cd32f17ce45e39efbbb9c58a17297f84", + "spec/defines/source_compat_spec.rb": "caa5f2b48a0988bbac8f26c824c3e073", + "spec/defines/source_spec.rb": "bcb121e3efd1cdfeb6f7befa7627dfe5", + "spec/spec_helper.rb": "52436bc6f6442debdf72b83b3fa4c281", + "spec/spec_helper_acceptance.rb": "22560818f1a7399b339c42a7c308e2fa", "spec/unit/facter/apt_dist_has_updates_spec.rb": "6b85d39d586e7654ad2f0ee3af5a2787", - "spec/unit/facter/apt_dist_package_security_updates_spec.rb": "577b2cd23942bbe67d3a2705d33408dc", + "spec/unit/facter/apt_dist_package_security_updates_spec.rb": "ad738e3a1193b1b3e0052a9130f283c8", "spec/unit/facter/apt_dist_package_updates_spec.rb": "063821fc13e3b217a853577b6a94a224", "spec/unit/facter/apt_dist_security_updates_spec.rb": "393a47f50ff6c43aa6ba80d7848cd96a", "spec/unit/facter/apt_dist_updates_spec.rb": "f96e477aa5c6fd913c2352dba8f40b53", "spec/unit/facter/apt_has_updates_spec.rb": "cdc8486f14c4c3f35df0c38c2cc72c83", - "spec/unit/facter/apt_package_security_updates_spec.rb": "a0c7f61456fce4b0518b52604ca6342c", + "spec/unit/facter/apt_package_security_updates_spec.rb": "395761ebec3cd3b3c2ad4dfc7990adc8", "spec/unit/facter/apt_package_updates_spec.rb": "62708ded28f92c049a38ededa61a7d77", "spec/unit/facter/apt_reboot_required_spec.rb": "80e860984fc538bede7a2c24625ee234", "spec/unit/facter/apt_security_updates_spec.rb": "a6d6985e4dcce5839119618d91726c64", "spec/unit/facter/apt_update_last_success_spec.rb": "0e6cf8b5bec4d91ccfe4b83d088a5b10", "spec/unit/facter/apt_updates_spec.rb": "6d3fb0763e8133b014838f504ce26f08", - "spec/unit/puppet/type/apt_key_spec.rb": "2c2de871e2ddd556c0676f45cddd8e68", + "spec/unit/puppet/type/apt_key_spec.rb": "cba6c11a7a75d2a4c6260f8cbec6692b", "tasks/init.json": "f6aed51e207a15340d5258d1fab47a69", - "tasks/init.rb": "329cc4a36f89db4f2485884421af025b", + "tasks/init.rb": "e65e10bc5d44188a64a03078ae6ceebd", "templates/15update-stamp.epp": "b9de0ac9e2c9854b1bb213e362dc4e41", "templates/_conf_header.epp": "6f3077f2eabd3e929a44d55bc1c5446e", "templates/_header.epp": "9300ac105fe777787ac9e793b8df8d25", - "templates/pin.pref.epp": "ab7a64e3779f93028fe965a6393fad74", + "templates/auth_conf.epp": "5ecb28d31ee897d51b1b29cfe59c8b54", + "templates/pin.pref.epp": "58d462f3ec74c3755a2bd804d7b22207", "templates/proxy.epp": "7353f09fa5fdb1819517446ec58c9ad5", - "templates/source.list.epp": "c32995778d056f204d51a6d79505a5aa" + "templates/source.list.epp": "c32995778d056f204d51a6d79505a5aa", + "types/auth_conf_entry.pp": "8484d7777144fe7ed87a6e3830cf694a", + "types/proxy.pp": "4bb8b0ad03264cdedb673d1580282b37" } \ No newline at end of file diff -Nru puppet-module-puppetlabs-apt-4.5.1/debian/changelog puppet-module-puppetlabs-apt-6.1.1/debian/changelog --- puppet-module-puppetlabs-apt-4.5.1/debian/changelog 2018-03-21 12:55:47.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/debian/changelog 2018-11-10 13:50:52.000000000 +0000 @@ -1,3 +1,15 @@ +puppet-module-puppetlabs-apt (6.1.1-1) unstable; urgency=medium + + * New upstream version 6.1.1 + * d/rules: Fix lintian file-contains-trailing-whitespace + * d/control: + + Add new dependency on puppet-module-puppetlabs-translate + + Allow backport to stretch (update debhelper to 11~) + + Bump to Standards-Version 4.2.1 (no changes needed) + + Include new types in the package + + -- Sebastien Badia Sat, 10 Nov 2018 14:50:52 +0100 + puppet-module-puppetlabs-apt (4.5.1-1) unstable; urgency=medium [ Thomas Bechtold ] diff -Nru puppet-module-puppetlabs-apt-4.5.1/debian/control puppet-module-puppetlabs-apt-6.1.1/debian/control --- puppet-module-puppetlabs-apt-4.5.1/debian/control 2018-03-21 12:38:37.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/debian/control 2018-11-10 13:30:55.000000000 +0000 @@ -5,16 +5,19 @@ Sebastien Badia Section: admin Priority: optional -Build-Depends: debhelper (>= 11) +Build-Depends: debhelper (>= 11~) Rules-Requires-Root: no -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/puppet-team/puppet-module-puppetlabs-apt Vcs-Git: https://salsa.debian.org/puppet-team/puppet-module-puppetlabs-apt.git Homepage: https://forge.puppet.com/puppetlabs/apt Package: puppet-module-puppetlabs-apt Architecture: all -Depends: puppet, puppet-module-puppetlabs-stdlib (>= 4.16.0), ${misc:Depends} +Depends: puppet, + puppet-module-puppetlabs-stdlib (>= 4.16.0), + puppet-module-puppetlabs-translate, + ${misc:Depends} Description: Puppet module for apt Puppet lets you centrally manage every important aspect of your system using a cross-platform specification language that manages all the diff -Nru puppet-module-puppetlabs-apt-4.5.1/debian/puppet-module-puppetlabs-apt.install puppet-module-puppetlabs-apt-6.1.1/debian/puppet-module-puppetlabs-apt.install --- puppet-module-puppetlabs-apt-4.5.1/debian/puppet-module-puppetlabs-apt.install 2018-02-06 09:26:28.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/debian/puppet-module-puppetlabs-apt.install 2018-11-10 13:45:13.000000000 +0000 @@ -2,3 +2,4 @@ manifests usr/share/puppet/modules.available/puppetlabs-apt metadata.json usr/share/puppet/modules.available/puppetlabs-apt templates usr/share/puppet/modules.available/puppetlabs-apt +types usr/share/puppet/modules.available/puppetlabs-apt diff -Nru puppet-module-puppetlabs-apt-4.5.1/debian/rules puppet-module-puppetlabs-apt-6.1.1/debian/rules --- puppet-module-puppetlabs-apt-4.5.1/debian/rules 2018-03-21 12:36:15.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/debian/rules 2018-11-10 13:04:17.000000000 +0000 @@ -1,4 +1,3 @@ #!/usr/bin/make -f %: dh $@ - diff -Nru puppet-module-puppetlabs-apt-4.5.1/Gemfile puppet-module-puppetlabs-apt-6.1.1/Gemfile --- puppet-module-puppetlabs-apt-4.5.1/Gemfile 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/Gemfile 2018-10-01 08:30:41.000000000 +0000 @@ -1,22 +1,15 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' def location_for(place_or_version, fake_version = nil) - if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)} - [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact - elsif place_or_version =~ %r{\Afile:\/\/(.*)} - ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }] - else - [place_or_version, { require: false }] - end -end + git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} + file_url_regex = %r{\Afile:\/\/(?.*)} -def gem_type(place_or_version) - if place_or_version =~ %r{\Agit[:@]} - :git - elsif !place_or_version.nil? && place_or_version.start_with?('file:') - :file + if place_or_version && (git_url = place_or_version.match(git_url_regex)) + [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact + elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) + ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] else - :gem + [place_or_version, { require: false }] end end @@ -28,94 +21,41 @@ gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') + gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4') gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-blacksmith", '~> 3.4', require: false + gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') + gem "puppet-lint-i18n", require: false end group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13') - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') - gem "beaker-pe", require: false - gem "beaker-hostgenerator" - gem "beaker-rspec" + gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] end puppet_version = ENV['PUPPET_GEM_VERSION'] -puppet_type = gem_type(puppet_version) facter_version = ENV['FACTER_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION'] -def puppet_older_than?(version) - puppet_version = ENV['PUPPET_GEM_VERSION'] - !puppet_version.nil? && - Gem::Version.correct?(puppet_version) && - Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup)) -end - gems = {} gems['puppet'] = location_for(puppet_version) # If facter or hiera versions have been specified via the environment -# variables, use those versions. If not, and if the puppet version is < 3.5.0, -# use known good versions of both for puppet < 3.5.0. -if facter_version - gems['facter'] = location_for(facter_version) -elsif puppet_type == :gem && puppet_older_than?('3.5.0') - gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false] -end +# variables -if hiera_version - gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION']) -elsif puppet_type == :gem && puppet_older_than?('3.5.0') - gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false] -end - -if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0')) - # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows - if puppet_type == :gem - gems['ffi'] = ['1.9.0', require: false] - gems['minitar'] = ['0.5.4', require: false] - gems['win32-eventlog'] = ['0.5.3', '<= 0.6.5', require: false] - gems['win32-process'] = ['0.6.5', '<= 0.7.5', require: false] - gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false] - gems['win32-service'] = ['0.7.2', '<= 0.8.8', require: false] - else - gems['ffi'] = ['~> 1.9.0', require: false] - gems['minitar'] = ['~> 0.5.4', require: false] - gems['win32-eventlog'] = ['~> 0.5', '<= 0.6.5', require: false] - gems['win32-process'] = ['~> 0.6', '<= 0.7.5', require: false] - gems['win32-security'] = ['~> 0.1', '<= 0.2.5', require: false] - gems['win32-service'] = ['~> 0.7', '<= 0.8.8', require: false] - end - - gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false] - - if RUBY_VERSION.start_with?('1.') - gems['win32console'] = ['1.3.2', require: false] - # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x - gems['sys-admin'] = ['1.5.6', require: false] - end +gems['facter'] = location_for(facter_version) if facter_version +gems['hiera'] = location_for(hiera_version) if hiera_version - # Puppet < 3.7.0 requires these. - # Puppet >= 3.5.0 gem includes these as requirements. - # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0. - gems['win32-api'] = ['1.4.8', require: false] - gems['win32-taskscheduler'] = ['0.2.2', require: false] - gems['windows-api'] = ['0.4.3', require: false] - gems['windows-pr'] = ['1.2.3', require: false] -elsif Gem.win_platform? +if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} # If we're using a Puppet gem on Windows which handles its own win32-xxx gem # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). gems['win32-dir'] = ['<= 0.4.9', require: false] gems['win32-eventlog'] = ['<= 0.6.5', require: false] gems['win32-process'] = ['<= 0.7.5', require: false] gems['win32-security'] = ['<= 0.2.5', require: false] - gems['win32-service'] = ['<= 0.8.8', require: false] + gems['win32-service'] = ['0.8.8', require: false] end gems.each do |gem_name, gem_params| diff -Nru puppet-module-puppetlabs-apt-4.5.1/HISTORY.md puppet-module-puppetlabs-apt-6.1.1/HISTORY.md --- puppet-module-puppetlabs-apt-4.5.1/HISTORY.md 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/HISTORY.md 2018-08-24 13:23:05.000000000 +0000 @@ -0,0 +1,692 @@ +## 5.0.1 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/5.0.0...5.0.1) + +### Fixed + +- \(MODULES-7540\) - add apt-transport-https with https [\#775](https://github.com/puppetlabs/puppetlabs-apt/pull/775) ([tphoney](https://github.com/tphoney)) + +## [5.0.0](https://github.com/puppetlabs/puppetlabs-apt/tree/5.0.0) (2018-07-18) + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/4.5.1...5.0.0) + +### Changed + +- \[FM-6956\] Removal of unsupported Debian 7 from apt [\#760](https://github.com/puppetlabs/puppetlabs-apt/pull/760) ([david22swan](https://github.com/david22swan)) + +### Added + +- \(MODULES-7467\) Update apt to support Ubuntu 18.04 [\#769](https://github.com/puppetlabs/puppetlabs-apt/pull/769) ([david22swan](https://github.com/david22swan)) +- Support managing login configurations in /etc/apt/auth.conf [\#752](https://github.com/puppetlabs/puppetlabs-apt/pull/752) ([antaflos](https://github.com/antaflos)) + +### Fixed + +- \(MODULES-7327\) - Update README with supported OS [\#767](https://github.com/puppetlabs/puppetlabs-apt/pull/767) ([pmcmaw](https://github.com/pmcmaw)) +- \(bugfix\) Dont run ftp tests in travis [\#766](https://github.com/puppetlabs/puppetlabs-apt/pull/766) ([tphoney](https://github.com/tphoney)) +- \(maint\) make apt testing more stable, cleanup [\#764](https://github.com/puppetlabs/puppetlabs-apt/pull/764) ([tphoney](https://github.com/tphoney)) +- Remove .length from variable $pin\_release in app [\#754](https://github.com/puppetlabs/puppetlabs-apt/pull/754) ([paladox](https://github.com/paladox)) +- Replace UTF-8 whitespace in comment [\#748](https://github.com/puppetlabs/puppetlabs-apt/pull/748) ([bernhardschmidt](https://github.com/bernhardschmidt)) +- Fix "E: Unable to locate package -y" [\#747](https://github.com/puppetlabs/puppetlabs-apt/pull/747) ([aboks](https://github.com/aboks)) +- Fix automatic coercion warning [\#743](https://github.com/puppetlabs/puppetlabs-apt/pull/743) ([smortex](https://github.com/smortex)) + +## Supported Release [4.5.1] +### Summary +This release fixes CVE-2018-6508 which is a potential arbitrary code execution via tasks. + +### Fixed +- Fix init task for arbitrary remote code + +## Supported Release [4.5.0] +### Summary +This release uses the PDK convert functionality which in return makes the module PDK compliant. It also includes a roll up of maintenance changes. + +### Added +- PDK convert apt ([MODULES-6452](https://tickets.puppet.com/browse/MODULES-6452)). +- Testing on Travis using rvm 2.4.1. +- Modulesync updates. + +### Fixed +- Changes to address additional Rubocop failures. +- (maint) Addressing puppet-lint doc warnings. + +### Removed +- `gem update bundler` command in .travis.yml due to ([MODULES-6339](https://tickets.puppet.com/browse/MODULES-6339)). + +## Supported Release [4.4.1] +### Summary +This release is to update the formatting of the module, Rubocop having been run for all ruby files and been set to run automatically on all future commits. + +### Changed +- Rubocop has been implemented. + +## Supported Release [4.4.0] +### Summary + +This release is a rollup of new features and fixes. + +#### Added +- Install `apt-transport-https` if using Debian 7, 8, 9 or Ubuntu 14.04, 16.04. +- Adds a boolean option `direct` to proxy settings to bypass `https_proxy` if not set. +- Adds facter facts for `dist-upgrade` apt updates. + +#### Changed +- Update class is now private. +- Some tidyup of ruby code from Rubocop. +- Fixed circular dependency for package dirmngr. +- Debian updates are no longer treated as security updates. +- Legacy functions have been removed. +- Updates to tests. + +#### Fixed +- [(MODULES-4265)](https://tickets.puppetlabs.com/browse/MODULES-4265) Detect security updates from multiple sources. + +## Supported Release [4.3.0] +### Summary + +This release is adding Tasks to the apt module. + +#### Added +- Add a task that allows apt-get update and upgrade + +## Supported Release [4.2.0] +### Summary + +This release is primarily to fix an error around GPG keys in Debian 9, but includes some other small features and fixes as well. + +#### Added +- `apt_package_security_updates` fact +- The ability to modify the loglevel of `Exec['apt_update'}` +- Puppet 5 support + +#### Changed +- Ubuntu 16.04 now uses `software-priorities-common` + +#### Removed +- Debian 6, Ubuntu 10.04 and 12.04 support. Existing compatibility remains intact but bugs will not be prioritized for these OSes. + +#### Fixed +- **[(MODULES-4686)](https://tickets.puppetlabs.com/browse/MODULES-4686) an error that was causing GPG keyserver imports to fail on Debian 9** + +## Supported Release 4.1.0 +### Summary + +This release removes Data in Modules due to current compatibility issues and reinstates the params.pp file. Also includes a couple of bug fixes. + +#### Features +- (MODULES-4973) Data in Modules which was introduced in the last release has now been reverted due to compatibility issues. + +#### Bugfixes +- Now apt_key only sends the auth basic header when userinfo can be parsed from the URL. +- Reverted the removal of Evolving Web's attribution in NOTICE file. +- Test added to ensure empty string allowed for $release in apt::source. + + +## Supported Release 3.0.0 and 4.0.0 +### Summary + +This release adds new Puppet 4 features: data in modules, EPP templates, the $facts hash, and data types. This release is fully backwards compatible to existing Puppet 4 configurations and provides you with deprecation warnings for every argument that will not work as expected with the final 4.0.0 release. See the stdlib docs here for an in-depth discussion of this: https://github.com/puppetlabs/puppetlabs-stdlib#validate_legacy + +If you want to learn more about the new features used or you wish to upgrade a module yourself, have a look at the NTP: A Puppet 4 language update blog post. + +If you're still running Puppet 3, remain on the latest puppetlabs-apt 2.x release for now, and see the documentation to upgrade to Puppet 4. + +#### Changes + +Data in modules: Moves all distribution and OS-dependent defaults into YAML files in data/, alleviating the need for a params class. Note that while this feature is currently still classed as experimental, the final implementation will support the changes here. +EPP templating: Uses the Puppet language as a base for templates to create simpler and safer templates. No need for Ruby anymore! +The $facts hash: Makes facts visibly distinct from other variables for more readable and maintainable code. This helps eliminate confusion if you use a local variable whose name happens to match that of a common fact. +Data types for validation: Helps you find and replace deprecated code in existing validate functions with stricter, more readable data type notation. First upgrade to the 3.0.0 release of this module, and address all deprecation warnings before upgrading to the final 4.0.0 release. Please see the stdlib docs for an in-depth discussion of this process. + +#### Bugfixes +- Fix apt::source epp template regression introduced in 3.0.0 for the architecture parameter + +## Supported Release 2.4.0 +### Summary +A release that includes only a couple of additional features, but includes several cleanups and bugfixes around existing issues. + +#### Features +- Tests updated to check for idempotency. +- (MODULES-4224) Implementation of beaker-module_install_helper. +- Deprecation warnings are now handled by the deprecation function in stdlib. + +#### Bugfixes +- Now http and https sources fixed for apt_key and can take a userinfo. +- GPG key update. +- Notify_update param now defaults to true to avoid validation errors. +- Implement retry on tests which pull key from a key server which sometimes times out (transient error). +- String comparison error now comphensated for in update.pp. +- (MODULES-4104) Removal of the port number from repository location in order to get the host name of the repository. +- Puppet lint warnings addressed. +- A few small readme issues addressed. + +## Supported Release 2.3.0 +### Summary +A release containing many bugfixes with additional features. + +#### Features +- Apt_updates facts now use /usr/bin/apt-get. +- Addition of notify update to apt::source. +- Update to newest modulesync_configs. +- Installs software-properties-common for Xenial. +- Modulesync updates. +- Add ability to specify a hash of apt::conf defines. + +#### Bugfixes +- A clean up of spec/defines/key_compat_specs, also now runs under STRICT_VARIABLES. +- Apt::setting expects priority to be an integer, set defaults accordingly. +- Fixed version check for Ubuntu on 16.04. +- Now uses hkps.pool.sks-keyservers.net instead of pgp.mit.edu. +- Updates and fixes to tests. General cleanup. +- Fixed regexp for $ensure params. +- Apt/params: Remove unused LSB facts. +- Replaced `-s` with `-f` in ppa rspec tests - After the repository is added, the "${::apt::sources_list_d}/${sources_list_d_filename}" file is created as an empty file. The unless condition of Exec["add-apt-repository-${name}"] calls test -s, which returns 1 if the file is empty. Because the file is empty, the unless condition is never true and the repository is added on every execution. This change replaces the -s test condition with -f, which is true if the file exists or false otherwise. +- Limit non-strict parsing to pre-3.5.0 only - Puppet 3.5.0 introduced strict variables and the module handles strict variables by using the defined() function. This does not work on prior versions of puppet so we now gate based on that version. Puppet 4 series has a new setting `strict` that may be set to enforce strict variables while `strict_variables` remains unset (see PUP-6358) which causes the conditional in manifests/params.pp to erroniously use non-strict 3.5-era parsing and fail. This new conditional corrects the cases such that strict variable behavior happens on versions 3.5.0 and later. + +## Supported Release 2.2.2 +### Summary + +Several bug fixes and the addition of support updates to Debian 8 and Ubuntu Wily. + +#### Bugfixes +- Small fixes to descriptions within the readme and the addition of some examples. +- Updates to run on Ubuntu Wily. +- Fixed apt_key tempfile race condition. +- Run stages limitation added to the documentation. +- Remove unneeded whitespace in source.list template. +- Handle PPA names that contain a plus character. +- Update to current msync configs. +- Avoid duplicate package resources when package_manage => true. +- Avoid multiple package resource declarations. +- Ensure PPAs in tests have valid form. +- Look for correct sources.list.d file for apt::ppa. +- Debian 8 support addiiton to metadata. + +## Supported Release 2.2.1 +### Summary + +Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. + +## 2015-09-29 - Supported Release 2.2.0 +### Summary + +This release includes a few bugfixes. + +#### Features +- Adds an `ensure` parameter for user control of proxy presence. +- Adds ability to set `notify_update` to `apt::conf` (MODULES-2269). +- Apt pins no longer trigger an `apt-get update` run. +- Adds support for creating pins from main class. + +#### Bugfixes +- Updates to use the official Debian mirrors. +- Fixes path to `preferences` and `preferences.d` +- Fixes pinning for backports (MODULES-2446). +- Fixes the name/extension of the preferences files. + +## 2015-07-28 - Supported Release 2.1.1 +### Summary + +This release includes a few bugfixes. + +#### Bugfixes +- Fix incorrect use of anchoring (MODULES-2190) +- Use correct comment type for apt.conf files +- Test fixes +- Documentation fixes + +## 2015-06-16 - Supported Release 2.1.0 +### Summary + +This release largely makes `apt::key` and `apt::source` API-compatible with the 1.8.x versions for ease in upgrading, and also addresses some compatibility issues with older versions of Puppet. + +#### Features +- Add API compatibility to `apt::key` and `apt::source` +- Added `apt_reboot_required` fact + +#### Bugfixes +- Fix compatibility with Puppet versions 3.0-3.4 +- Work around future parser bug PUP-4133 + +## 2015-04-28 - Supported Release 2.0.1 +### Summary + +This bug fixes a few compatibility issues that came up with the 2.0.0 release, and includes test and documentation updates. + +#### Bugfixes +- Fix incompatibility with keyrings containing multiple keys +- Fix bugs preventing the module from working with Puppet < 3.5.0 + +## 2015-04-07 - Supported Release 2.0.0 +### Summary + +This is a major rewrite of the apt module. Many classes and defines were removed, but all existing functionality should still work. Please carefully review documentation before upgrading. + +#### Backwards-incompatible changes + +As this is a major rewrite of the module there are a great number of backwards incompatible changes. Please review this and the updated README carefully before upgrading. + +##### `apt_key` +- `keyserver_options` parameter renamed to `options` + +##### `apt::backports` +- This no longer works out of the box on Linux Mint. If using this on mint, you must specify the `location`, `release`, `repos`, and `key` parameters. [Example](examples/backports.pp) + +##### `apt::builddep` +- This define was removed. Functionality can be matched passing 'build-dep' to `install_options` in the package resource. [Example](examples/builddep.pp) + +##### `apt::debian::testing` +- This class was removed. Manually add an `apt::source` instead. [Example](examples/debian_testing.pp) + +##### `apt::debian::unstable` +- This class was removed. Manually add an `apt::source` instead. [Example](examples/debian_unstable.pp) + +##### `apt::force` +- This define was removed. Functionallity can be matched by setting `install_options` in the package resource. See [here](examples/force.pp) for how to set the options. + +##### `apt::hold` +- This define was removed. Simply use an `apt::pin` with `priority => 1001` for the same functionality. + +##### `apt` +- `always_apt_update` - This parameter was removed. Use `update => { 'frequency' => 'always' }` instead. +- `apt_update_frequency` - This parameter was removed. Use `update => { 'frequency' => }` instead. +- `disable_keys` - This parameter was removed. See this [example](examples/disable_keys.pp) if you need this functionality. +- `proxy_host` - This parameter was removed. Use `proxy => { 'host' => }` instead. +- `proxy_port` - This parameter was removed. Use `proxy => { 'port' => }` instead. +- `purge_sources_list` - This parameter was removed. Use `purge => { 'sources.list' => }` instead. +- `purge_sources_list_d` - This parameter was removed. Use `purge => { 'sources.list.d' => }` instead. +- `purge_preferences` - This parameter was removed. Use `purge => { 'preferences' => }` instead. +- `purge_preferences_d` - This parameter was removed. Use `purge => { 'preferences.d' => }` instead. +- `update_timeout` - This parameter was removed. Use `update => { 'timeout' => }` instead. +- `update_tries` - This parameter was removed. Use `update => { 'tries' => }` instead. + +##### `apt::key` +- `key` - This parameter was renamed to `id`. +- `key_content` - This parameter was renamed to `content`. +- `key_source` - This parameter was renamed to `source`. +- `key_server` - This parameter was renamed to `server`. +- `key_options` - This parameter was renamed to `options`. + +##### `apt::release` +- This class was removed. See this [example](examples/release.pp) for how to achieve this functionality. + +##### `apt::source` +- `include_src` - This parameter was removed. Use `include => { 'src' => }` instead. ***NOTE*** This now defaults to false. +- `include_deb` - This parameter was removed. Use `include => { 'deb' => }` instead. +- `required_packages` - This parameter was removed. Use package resources for these packages if needed. +- `key` - This can either be a key id or a hash including key options. If using a hash, `key => { 'id' => }` must be specified. +- `key_server` - This parameter was removed. Use `key => { 'server' => }` instead. +- `key_content` - This parameter was removed. Use `key => { 'content' => }` instead. +- `key_source` - This parameter was removed. Use `key => { 'source' => }` instead. +- `trusted_source` - This parameter was renamed to `allow_unsigned`. + +##### `apt::unattended_upgrades` +- This class was removed and is being republished under the puppet-community namespace. The git repository is available [here](https://github.com/puppet-community/puppet-unattended_upgrades) and it will be published to the forge [here](https://forge.puppetlabs.com/puppet/unattended_upgrades). + +#### Changes to default behavior +- By default purge unmanaged files in 'sources.list', 'sources.list.d', 'preferences', and 'preferences.d'. +- Changed default for `package_manage` in `apt::ppa` to `false`. Set to `true` in a single PPA if you need the package to be managed. +- `apt::source` will no longer include the `src` entries by default. +- `pin` in `apt::source` now defaults to `undef` instead of `false` + +#### Features +- Added the ability to pass hashes of `apt::key`s, `apt::ppa`s, and `apt::setting`s to `apt`. +- Added 'https' key to `proxy` hash to allow disabling `https_proxy` for the `apt::ppa` environment. +- Added `apt::setting` define to abstract away configuration. +- Added the ability to pass hashes to `pin` and `key` in `apt::backports` and `apt::source`. + +#### Bugfixes +- Fixes for strict variables. + +## 2015-03-17 - Supported Release 1.8.0 +### Summary + +This is the last planned feature release of the 1.x series of this module. All new features will be evaluated for puppetlabs-apt 2.x. + +This release includes many important features, including support for full fingerprints, and fixes issues where `apt_key` was not supporting user/password and `apt_has_updates` was not properly parsing the `apt-check` output. + +#### Changes to default behavior +- The apt module will now throw warnings if you don't use full fingerprints for `apt_key`s + +#### Features +- Use gpg to check keys to work around https://bugs.launchpad.net/ubuntu/+source/gnupg2/+bug/1409117 (MODULES-1675) +- Add 'oldstable' to the default update origins for wheezy +- Add utopic, vivid, and cumulus compatibility +- Add support for full fingerprints +- New parameter for `apt::source` + - `trusted_source` +- New parameters for `apt::ppa` + - `package_name` + - `package_manage` +- New parameter for `apt::unattended_upgrades` + - `legacy_origin` +- Separate `apt::pin` from `apt::backports` to allow pin by release instead of origin + +#### Bugfixes +- Cleanup lint and future parser issues +- Fix to support username and passwords again for `apt_key` (MODULES-1119) +- Fix issue where `apt::force` `$install_check` didn't work with non-English locales (MODULES-1231) +- Allow 5 digit ports in `apt_key` +- Fix for `ensure => absent` in `apt_key` (MODULES-1661) +- Fix `apt_has_updates` not parsing `apt-check` output correctly +- Fix inconsistent headers across files (MODULES-1200) +- Clean up formatting for 50unattended-upgrades.erb + +## 2014-10-28 - Supported Release 1.7.0 +### Summary + +This release includes several new features, documentation and test improvements, and a few bug fixes. + +#### Features +- Updated unit and acceptance tests +- Update module to work with Linux Mint +- Documentation updates +- Future parser / strict variables support +- Improved support for long GPG keys +- New parameters! + - Added `apt_update_frequency` to apt + - Added `cfg_files` and `cfg_missing` parameters to apt::force + - Added `randomsleep` to apt::unattended_upgrades +- Added `apt_update_last_success` fact +- Refactored facts for performance improvements + +#### Bugfixes +- Update apt::builddep to require Exec['apt_update'] instead of notifying it +- Clean up lint errors + +## 2014-08-20 - Supported Release 1.6.0 +### Summary + +#### Features +- Allow URL or domain name for key_server parameter +- Allow custom comment for sources list +- Enable auto-update for Debian squeeze LTS +- Add facts showing available updates +- Test refactoring + +#### Bugfixes +- Allow dashes in URL or domain for key_server parameter + +## 2014-08-13 - Supported Release 1.5.3 +### Summary + +This is a bugfix releases. It addresses a bad regex, failures with unicode +characters, and issues with the $proxy_host handling in apt::ppa. + +#### Features +- Synced files from Modulesync + +#### Bugfixes +- Fix regex to follow APT requirements in apt::pin +- Fix for unicode characters +- Fix inconsistent $proxy_host handling in apt and apt::ppa +- Fix typo in README +- Fix broken acceptance tests + +## 2014-07-15 - Supported Release 1.5.2 +### Summary + +This release merely updates metadata.json so the module can be uninstalled and +upgraded via the puppet module command. + +## 2014-07-10 - Supported Release 1.5.1 +### Summary + +This release has added tests to ensure graceful failure on OSX. + +## 2014-06-04 - Release 1.5.0 +### Summary + +This release adds support for Ubuntu 14.04. It also includes many new features +and important bugfixes. One huge change is that apt::key was replaced with +apt_key, which allows you to use puppet resource apt_key to inventory keys on +your system. + +Special thanks to daenney, our intrepid unofficial apt maintainer! + +#### Features +- Add support for Ubuntu Trusty! +- Add apt::hold define +- Generate valid *.pref files in apt::pin +- Made pin_priority configurable for apt::backports +- Add apt_key type and provider +- Rename "${apt_conf_d}/proxy" to "${apt_conf_d}/01proxy" +- apt::key rewritten to use apt_key type +- Add support for update_tries to apt::update + +#### Bugfixes +- Typo fixes +- Fix unattended upgrades +- Removed bogus line when using purge_preferences +- Fix apt::force to upgrade allow packages to be upgraded to the pacakge from the specified release + +## 2014-03-04 - Supported Release 1.4.2 +### Summary + +This is a supported release. This release tidies up 1.4.1 and re-enables +support for Ubuntu 10.04 + +#### Features + +#### Bugfixes +- Fix apt:ppa to include the -y Ubuntu 10.04 requires. +- Documentation changes. +- Test fixups. + +#### Known Bugs + +* No known issues. + + + +## 2014-02-13 1.4.1 +### Summary +This is a bugfix release. + +#### Bugfixes +- Fix apt::force unable to upgrade packages from releases other than its original +- Removed a few refeneces to aptitude instead of apt-get for portability +- Removed call to getparam() due to stdlib dependency +- Correct apt::source template when architecture is provided +- Retry package installs if apt is locked +- Use root to exec in apt::ppa +- Updated tests and converted acceptance tests to beaker + +## 2013-10-08 - Release 1.4.0 + +### Summary + +Minor bugfix and allow the timeout to be adjusted. + +#### Features +- Add an `updates_timeout` to apt::params + +#### Bugfixes +- Ensure apt::ppa can read a ppa removed by hand. + + +## 2013-10-08 - Release 1.3.0 +### Summary + +This major feature in this release is the new apt::unattended_upgrades class, +allowing you to handle Ubuntu's unattended feature. This allows you to select +specific packages to automatically upgrade without any further user +involvement. + +In addition we extend our Wheezy support, add proxy support to apt:ppa and do +various cleanups and tweaks. + +#### Features +- Add apt::unattended_upgrades support for Ubuntu. +- Add wheezy backports support. +- Use the geoDNS http.debian.net instead of the main debian ftp server. +- Add `options` parameter to apt::ppa in order to pass options to apt-add-repository command. +- Add proxy support for apt::ppa (uses proxy_host and proxy_port from apt). + +#### Bugfixes +- Fix regsubst() calls to quote single letters (for future parser). +- Fix lint warnings and other misc cleanup. + + +## 2013-07-03 - Release 1.2.0 + +#### Features +- Add geppetto `.project` natures +- Add GH auto-release +- Add `apt::key::key_options` parameter +- Add complex pin support using distribution properties for `apt::pin` via new properties: + - `apt::pin::codename` + - `apt::pin::release_version` + - `apt::pin::component` + - `apt::pin::originator` + - `apt::pin::label` +- Add source architecture support to `apt::source::architecture` + +#### Bugfixes +- Use apt-get instead of aptitude in apt::force +- Update default backports location +- Add dependency for required packages before apt-get update + + +## 2013-06-02 - Release 1.1.1 +### Summary + +This is a bug fix release that resolves a number of issues: + +* By changing template variable usage, we remove the deprecation warnings + for Puppet 3.2.x +* Fixed proxy file removal, when proxy absent + +Some documentation, style and whitespaces changes were also merged. This +release also introduced proper rspec-puppet unit testing on Travis-CI to help +reduce regression. + +Thanks to all the community contributors below that made this patch possible. + +#### Detail Changes + +* fix minor comment type (Chris Rutter) +* whitespace fixes (Michael Moll) +* Update travis config file (William Van Hevelingen) +* Build all branches on travis (William Van Hevelingen) +* Standardize travis.yml on pattern introduced in stdlib (William Van Hevelingen) +* Updated content to conform to README best practices template (Lauren Rother) +* Fix apt::release example in readme (Brian Galey) +* add @ to variables in template (Peter Hoeg) +* Remove deprecation warnings for pin.pref.erb as well (Ken Barber) +* Update travis.yml to latest versions of puppet (Ken Barber) +* Fix proxy file removal (Scott Barber) +* Add spec test for removing proxy configuration (Dean Reilly) +* Fix apt::key listing longer than 8 chars (Benjamin Knofe) + + + + +## Release 1.1.0 +### Summary + +This release includes Ubuntu 12.10 (Quantal) support for PPAs. + +--- + +## 2012-05-25 - Puppet Labs - Release 0.0.4 +### Summary + + * Fix ppa list filename when there is a period in the PPA name + * Add .pref extension to apt preferences files + * Allow preferences to be purged + * Extend pin support + + +## 2012-05-04 - Puppet Labs - Release 0.0.3 +### Summary + + * only invoke apt-get update once + * only install python-software-properties if a ppa is added + * support 'ensure => absent' for all defined types + * add apt::conf + * add apt::backports + * fixed Modulefile for module tool dependency resolution + * configure proxy before doing apt-get update + * use apt-get update instead of aptitude for apt::ppa + * add support to pin release + + +## 2012-03-26 - Puppet Labs - Release 0.0.2 +### Summary + +* 41cedbb (#13261) Add real examples to smoke tests. +* d159a78 (#13261) Add key.pp smoke test +* 7116c7a (#13261) Replace foo source with puppetlabs source +* 1ead0bf Ignore pkg directory. +* 9c13872 (#13289) Fix some more style violations +* 0ea4ffa (#13289) Change test scaffolding to use a module & manifest dir fixture path +* a758247 (#13289) Clean up style violations and fix corresponding tests +* 99c3fd3 (#13289) Add puppet lint tests to Rakefile +* 5148cbf (#13125) Apt keys should be case insensitive +* b9607a4 Convert apt::key to use anchors + + +## 2012-03-07 - Puppet Labs - 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 + +[5.0.1]:https://github.com/puppetlabs/puppetlabs-apt/compare/5.0.0...5.0.1 +[5.0.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.5.1...5.0.0 +[4.5.1]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.5.0...4.5.1 +[4.5.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.4.1...4.5.0 +[4.4.1]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.4.0...4.4.1 +[4.4.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.3.0...4.4.0 +[4.3.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.2.0...4.3.0 +[4.2.0]:https://github.com/puppetlabs/puppetlabs-apt/compare/4.1.0...4.2.0 diff -Nru puppet-module-puppetlabs-apt-4.5.1/lib/facter/apt_updates.rb puppet-module-puppetlabs-apt-6.1.1/lib/facter/apt_updates.rb --- puppet-module-puppetlabs-apt-4.5.1/lib/facter/apt_updates.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/lib/facter/apt_updates.rb 2018-10-01 08:30:41.000000000 +0000 @@ -1,6 +1,9 @@ apt_package_updates = nil apt_dist_updates = nil +# Executes the upgrading of packages +# @param +# upgrade_option Type of upgrade passed into apt-get command arguments i.e. 'upgrade' or 'dist-upgrade' def get_updates(upgrade_option) apt_updates = nil if File.executable?('/usr/bin/apt-get') diff -Nru puppet-module-puppetlabs-apt-4.5.1/lib/puppet/provider/apt_key/apt_key.rb puppet-module-puppetlabs-apt-6.1.1/lib/puppet/provider/apt_key/apt_key.rb --- puppet-module-puppetlabs-apt-4.5.1/lib/puppet/provider/apt_key/apt_key.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/lib/puppet/provider/apt_key/apt_key.rb 2018-10-01 08:30:41.000000000 +0000 @@ -11,6 +11,8 @@ end Puppet::Type.type(:apt_key).provide(:apt_key) do + desc 'apt-key provider for apt_key resource' + confine osfamily: :debian defaultfor osfamily: :debian commands apt_key: 'apt-key' @@ -119,7 +121,7 @@ def source_to_file(value) parsed_value = URI.parse(value) if parsed_value.scheme.nil? - raise("The file #{value} does not exist") unless File.exist?(value) + raise(_('The file %{_value} does not exist') % { _value: value }) unless File.exist?(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 @@ -139,9 +141,9 @@ key = open(parsed_value, http_basic_authentication: user_pass).read end rescue OpenURI::HTTPError, Net::FTPPermError => e - raise("#{e.message} for #{resource[:source]}") + raise(_('%{_e} for %{_resource}') % { _e: e.message, _resource: resource[:source] }) rescue SocketError - raise("could not resolve #{resource[:source]}") + raise(_('could not resolve %{_resource}') % { _resource: resource[:source] }) else tempfile(key) end @@ -168,7 +170,7 @@ end end unless found_match - raise("The id in your manifest #{resource[:name]} and the fingerprint from content/source don't match. Check for an error in the id and content/source is legitimate.") + raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _resource: resource[:name] }) # rubocop:disable Metrics/LineLength end else warning('/usr/bin/gpg cannot be found for verification of the id.') @@ -177,8 +179,31 @@ file end + # Update a key if it is expired + def update_expired_key + # Return without doing anything if refresh or expired is false + return unless resource[:refresh] == true && resource[:expired] == true + + # Execute command to update key + command = [] + + unless resource[:source].nil? && resource[:content].nil? + raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] }) + end + + # 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]) + end + def exists? - @property_hash[:ensure] == :present + update_expired_key + # report expired keys as non-existing when refresh => true + @property_hash[:ensure] == :present && !(resource[:refresh] && @property_hash[:expired]) end def create @@ -199,7 +224,7 @@ command.push('add', key_file.path) # In case we really screwed up, better safe than sorry. else - raise("an unexpected condition occurred while trying to add the key: #{resource[:id]}") + raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] }) end apt_key(command) @property_hash[:ensure] = :present @@ -215,7 +240,7 @@ end def read_only(_value) - raise('This is a read-only property.') + raise(_('This is a read-only property.')) end mk_resource_methods diff -Nru puppet-module-puppetlabs-apt-4.5.1/lib/puppet/type/apt_key.rb puppet-module-puppetlabs-apt-6.1.1/lib/puppet/type/apt_key.rb --- puppet-module-puppetlabs-apt-4.5.1/lib/puppet/type/apt_key.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/lib/puppet/type/apt_key.rb 2018-10-01 08:30:41.000000000 +0000 @@ -1,29 +1,36 @@ require 'pathname' +require 'puppet/parameter/boolean' Puppet::Type.newtype(:apt_key) do @doc = <<-MANIFEST - 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 { '6F6B15509CF8E59E6E469F327F438280EF8D349F': - source => 'http://apt.puppetlabs.com/pubkey.gpg' - } + @summary 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. + + @example Basic usage + apt_key { '6F6B15509CF8E59E6E469F327F438280EF8D349F': + source => 'http://apt.puppetlabs.com/pubkey.gpg' + } - **Autorequires**: + **Autorequires** If Puppet is given the location of a key file which looks like an absolute path this type will autorequire that file. + + @api private MANIFEST ensurable validate do + if self[:refresh] == true && self[:ensure] == :absent + raise(_('ensure => absent and refresh => true are mutually exclusive')) + end if self[:content] && self[:source] - raise('The properties content and source are mutually exclusive.') + raise(_('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.') + warning(_('The id should be a full fingerprint (40 characters), see README.')) end end @@ -68,6 +75,10 @@ desc 'Additional options to pass to apt-key\'s --keyserver-options.' end + newparam(:refresh, boolean: true, parent: Puppet::Parameter::Boolean) do + desc 'When true, recreate an existing expired key' + end + newproperty(:fingerprint) do desc <<-MANIFEST The 40-digit hexadecimal fingerprint of the specified GPG key. diff -Nru puppet-module-puppetlabs-apt-4.5.1/locales/ja/puppetlabs-apt.po puppet-module-puppetlabs-apt-6.1.1/locales/ja/puppetlabs-apt.po --- puppet-module-puppetlabs-apt-4.5.1/locales/ja/puppetlabs-apt.po 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/locales/ja/puppetlabs-apt.po 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,275 @@ +# #-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2018 Puppet, Inc. +# This file is distributed under the same license as the puppetlabs-apt package. +# FIRST AUTHOR , 2018. +# +# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-# +# +# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2018 Puppet, Inc. +# This file is distributed under the same license as the puppetlabs-apt package. +# FIRST AUTHOR , 2018. +# +# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-# +# +# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2018 Puppet, Inc. +# This file is distributed under the same license as the puppetlabs-apt package. +# FIRST AUTHOR , 2018. +# +# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-# +# +#, fuzzy +msgid "" +msgstr "" +"#-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#\n" +"#-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#\n" +"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" +"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n" +"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n" +"\n" +"Report-Msgid-Bugs-To: docs@puppet.com\n" +"POT-Creation-Date: 2018-08-30 14:48+0100\n" +"PO-Revision-Date: 2018-08-30 14:48+0100\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To:\n" +"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" +"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" +"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n" +"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n" +"\n" +"Report-Msgid-Bugs-To: docs@puppet.com\n" +"POT-Creation-Date: 2018-08-30 14:48+0100\n" +"PO-Revision-Date: 2018-08-30 14:48+0100\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To:\n" +"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" +"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-08-30 16:09:57 +0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" +"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n" +"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n" +"\n" +"Report-Msgid-Bugs-To: docs@puppet.com\n" +"POT-Creation-Date: 2018-08-30 16:09+0100\n" +"PO-Revision-Date: 2018-08-30 16:09+0100\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To:\n" +"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" + +#. ./manifests/backports.pp:36 +msgid "" +"If not on Debian or Ubuntu, you must explicitly pass location, release, " +"repos, and key" +msgstr "" +"Īƒ ƞǿŧ ǿƞ Ḓḗƀīȧƞ ǿř Ŭƀŭƞŧŭ, ẏǿŭ ḿŭşŧ ḗẋƥŀīƈīŧŀẏ ƥȧşş ŀǿƈȧŧīǿƞ, řḗŀḗȧşḗ, " +"řḗƥǿş, ȧƞḓ ķḗẏ" + +#. ./manifests/backports.pp:50 +msgid "pin must be either a string, number or hash" +msgstr "ƥīƞ ḿŭşŧ ƀḗ ḗīŧħḗř ȧ şŧřīƞɠ, ƞŭḿƀḗř ǿř ħȧşħ" + +#. ./manifests/conf.pp:11 +msgid "Need to pass in content parameter" +msgstr "Ƞḗḗḓ ŧǿ ƥȧşş īƞ ƈǿƞŧḗƞŧ ƥȧřȧḿḗŧḗř" + +#. ./manifests/init.pp:37 - ./manifests/params.pp:5 +msgid "This module only works on Debian or derivatives like Ubuntu" +msgstr "Ŧħīş ḿǿḓŭŀḗ ǿƞŀẏ ẇǿřķş ǿƞ Ḓḗƀīȧƞ ǿř ḓḗřīṽȧŧīṽḗş ŀīķḗ Ŭƀŭƞŧŭ" + +#. ./manifests/params.pp:97 +msgid "Unable to determine value for fact os['name']" +msgstr "Ŭƞȧƀŀḗ ŧǿ ḓḗŧḗřḿīƞḗ ṽȧŀŭḗ ƒǿř ƒȧƈŧ ǿş['ƞȧḿḗ']" + +#. ./manifests/pin.pp:52 +msgid "parameters release, origin, and version are mutually exclusive" +msgstr "ƥȧřȧḿḗŧḗřş řḗŀḗȧşḗ, ǿřīɠīƞ, ȧƞḓ ṽḗřşīǿƞ ȧřḗ ḿŭŧŭȧŀŀẏ ḗẋƈŀŭşīṽḗ" + +#. ./manifests/pin.pp:56 +msgid "parameter version cannot be used in general form" +msgstr "ƥȧřȧḿḗŧḗř ṽḗřşīǿƞ ƈȧƞƞǿŧ ƀḗ ŭşḗḓ īƞ ɠḗƞḗřȧŀ ƒǿřḿ" + +#. ./manifests/pin.pp:59 +msgid "parameters release and origin are mutually exclusive" +msgstr "ƥȧřȧḿḗŧḗřş řḗŀḗȧşḗ ȧƞḓ ǿřīɠīƞ ȧřḗ ḿŭŧŭȧŀŀẏ ḗẋƈŀŭşīṽḗ" + +#. ./manifests/ppa.pp:10 - ./manifests/source.pp:25 +msgid "lsbdistcodename fact not available: release parameter required" +msgstr "ŀşƀḓīşŧƈǿḓḗƞȧḿḗ ƒȧƈŧ ƞǿŧ ȧṽȧīŀȧƀŀḗ: řḗŀḗȧşḗ ƥȧřȧḿḗŧḗř řḗɋŭīřḗḓ" + +#. ./manifests/ppa.pp:14 +msgid "apt::ppa is not currently supported on Debian." +msgstr "ȧƥŧ::ƥƥȧ īş ƞǿŧ ƈŭřřḗƞŧŀẏ şŭƥƥǿřŧḗḓ ǿƞ Ḓḗƀīȧƞ." + +#. ./manifests/setting.pp:11 +msgid "apt::setting cannot have both content and source" +msgstr "ȧƥŧ::şḗŧŧīƞɠ ƈȧƞƞǿŧ ħȧṽḗ ƀǿŧħ ƈǿƞŧḗƞŧ ȧƞḓ şǿŭřƈḗ" + +#. ./manifests/setting.pp:15 +msgid "apt::setting needs either of content or source" +msgstr "ȧƥŧ::şḗŧŧīƞɠ ƞḗḗḓş ḗīŧħḗř ǿƒ ƈǿƞŧḗƞŧ ǿř şǿŭřƈḗ" + +#. ./manifests/setting.pp:23 +msgid "" +"apt::setting resource name/title must start with either 'conf-', 'pref-' or " +"'list-'" +msgstr "" +"ȧƥŧ::şḗŧŧīƞɠ řḗşǿŭřƈḗ ƞȧḿḗ/title ḿŭşŧ şŧȧřŧ ẇīŧħ ḗīŧħḗř 'ƈǿƞƒ-', 'ƥřḗƒ-' ǿř " +"'ŀīşŧ-'" + +#. ./manifests/setting.pp:29 +msgid "apt::setting priority must be an integer or a zero-padded integer" +msgstr "ȧƥŧ::şḗŧŧīƞɠ ƥřīǿřīŧẏ ḿŭşŧ ƀḗ ȧƞ īƞŧḗɠḗř ǿř ȧ zḗřǿ-ƥȧḓḓḗḓ īƞŧḗɠḗř" + +#. ./manifests/source.pp:33 +msgid "cannot create a source entry without specifying a location" +msgstr "ƈȧƞƞǿŧ ƈřḗȧŧḗ ȧ şǿŭřƈḗ ḗƞŧřẏ ẇīŧħǿŭŧ şƥḗƈīƒẏīƞɠ ȧ ŀǿƈȧŧīǿƞ" + +#. ./manifests/source.pp:47 +msgid "key hash must contain at least an id entry" +msgstr "ķḗẏ ħȧşħ ḿŭşŧ ƈǿƞŧȧīƞ ȧŧ ŀḗȧşŧ ȧƞ īḓ ḗƞŧřẏ" + +#. ./manifests/source.pp:86 +msgid "Received invalid value for pin parameter" +msgstr "Řḗƈḗīṽḗḓ īƞṽȧŀīḓ ṽȧŀŭḗ ƒǿř ƥīƞ ƥȧřȧḿḗŧḗř" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:122 +msgid "The file %{_value} does not exist" +msgstr "Ŧħḗ ƒīŀḗ %{_value} ḓǿḗş ƞǿŧ ḗẋīşŧ" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:218 +msgid "This is a read-only property." +msgstr "Ŧħīş īş ȧ řḗȧḓ-ǿƞŀẏ ƥřǿƥḗřŧẏ." + +#: ../lib/puppet/type/apt_key.rb:23 +msgid "The properties content and source are mutually exclusive." +msgstr "Ŧħḗ ƥřǿƥḗřŧīḗş ƈǿƞŧḗƞŧ ȧƞḓ şǿŭřƈḗ ȧřḗ ḿŭŧŭȧŀŀẏ ḗẋƈŀŭşīṽḗ." + +#. metadata.json +#: .summary +msgid "" +"Provides an interface for managing Apt source, key, and definitions with " +"Puppet" +msgstr "" +"Ƥřǿṽīḓḗş ȧƞ īƞŧḗřƒȧƈḗ ƒǿř ḿȧƞȧɠīƞɠ Ȧƥŧ şǿŭřƈḗ, ķḗẏ, ȧƞḓ ḓḗƒīƞīŧīǿƞş ẇīŧħ " +"Ƥŭƥƥḗŧ" + +#. ./manifests/params.pp:97 +msgid "Unable to determine value for fact os[\"name\"]" +msgstr "Ŭƞȧƀŀḗ ŧǿ ḓḗŧḗřḿīƞḗ ṽȧŀŭḗ ƒǿř ƒȧƈŧ ǿş[\"ƞȧḿḗ\"]" + +#. ./manifests/key.pp:29 +msgid "key with id %{_id} already ensured as absent" +msgstr "ķḗẏ ẇīŧħ īḓ %{_id} ȧŀřḗȧḓẏ ḗƞşŭřḗḓ ȧş ȧƀşḗƞŧ" + +#. ./manifests/key.pp:62 +msgid "key with id %{_id} already ensured as present" +msgstr "ķḗẏ ẇīŧħ īḓ %{_id} ȧŀřḗȧḓẏ ḗƞşŭřḗḓ ȧş ƥřḗşḗƞŧ" + +#. ./manifests/key.pp:78 +msgid "Invalid 'ensure' value '%{_ensure}' for apt::key" +msgstr "Īƞṽȧŀīḓ 'ḗƞşŭřḗ' ṽȧŀŭḗ '%{_ensure}' ƒǿř ȧƥŧ::ķḗẏ" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:142 +msgid "%{_e} for %{_resource}" +msgstr "%{_e} ƒǿř %{_resource}" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:144 +msgid "could not resolve %{_resource}" +msgstr "ƈǿŭŀḓ ƞǿŧ řḗşǿŀṽḗ %{_resource}" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:171 +msgid "" +"The id in your manifest %{_resource} and the fingerprint from content/source " +"don't match. Check for an error in the id and content/source is legitimate." +msgstr "" +"Ŧħḗ īḓ īƞ ẏǿŭř ḿȧƞīƒḗşŧ %{_resource} ȧƞḓ ŧħḗ ƒīƞɠḗřƥřīƞŧ ƒřǿḿ ƈǿƞŧḗƞŧ/source " +"ḓǿƞ'ŧ ḿȧŧƈħ. Ƈħḗƈķ ƒǿř ȧƞ ḗřřǿř īƞ ŧħḗ īḓ ȧƞḓ ƈǿƞŧḗƞŧ/source īş ŀḗɠīŧīḿȧŧḗ." + +#: ../lib/puppet/provider/apt_key/apt_key.rb:202 +msgid "" +"an unexpected condition occurred while trying to add the key: %{_resource}" +msgstr "" +"ȧƞ ŭƞḗẋƥḗƈŧḗḓ ƈǿƞḓīŧīǿƞ ǿƈƈŭřřḗḓ ẇħīŀḗ ŧřẏīƞɠ ŧǿ ȧḓḓ ŧħḗ ķḗẏ: %{_resource}" + +#: ../lib/puppet/type/apt_key.rb:26 +msgid "The id should be a full fingerprint (40 characters), see README." +msgstr "Ŧħḗ īḓ şħǿŭŀḓ ƀḗ ȧ ƒŭŀŀ ƒīƞɠḗřƥřīƞŧ (40 ƈħȧřȧƈŧḗřş), şḗḗ ŘḖȦḒḾḖ." diff -Nru puppet-module-puppetlabs-apt-4.5.1/locales/puppetlabs-apt.pot puppet-module-puppetlabs-apt-6.1.1/locales/puppetlabs-apt.pot --- puppet-module-puppetlabs-apt-4.5.1/locales/puppetlabs-apt.pot 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/locales/puppetlabs-apt.pot 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,177 @@ +# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-27-gbb0f842) #-#-#-#-# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2018 Puppet, Inc. +# This file is distributed under the same license as the puppetlabs-apt package. +# FIRST AUTHOR , 2018. +# +# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-# +# +#, fuzzy +msgid "" +msgstr "" +"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-09-21 09:17:33 +0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" +"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-27-gbb0f842) #-#-#-#-#\n" +"Project-Id-Version: puppetlabs-apt 6.0.0-27-gbb0f842\n" +"\n" +"Report-Msgid-Bugs-To: docs@puppet.com\n" +"POT-Creation-Date: 2018-09-21 09:27+0100\n" +"PO-Revision-Date: 2018-09-21 09:27+0100\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To:\n" +"POT-Creation-Date: 2018-09-21T09:17:39+01:00\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 2.0.0\n" + +#. ./manifests/backports.pp:69 +msgid "" +"If not on Debian or Ubuntu, you must explicitly pass location, release, " +"repos, and key" +msgstr "" + +#. ./manifests/backports.pp:95 +msgid "pin must be either a string, number or hash" +msgstr "" + +#. ./manifests/conf.pp:25 +msgid "Need to pass in content parameter" +msgstr "" + +#. ./manifests/init.pp:143 ./manifests/params.pp:8 +msgid "This module only works on Debian or derivatives like Ubuntu" +msgstr "" + +#. ./manifests/key.pp:47 +msgid "key with id %{_id} already ensured as absent" +msgstr "" + +#. ./manifests/key.pp:81 +msgid "key with id %{_id} already ensured as present" +msgstr "" + +#. ./manifests/key.pp:97 +msgid "Invalid 'ensure' value '%{_ensure}' for apt::key" +msgstr "" + +#. ./manifests/params.pp:100 +msgid "Unable to determine value for fact os[\"name\"]" +msgstr "" + +#. ./manifests/pin.pp:84 +msgid "parameters release, origin, and version are mutually exclusive" +msgstr "" + +#. ./manifests/pin.pp:88 +msgid "parameter version cannot be used in general form" +msgstr "" + +#. ./manifests/pin.pp:91 +msgid "parameters release and origin are mutually exclusive" +msgstr "" + +#. ./manifests/ppa.pp:30 ./manifests/source.pp:79 +msgid "lsbdistcodename fact not available: release parameter required" +msgstr "" + +#. ./manifests/ppa.pp:34 +msgid "apt::ppa is not currently supported on Debian." +msgstr "" + +#. ./manifests/setting.pp:31 +msgid "apt::setting cannot have both content and source" +msgstr "" + +#. ./manifests/setting.pp:35 +msgid "apt::setting needs either of content or source" +msgstr "" + +#. ./manifests/setting.pp:43 +msgid "" +"apt::setting resource name/title must start with either 'conf-', 'pref-' or " +"'list-'" +msgstr "" + +#. ./manifests/setting.pp:49 +msgid "apt::setting priority must be an integer or a zero-padded integer" +msgstr "" + +#. ./manifests/source.pp:87 +msgid "cannot create a source entry without specifying a location" +msgstr "" + +#. ./manifests/source.pp:101 +msgid "key hash must contain at least an id entry" +msgstr "" + +#. ./manifests/source.pp:140 +msgid "Received invalid value for pin parameter" +msgstr "" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:124 +msgid "The file %{_value} does not exist" +msgstr "" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:144 +msgid "%{_e} for %{_resource}" +msgstr "" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:146 +msgid "could not resolve %{_resource}" +msgstr "" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:173 +msgid "" +"The id in your manifest %{_resource} and the fingerprint from content/source " +"don't match. Check for an error in the id and content/source is legitimate." +msgstr "" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:191 +#: ../lib/puppet/provider/apt_key/apt_key.rb:227 +msgid "" +"an unexpected condition occurred while trying to add the key: %{_resource}" +msgstr "" + +#: ../lib/puppet/provider/apt_key/apt_key.rb:243 +msgid "This is a read-only property." +msgstr "" + +#: ../lib/puppet/type/apt_key.rb:27 +msgid "ensure => absent and refresh => true are mutually exclusive" +msgstr "" + +#: ../lib/puppet/type/apt_key.rb:30 +msgid "The properties content and source are mutually exclusive." +msgstr "" + +#: ../lib/puppet/type/apt_key.rb:33 +msgid "The id should be a full fingerprint (40 characters), see README." +msgstr "" + +#. metadata.json +#: .summary +msgid "" +"Provides an interface for managing Apt source, key, and definitions with " +"Puppet" +msgstr "" diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/backports.pp puppet-module-puppetlabs-apt-6.1.1/manifests/backports.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/backports.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/backports.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,4 +1,50 @@ -# Defining backports for the apt class +# @summary Manages backports. +# +# @example Set up a backport for linuxmint qiana +# apt::backports { 'qiana': +# location => 'http://us.archive.ubuntu.com/ubuntu', +# release => 'trusty-backports', +# repos => 'main universe multiverse restricted', +# key => { +# id => '630239CC130E1A7FD81A27B140976EAF437D05B5', +# server => 'hkps.pool.sks-keyservers.net', +# }, +# } +# +# @param location +# Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Default value for Debian and +# Ubuntu varies: +# +# - Debian: 'http://deb.debian.org/debian' +# +# - Ubuntu: 'http://archive.ubuntu.com/ubuntu' +# +# @param release +# Specifies a distribution of the Apt repository containing the backports to manage. 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. +# +# @param repos +# Specifies a component of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. +# Default value for Debian and Ubuntu varies: +# +# - Debian: 'main contrib non-free' +# +# - Ubuntu: 'main universe multiverse restricted' +# +# @param 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. Default value +# for Debian and Ubuntu varies: +# +# - Debian: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' +# +# - Ubuntu: '630239CC130E1A7FD81A27B140976EAF437D05B5' +# +# @param pin +# 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. +# class apt::backports ( Optional[String] $location = undef, Optional[String] $release = undef, @@ -18,24 +64,23 @@ if $key { $_key = $key } - if ($facts['lsbdistid'] == 'Debian' or $facts['lsbdistid'] == 'Ubuntu') { - unless $location { - $_location = $::apt::backports['location'] - } - unless $release { - $_release = "${facts['lsbdistcodename']}-backports" - } - unless $repos { - $_repos = $::apt::backports['repos'] - } - unless $key { - $_key = $::apt::backports['key'] - } - } else { + if (!($facts['lsbdistid'] == 'Debian' or $facts['lsbdistid'] == 'Ubuntu')) { unless $location and $release and $repos and $key { - fail('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key') + fail(translate('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')) } } + unless $location { + $_location = $::apt::backports['location'] + } + unless $release { + $_release = "${facts['lsbdistcodename']}-backports" + } + unless $repos { + $_repos = $::apt::backports['repos'] + } + unless $key { + $_key = $::apt::backports['key'] + } if $pin =~ Hash { $_pin = $pin @@ -47,7 +92,7 @@ 'release' => $_release, } } else { - fail('pin must be either a string, number or hash') + fail(translate('pin must be either a string, number or hash')) } apt::source { 'backports': diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/conf.pp puppet-module-puppetlabs-apt-6.1.1/manifests/conf.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/conf.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/conf.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,4 +1,18 @@ -# Defining apt config +# @summary Specifies a custom Apt configuration file. +# +# @param content +# Required unless `ensure` is set to 'absent'. Directly supplies content for the configuration file. +# +# @param ensure +# Specifies whether the configuration file should exist. Valid options: 'present' and 'absent'. +# +# @param priority +# 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 or an integer. +# +# @param notify_update +# Specifies whether to trigger an `apt-get update` run. +# define apt::conf ( Optional[String] $content = undef, Enum['present', 'absent'] $ensure = present, @@ -8,7 +22,7 @@ unless $ensure == 'absent' { unless $content { - fail('Need to pass in content parameter') + fail(translate('Need to pass in content parameter')) } } diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/init.pp puppet-module-puppetlabs-apt-6.1.1/manifests/init.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/init.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/init.pp 2018-10-02 09:50:52.000000000 +0000 @@ -1,6 +1,112 @@ -# == Class: apt +# @summary Main class, includes all other classes. # -# Manage APT (Advanced Packaging Tool) +# @see https://docs.puppetlabs.com/references/latest/function.html#createresources for the create resource function +# +# @param provider +# Specifies the provider that should be used by apt::update. +# +# @param keyserver +# Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or +# hkp://). +# +# @param ppa_options +# Supplies options to be passed to the `add-apt-repository` command. +# +# @param ppa_package +# Names the package that provides the `apt-add-repository` command. +# +# @param backports +# Specifies some of the default parameters used by apt::backports. Valid options: a hash made up from the following keys: +# +# @option backports [String] :location +# See apt::backports for documentation. +# +# @option backports [String] :repos +# See apt::backports for documentation. +# +# @option backports [String] :key +# See apt::backports for documentation. +# +# @param confs +# Creates new `apt::conf` resources. Valid options: a hash to be passed to the create_resources function linked above. +# +# @param update +# Configures various update settings. Valid options: a hash made up from the following keys: +# +# @option update [String] :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'. +# +# @option update [Integer] :loglevel +# Specifies the log level of logs outputted to the console. Default: undef. +# +# @option update [Integer] :timeout +# Specifies how long to wait for the update to complete before canceling it. Valid options: an integer, in seconds. Default: undef. +# +# @option update [Integer] :tries +# Specifies how many times to retry the update after receiving a DNS or HTTP error. Default: undef. +# +# @param purge +# Specifies whether to purge any existing settings that aren't managed by Puppet. Valid options: a hash made up from the following keys: +# +# @option purge [Boolean] :sources.list +# Specifies whether to purge any unmanaged entries from sources.list. Default false. +# +# @option purge [Boolean] :sources.list.d +# Specifies whether to purge any unmanaged entries from sources.list.d. Default false. +# +# @option purge [Boolean] :preferences +# Specifies whether to purge any unmanaged entries from preferences. Default false. +# +# @option purge [Boolean] :preferences.d. +# Specifies whether to purge any unmanaged entries from preferences.d. Default false. +# +# @param proxy +# Configures Apt to connect to a proxy server. Valid options: a hash matching the locally defined type apt::proxy. +# +# @param sources +# Creates new `apt::source` resources. Valid options: a hash to be passed to the create_resources function linked above. +# +# @param keys +# Creates new `apt::key` resources. Valid options: a hash to be passed to the create_resources function linked above. +# +# @param ppas +# Creates new `apt::ppa` resources. Valid options: a hash to be passed to the create_resources function linked above. +# +# @param pins +# Creates new `apt::pin` resources. Valid options: a hash to be passed to the create_resources function linked above. +# +# @param settings +# Creates new `apt::setting` resources. Valid options: a hash to be passed to the create_resources function linked above. +# +# @param auth_conf_entries +# An optional array of login configuration settings (hashes) that are recorded in the file /etc/apt/auth.conf. This file has a netrc-like +# format (similar to what curl uses) and contains the login configuration for APT sources and proxies that require authentication. See +# https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html for details. If specified each hash must contain the keys machine, login and +# password and no others. +# +# @param root +# Specifies root directory of Apt executable. +# +# @param sources_list +# Specifies the path of the sources_list file to use. +# +# @param sources_list_d +# Specifies the path of the sources_list.d file to use. +# +# @param conf_d +# Specifies the path of the conf.d file to use. +# +# @param preferences +# Specifies the path of the preferences file to use. +# +# @param preferences_d +# Specifies the path of the preferences.d file to use. +# +# @param config_files +# A hash made up of the various configuration files used by Apt. # class apt ( Hash $update_defaults = $apt::params::update_defaults, @@ -15,12 +121,14 @@ Hash $confs = $apt::params::confs, Hash $update = $apt::params::update, Hash $purge = $apt::params::purge, - Hash $proxy = $apt::params::proxy, + Apt::Proxy $proxy = $apt::params::proxy, Hash $sources = $apt::params::sources, Hash $keys = $apt::params::keys, Hash $ppas = $apt::params::ppas, Hash $pins = $apt::params::pins, Hash $settings = $apt::params::settings, + Array[Apt::Auth_conf_entry] + $auth_conf_entries = $apt::params::auth_conf_entries, String $root = $apt::params::root, String $sources_list = $apt::params::sources_list, String $sources_list_d = $apt::params::sources_list_d, @@ -28,11 +136,11 @@ String $preferences = $apt::params::preferences, String $preferences_d = $apt::params::preferences_d, Hash $config_files = $apt::params::config_files, - Hash $source_key_defaults = $apt::params::source_key_defaults + Hash $source_key_defaults = $apt::params::source_key_defaults, ) inherits apt::params { if $facts['osfamily'] != 'Debian' { - fail('This module only works on Debian or derivatives like Ubuntu') + fail(translate('This module only works on Debian or derivatives like Ubuntu')) } if $update['frequency'] { @@ -65,23 +173,6 @@ } $_purge = merge($::apt::purge_defaults, $purge) - - if $proxy['ensure'] { - assert_type(Enum['file', 'present', 'absent'], $proxy['ensure']) - } - if $proxy['host'] { - assert_type(String, $proxy['host']) - } - if $proxy['port'] { - assert_type(Integer, $proxy['port']) - } - if $proxy['https']{ - assert_type(Boolean, $proxy['https']) - } - if $proxy['direct']{ - assert_type(Boolean, $proxy['direct']) - } - $_proxy = merge($apt::proxy_defaults, $proxy) $confheadertmp = epp('apt/_conf_header.epp') @@ -178,23 +269,27 @@ create_resources('apt::setting', $settings) } + $auth_conf_ensure = $auth_conf_entries ? { + [] => 'absent', + default => 'present', + } + + $auth_conf_tmp = epp('apt/auth_conf.epp') + + file { '/etc/apt/auth.conf': + ensure => $auth_conf_ensure, + owner => 'root', + group => 'root', + mode => '0600', + content => "${confheadertmp}${auth_conf_tmp}", + notify => Class['apt::update'], + } + # manage pins if present if $pins { create_resources('apt::pin', $pins) } # required for adding GPG keys on Debian 9 (and derivatives) - case $facts['os']['name'] { - 'Debian': { - if versioncmp($facts['os']['release']['major'], '9') >= 0 { - ensure_packages(['dirmngr']) - } - } - 'Ubuntu': { - if versioncmp($facts['os']['release']['full'], '17.04') >= 0 { - ensure_packages(['dirmngr']) - } - } - default: { } - } + ensure_packages(['dirmngr']) } diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/key.pp puppet-module-puppetlabs-apt-6.1.1/manifests/key.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/key.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/key.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,37 +1,56 @@ -# == Define: apt::key +# @summary Manages the GPG keys that Apt uses to authenticate packages. +# +# @note +# The apt::key defined type makes use of the apt_key type, but includes extra functionality to help prevent duplicate keys. +# +# @example Declare Apt key for apt.puppetlabs.com source +# apt::key { 'puppetlabs': +# id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', +# server => 'hkps.pool.sks-keyservers.net', +# options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"', +# } +# +# @param 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). +# +# @param ensure +# Specifies whether the key should exist. Valid options: 'present', 'absent' or 'refreshed'. Using 'refreshed' will make keys auto +# update when they have expired (assuming a new key exists on the key server). +# +# @param 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. +# +# @param 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. +# +# @param 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://). +# +# @param options +# Passes additional options to `apt-key adv --keyserver-options`. +# define apt::key ( - String $id = $title, - Enum['present', 'absent'] $ensure = present, - Optional[String] $content = undef, - Optional[String] $source = undef, - String $server = $::apt::keyserver, - Optional[String] $options = undef, - ) { - - assert_type( - Pattern[ - /\A(0x)?[0-9a-fA-F]{8}\Z/, - /\A(0x)?[0-9a-fA-F]{16}\Z/, - /\A(0x)?[0-9a-fA-F]{40}\Z/, - ], $id) - - if $source { - assert_type(Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/], $source) - } - - if $server { - assert_type(Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/], $server) - } + Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/] $id = $title, + Enum['present', 'absent', 'refreshed'] $ensure = present, + Optional[String] $content = undef, + Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]] $source = undef, + Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/] $server = $::apt::keyserver, + Optional[String] $options = undef, + ) { case $ensure { - present: { + /^(refreshed|present)$/: { if defined(Anchor["apt_key ${id} absent"]){ - fail("key with id ${id} already ensured as absent") + fail(translate('key with id %{_id} already ensured as absent'),{'_id' => id}) } if !defined(Anchor["apt_key ${id} present"]) { apt_key { $title: - ensure => $ensure, + ensure => present, + refresh => $ensure == 'refreshed', id => $id, source => $source, content => $content, @@ -59,7 +78,7 @@ absent: { if defined(Anchor["apt_key ${id} present"]){ - fail("key with id ${id} already ensured as present") + fail(translate('key with id %{_id} already ensured as present', {'_id' => id})) } if !defined(Anchor["apt_key ${id} absent"]){ @@ -75,7 +94,7 @@ } default: { - fail "Invalid 'ensure' value '${ensure}' for apt::key" + fail translate('Invalid \'ensure\' value \'%{_ensure}\' for apt::key', {'_ensure' => ensure}) } } } diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/params.pp puppet-module-puppetlabs-apt-6.1.1/manifests/params.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/params.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/params.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,14 +1,18 @@ -# Setting params for the module +# @summary Provides defaults for the Apt module parameters. +# +# @api private +# class apt::params { if $::osfamily != 'Debian' { - fail('This module only works on Debian or derivatives like Ubuntu') + fail(translate('This module only works on Debian or derivatives like Ubuntu')) } $root = '/etc/apt' $provider = '/usr/bin/apt-get' $sources_list = "${root}/sources.list" $sources_list_d = "${root}/sources.list.d" + $trusted_gpg_d = "${root}/trusted.gpg.d" $conf_d = "${root}/apt.conf.d" $preferences = "${root}/preferences" $preferences_d = "${root}/preferences.d" @@ -22,6 +26,7 @@ $ppas = {} $pins = {} $settings = {} + $auth_conf_entries = [] $config_files = { 'conf' => { @@ -74,19 +79,13 @@ case $facts['os']['name']{ 'Debian': { - case $facts['os']['release']['full'] { - default: { $backports = { 'location' => 'http://deb.debian.org/debian', 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', 'repos' => 'main contrib non-free', } - } - } - $ppa_options = undef $ppa_package = undef - } 'Ubuntu': { $backports = { @@ -94,28 +93,11 @@ 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5', 'repos' => 'main universe multiverse restricted', } - - case $facts['os']['release']['full'] { - '10.04': { - $ppa_options = undef - $ppa_package = 'python-software-properties' - } - '12.04': { - $ppa_options = '-y' - $ppa_package = 'python-software-properties' - } - '14.04', '14.10', '15.04', '15.10', '16.04': { - $ppa_options = '-y' - $ppa_package = 'software-properties-common' - } - default: { - $ppa_options = '-y' - $ppa_package = 'python-software-properties' - } - } + $ppa_options = '-y' + $ppa_package = 'software-properties-common' } undef: { - fail('Unable to determine value for fact os["name"]') + fail(translate('Unable to determine value for fact os[\"name\"]')) } default: { $ppa_options = undef diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/pin.pp puppet-module-puppetlabs-apt-6.1.1/manifests/pin.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/pin.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/pin.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,6 +1,38 @@ -# pin.pp -# pin a release in apt, useful for unstable repositories - +# @summary Manages Apt pins. Does not trigger an apt-get update run. +# +# @see http://linux.die.net/man/5/apt_preferences for context on these parameters +# +# @param ensure +# Specifies whether the pin should exist. Valid options: 'file', 'present', and 'absent'. +# +# @param explanation +# Supplies a comment to explain the pin. Default: "${caller_module_name}: ${name}". +# +# @param order +# Determines the order in which Apt processes the pin file. Files with lower order numbers are loaded first. +# +# @param packages +# Specifies which package(s) to pin. +# +# @param 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. +# +# @param release +# Tells APT to prefer packages that support the specified release. Typical values include 'stable', 'testing', and 'unstable'. +# +# @param release_version +# Tells APT to prefer packages that support the specified operating system release version (such as Debian release version 7). +# +# @param component +# Names the licensing component associated with the packages in the directory tree of the Release file. +# +# @param originator +# Names the originator of the packages in the directory tree of the Release file. +# +# @param label +# Names the label of the packages in the directory tree of the Release file. +# define apt::pin( Optional[Enum['file', 'present', 'absent']] $ensure = present, Optional[String] $explanation = undef, @@ -49,14 +81,14 @@ 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') + fail(translate('parameters release, origin, and version are mutually exclusive')) } } else { # general form if $version != '' { - fail('parameter version cannot be used in general form') + fail(translate('parameter version cannot be used in general form')) } if ( $pin_release != '' and $origin != '' ) { - fail('parameters release and origin are mutually exclusive') + fail(translate('parameters release and origin are mutually exclusive')) } } diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/ppa.pp puppet-module-puppetlabs-apt-6.1.1/manifests/ppa.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/ppa.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/ppa.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,4 +1,24 @@ -# ppa.pp +# @summary Manages PPA repositories using `add-apt-repository`. Not supported on Debian. +# +# @example Example declaration of an Apt PPA +# apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': } +# +# @param ensure +# Specifies whether the PPA should exist. Valid options: 'present' and 'absent'. +# +# @param options +# Supplies options to be passed to the `add-apt-repository` command. Default: '-y'. +# +# @param 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. +# +# @param package_name +# Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'. +# +# @param package_manage +# Specifies whether Puppet should manage the package that provides `apt-add-repository`. +# define apt::ppa( String $ensure = 'present', Optional[String] $options = $::apt::ppa_options, @@ -7,23 +27,34 @@ Boolean $package_manage = false, ) { unless $release { - fail('lsbdistcodename fact not available: release parameter required') + fail(translate('lsbdistcodename fact not available: release parameter required')) } if $facts['lsbdistid'] == 'Debian' { - fail('apt::ppa is not currently supported on Debian.') + fail(translate('apt::ppa is not currently supported on Debian.')) } - if versioncmp($facts['lsbdistrelease'], '15.10') >= 0 { + if versioncmp($facts['lsbdistrelease'], '14.10') >= 0 { $distid = downcase($facts['lsbdistid']) - $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2-${release}") + $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2") + $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2") } else { - $filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2-${release}") + $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2") + $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_\\2") } - $filename_no_slashes = regsubst($filename, '/', '-', 'G') - $filename_no_specialchars = regsubst($filename_no_slashes, '[\.\+]', '_', 'G') - $sources_list_d_filename = "${filename_no_specialchars}.list" + $dash_filename_no_slashes = regsubst($dash_filename, '/', '-', 'G') + $dash_filename_no_specialchars = regsubst($dash_filename_no_slashes, '[\.\+]', '_', 'G') + $underscore_filename_no_slashes = regsubst($underscore_filename, '/', '-', 'G') + $underscore_filename_no_specialchars = regsubst($underscore_filename_no_slashes, '[\.\+]', '_', 'G') + + $sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list" + + if versioncmp($facts['lsbdistrelease'], '15.10') >= 0 { + $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg" + } else { + $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg" + } if $ensure == 'present' { if $package_manage { @@ -46,8 +77,8 @@ exec { "add-apt-repository-${name}": environment => $_proxy_env, - command => "/usr/bin/add-apt-repository ${options} ${name}", - unless => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename}", + command => "/usr/bin/add-apt-repository ${options} ${name} || (rm ${::apt::sources_list_d}/${sources_list_d_filename} && false)", + unless => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename} && /usr/bin/test -f ${::apt::trusted_gpg_d}/${trusted_gpg_d_filename}", user => 'root', logoutput => 'on_failure', notify => Class['apt::update'], diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/setting.pp puppet-module-puppetlabs-apt-6.1.1/manifests/setting.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/setting.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/setting.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,4 +1,24 @@ -# Defining apt settings +# @summary Manages Apt configuration files. +# +# @see https://docs.puppetlabs.com/references/latest/type.html#file-attributes for more information on source and content parameters +# +# @param priority +# Determines the order in which Apt processes the configuration file. Files with higher priority numbers are loaded first. +# +# @param ensure +# Specifies whether the file should exist. Valid options: 'present', 'absent', and 'file'. +# +# @param 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 link above for Puppet's native file type source attribute. +# +# @param content +# Required, unless `source` is set. Directly supplies content for the configuration file. Cannot be used in combination with `source`. Valid +# options: see link above for Puppet's native file type content attribute. +# +# @param notify_update +# Specifies whether to trigger an `apt-get update` run. +# define apt::setting ( Variant[String, Integer, Array] $priority = 50, Optional[Enum['file', 'present', 'absent']] $ensure = file, @@ -8,11 +28,11 @@ ) { if $content and $source { - fail('apt::setting cannot have both content and source') + fail(translate('apt::setting cannot have both content and source')) } if !$content and !$source { - fail('apt::setting needs either of content or source') + fail(translate('apt::setting needs either of content or source')) } $title_array = split($title, '-') @@ -20,13 +40,13 @@ $base_name = join(delete_at($title_array, 0), '-') assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| { - fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'") + fail(translate("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")) } if $priority !~ Integer { # need this to allow zero-padded priority. assert_type(Pattern[/^\d+$/], $priority) |$a, $b| { - fail('apt::setting priority must be an integer or a zero-padded integer') + fail(translate('apt::setting priority must be an integer or a zero-padded integer')) } } diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/source.pp puppet-module-puppetlabs-apt-6.1.1/manifests/source.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/source.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/source.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,5 +1,59 @@ -# source.pp -# add an apt source +# @summary Manages the Apt sources in /etc/apt/sources.list.d/. +# +# @example Install the puppetlabs apt source +# apt::source { 'puppetlabs': +# location => 'http://apt.puppetlabs.com', +# repos => 'main', +# key => { +# id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', +# server => 'hkps.pool.sks-keyservers.net', +# }, +# } +# +# @param location +# Required, unless ensure is set to 'absent'. Specifies an Apt repository. Valid options: a string containing a repository URL. +# +# @param comment +# Supplies a comment for adding to the Apt source file. +# +# @param ensure +# Specifies whether the Apt source file should exist. Valid options: 'present' and 'absent'. +# +# @param release +# Specifies a distribution of the Apt repository. +# +# @param repos +# Specifies a component of the Apt repository. +# +# @param include +# Configures include options. Valid options: a hash of available keys. +# +# @option include [Boolean] :deb +# Specifies whether to request the distribution's compiled binaries. Default true. +# +# @option include [Boolean] :src +# Specifies whether to request the distribution's uncompiled source code. Default false. +# +# @param 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. +# +# @param 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. +# +# @param 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). +# +# @param 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. +# +# @param notify_update +# Specifies whether to trigger an `apt-get update` run. +# define apt::source( Optional[String] $location = undef, String $comment = $name, @@ -14,7 +68,6 @@ Boolean $notify_update = true, ) { - # This is needed for compat with 1.8.x include ::apt $_before = Apt::Setting["list-${title}"] @@ -23,23 +76,20 @@ if $facts['lsbdistcodename'] { $_release = $facts['lsbdistcodename'] } else { - fail('lsbdistcodename fact not available: release parameter required') + fail(translate('lsbdistcodename fact not available: release parameter required')) } } else { $_release = $release } - # Some releases do not support https transport with default installation - $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ] - if $ensure == 'present' { if ! $location { - fail('cannot create a source entry without specifying a location') - } elsif $_release in $_transport_https_releases { - $method = split($location, '[:\/]+')[0] - if $method == 'https' { - ensure_packages('apt-transport-https') - } + fail(translate('cannot create a source entry without specifying a location')) + } + # Newer oses, do not need the package for HTTPS transport. + $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ] + if $_release in $_transport_https_releases and $location =~ /(?i:^https:\/\/)/ { + ensure_packages('apt-transport-https') } } @@ -48,7 +98,7 @@ if $key { if $key =~ Hash { unless $key['id'] { - fail('key hash must contain at least an id entry') + fail(translate('key hash must contain at least an id entry')) } $_key = merge($::apt::source_key_defaults, $key) } else { @@ -87,7 +137,7 @@ 'origin' => $host, } } else { - fail('Received invalid value for pin parameter') + fail(translate('Received invalid value for pin parameter')) } create_resources('apt::pin', { "${name}" => $_pin }) } diff -Nru puppet-module-puppetlabs-apt-4.5.1/manifests/update.pp puppet-module-puppetlabs-apt-6.1.1/manifests/update.pp --- puppet-module-puppetlabs-apt-4.5.1/manifests/update.pp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/manifests/update.pp 2018-10-01 08:30:41.000000000 +0000 @@ -1,4 +1,7 @@ -# Defining apt update +# @summary Updates the list of available packages using apt-get update. +# +# @api private +# class apt::update { assert_private() @@ -14,7 +17,7 @@ 'daily': { #compare current date with the apt_update_last_success fact to determine #if we should kick apt_update. - $daily_threshold = (strftime('%s') - 86400) + $daily_threshold = (Integer(Timestamp().strftime('%s')) - 86400) if $::apt_update_last_success { if $::apt_update_last_success + 0 < $daily_threshold { $_kick_apt = true @@ -29,7 +32,7 @@ 'weekly':{ #compare current date with the apt_update_last_success fact to determine #if we should kick apt_update. - $weekly_threshold = (strftime('%s') - 604800) + $weekly_threshold = (Integer(Timestamp().strftime('%s')) - 604800) if $::apt_update_last_success { if ( $::apt_update_last_success + 0 < $weekly_threshold ) { $_kick_apt = true diff -Nru puppet-module-puppetlabs-apt-4.5.1/metadata.json puppet-module-puppetlabs-apt-6.1.1/metadata.json --- puppet-module-puppetlabs-apt-4.5.1/metadata.json 2018-02-05 19:29:47.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/metadata.json 2018-10-02 09:52:04.000000000 +0000 @@ -1,7 +1,7 @@ { "name": "puppetlabs-apt", - "version": "4.5.1", - "author": "Puppet Labs", + "version": "6.1.1", + "author": "puppetlabs", "summary": "Provides an interface for managing Apt source, key, and definitions with Puppet", "license": "Apache-2.0", "source": "https://github.com/puppetlabs/puppetlabs-apt", @@ -10,7 +10,11 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.16.0 < 5.0.0" + "version_requirement": ">= 4.16.0 < 6.0.0" + }, + { + "name": "puppetlabs/translate", + "version_requirement": ">= 1.0.0 < 2.0.0" } ], "data_provider": null, @@ -18,24 +22,26 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "7", - "8" + "8", + "9" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", - "16.04" + "16.04", + "18.04" ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.7.0 < 6.0.0" + "version_requirement": ">= 4.8.0 < 7.0.0" } ], - "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git", - "template-ref": "1.3.2-0-g07678c8" + "template-url": "https://github.com/puppetlabs/pdk-templates", + "template-ref": "heads/master-0-g8fc95db", + "pdk-version": "1.7.0" } diff -Nru puppet-module-puppetlabs-apt-4.5.1/Rakefile puppet-module-puppetlabs-apt-6.1.1/Rakefile --- puppet-module-puppetlabs-apt-4.5.1/Rakefile 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/Rakefile 2018-10-01 08:30:41.000000000 +0000 @@ -1,3 +1,76 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' -require 'puppet_blacksmith/rake_tasks' +require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? +require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? +require 'puppet_pot_generator/rake_tasks' + +def changelog_user + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = nil || JSON.load(File.read('metadata.json'))['author'] + raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator user:#{returnVal}" + returnVal +end + +def changelog_project + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = nil || JSON.load(File.read('metadata.json'))['name'] + raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator project:#{returnVal}" + returnVal +end + +def changelog_future_release + return unless Rake.application.top_level_tasks.include? "changelog" + returnVal = JSON.load(File.read('metadata.json'))['version'] + raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator future_release:#{returnVal}" + returnVal +end + +PuppetLint.configuration.send('disable_relative') + +if Bundler.rubygems.find_name('github_changelog_generator').any? + GitHubChangelogGenerator::RakeTask.new :changelog do |config| + raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? + config.user = "#{changelog_user}" + config.project = "#{changelog_project}" + config.future_release = "#{changelog_future_release}" + config.exclude_labels = ['maintenance'] + config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." + config.add_pr_wo_labels = true + config.issues = false + config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" + config.configure_sections = { + "Changed" => { + "prefix" => "### Changed", + "labels" => ["backwards-incompatible"], + }, + "Added" => { + "prefix" => "### Added", + "labels" => ["feature", "enhancement"], + }, + "Fixed" => { + "prefix" => "### Fixed", + "labels" => ["bugfix"], + }, + } + end +else + desc 'Generate a Changelog from GitHub' + task :changelog do + raise <= Gem::Version.new('2.2.2')" +EOM + end +end + diff -Nru puppet-module-puppetlabs-apt-4.5.1/README.md puppet-module-puppetlabs-apt-6.1.1/README.md --- puppet-module-puppetlabs-apt-4.5.1/README.md 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/README.md 2018-10-01 08:30:41.000000000 +0000 @@ -11,24 +11,19 @@ * [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) + * [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) 1. [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) - * [Tasks](#tasks) 1. [Limitations - OS compatibility, etc.](#limitations) 1. [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. +The apt module lets you use Puppet to manage APT (Advanced Package Tool) 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. +APT 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. @@ -125,7 +120,7 @@ To pin multiple packages, pass them to the `packages` parameter as an array or a space-delimited string. -### Add a Personal Package Archive repository +### Add a Personal Package Archive (PPA) repository ```puppet apt::ppa { 'ppa:drizzle-developers/ppa': } @@ -166,9 +161,7 @@ ### 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. +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: @@ -226,32 +219,36 @@ } ``` -## Reference - -### Classes - -#### Public Classes - -* [`apt`](#class-apt) -* [`apt::backports`](#class-aptbackports) - -#### Private Classes +### Manage login configuration settings for an APT source or proxy in `/etc/apt/auth.conf` -* `apt::params`: Provides defaults for the apt module parameters. -* `apt::update`: Updates the list of available packages using `apt-get update`. +Starting with APT version 1.5, you can define login configuration settings, such as +username and password, for APT sources or proxies that require authentication +in the `/etc/apt/auth.conf` file. This is preferable to embedding login +information directly in `source.list` entries, which are usually world-readable. -### Defined Types +The `/etc/apt/auth.conf` file follows the format of netrc (used by ftp or +curl) and has restrictive file permissions. See [here](https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html) for details. -* [`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) +Use the optional `apt::auth_conf_entries` parameter to specify an array of hashes containing login configuration settings. These hashes may only contain the `machine`, `login` and `password` keys. -### Types +```puppet +class { 'apt': + auth_conf_entries => [ + { + 'machine' => 'apt-proxy.example.net', + 'login' => 'proxylogin', + 'password' => 'proxypassword', + }, + { + 'machine' => 'apt.example.com/ubuntu', + 'login' => 'reader', + 'password' => 'supersecret', + }, + ], +} +``` -* [`apt_key`](#type-apt_key) +## Reference ### Facts @@ -271,264 +268,19 @@ * `apt_reboot_required`: Determines if a reboot is necessary after updates have been installed. -### Tasks - -The Apt module has an example task that allows a user to run apt-get update or upgrade. Please refer to to the [PE documentation](https://puppet.com/docs/pe/2017.3/orchestrator/running_tasks.html) or [Bolt documentation](https://puppet.com/docs/bolt/latest/bolt.html) on how to execute a task. - -#### Class: `apt` - -Main class, includes all other classes. - -##### Parameters - -All parameters are optional unless specified. - -* `confs`: Creates new `apt::conf` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}. - -* `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: an integer 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'. - - * `direct`: Specifies whether or not to use a 'DIRECT' https proxy if http proxy is used but https is not. Valid options: `true` and `false`. Default: `false`. - -* `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 parameters are optional on Debian and Ubuntu and 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: 'http://deb.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 - -All parameters are optional unless specified. - - -* `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'. +### More Information -#### 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 parameters are optional unless specified. - -* `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 (such as 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 parameters are optional unless 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 and newer: 'software-properties-common' - * All others: 'python-software-properties' - -* `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 - -All parameters are optional unless specified. - -* `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 parameters are optional unless 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'. - -* `notify_update`: *Optional.* Specifies whether to trigger an `apt-get update` run. Valid options: `true` and `false`. Default: `true`. - -#### 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 parameters are 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. +See [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-motd/blob/master/REFERENCE.md) for all other reference documentation. ## 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). +For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-apt/blob/master/metadata.json) + ### 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). +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']`, as well as 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). Before running the command below, ensure that all packages have the provider set to apt. ```puppet Class['apt::update'] -> Package <| provider == 'apt' |> diff -Nru puppet-module-puppetlabs-apt-4.5.1/REFERENCE.md puppet-module-puppetlabs-apt-6.1.1/REFERENCE.md --- puppet-module-puppetlabs-apt-4.5.1/REFERENCE.md 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/REFERENCE.md 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,865 @@ +# Reference + + +## Table of Contents + +**Classes** + +_Public Classes_ + +* [`apt`](#apt): Main class, includes all other classes. +* [`apt::backports`](#aptbackports): Manages backports. + +_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`](#aptconf): Specifies a custom Apt configuration file. +* [`apt::key`](#aptkey): Manages the GPG keys that Apt uses to authenticate packages. +* [`apt::pin`](#aptpin): Manages Apt pins. Does not trigger an apt-get update run. +* [`apt::ppa`](#aptppa): Manages PPA repositories using `add-apt-repository`. Not supported on Debian. +* [`apt::setting`](#aptsetting): Manages Apt configuration files. +* [`apt::source`](#aptsource): Manages the Apt sources in /etc/apt/sources.list.d/. + +**Resource types** + +_Public Resource types_ + + +_Private Resource types_ + +* `apt_key`: 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. + +**Tasks** + +* [`init`](#init): Allows you to perform apt functions + +## Classes + +### apt + +Main class, includes all other classes. + +* **See also** +https://docs.puppetlabs.com/references/latest/function.html#createresources +for the create resource function + +#### Parameters + +The following parameters are available in the `apt` class. + +##### `provider` + +Data type: `String` + +Specifies the provider that should be used by apt::update. + +Default value: $apt::params::provider + +##### `keyserver` + +Data type: `String` + +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 value: $apt::params::keyserver + +##### `ppa_options` + +Data type: `Optional[String]` + +Supplies options to be passed to the `add-apt-repository` command. + +Default value: $apt::params::ppa_options + +##### `ppa_package` + +Data type: `Optional[String]` + +Names the package that provides the `apt-add-repository` command. + +Default value: $apt::params::ppa_package + +##### `backports` + +Data type: `Optional[Hash]` + +Specifies some of the default parameters used by apt::backports. Valid options: a hash made up from the following keys: + +Options: + +* **:location** `String`: See apt::backports for documentation. +* **:repos** `String`: See apt::backports for documentation. +* **:key** `String`: See apt::backports for documentation. + +Default value: $apt::params::backports + +##### `confs` + +Data type: `Hash` + +Creates new `apt::conf` resources. Valid options: a hash to be passed to the create_resources function linked above. + +Default value: $apt::params::confs + +##### `update` + +Data type: `Hash` + +Configures various update settings. Valid options: a hash made up from the following keys: + +Options: + +* **:frequency** `String`: 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'. +* **:loglevel** `Integer`: Specifies the log level of logs outputted to the console. Default: undef. +* **:timeout** `Integer`: Specifies how long to wait for the update to complete before canceling it. Valid options: an integer, in seconds. Default: undef. +* **:tries** `Integer`: Specifies how many times to retry the update after receiving a DNS or HTTP error. Default: undef. + +Default value: $apt::params::update + +##### `purge` + +Data type: `Hash` + +Specifies whether to purge any existing settings that aren't managed by Puppet. Valid options: a hash made up from the following keys: + +Options: + +* **:sources.list** `Boolean`: Specifies whether to purge any unmanaged entries from sources.list. Default false. +* **:sources.list.d** `Boolean`: Specifies whether to purge any unmanaged entries from sources.list.d. Default false. +* **:preferences** `Boolean`: Specifies whether to purge any unmanaged entries from preferences. Default false. +* **:preferences.d.** `Boolean`: Specifies whether to purge any unmanaged entries from preferences.d. Default false. + +Default value: $apt::params::purge + +##### `proxy` + +Data type: `Apt::Proxy` + +Configures Apt to connect to a proxy server. Valid options: a hash matching the locally defined type apt::proxy. + +Default value: $apt::params::proxy + +##### `sources` + +Data type: `Hash` + +Creates new `apt::source` resources. Valid options: a hash to be passed to the create_resources function linked above. + +Default value: $apt::params::sources + +##### `keys` + +Data type: `Hash` + +Creates new `apt::key` resources. Valid options: a hash to be passed to the create_resources function linked above. + +Default value: $apt::params::keys + +##### `ppas` + +Data type: `Hash` + +Creates new `apt::ppa` resources. Valid options: a hash to be passed to the create_resources function linked above. + +Default value: $apt::params::ppas + +##### `pins` + +Data type: `Hash` + +Creates new `apt::pin` resources. Valid options: a hash to be passed to the create_resources function linked above. + +Default value: $apt::params::pins + +##### `settings` + +Data type: `Hash` + +Creates new `apt::setting` resources. Valid options: a hash to be passed to the create_resources function linked above. + +Default value: $apt::params::settings + +##### `auth_conf_entries` + +Data type: `Array[Apt::Auth_conf_entry]` + +An optional array of login configuration settings (hashes) that are recorded in the file /etc/apt/auth.conf. This file has a netrc-like +format (similar to what curl uses) and contains the login configuration for APT sources and proxies that require authentication. See +https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html for details. If specified each hash must contain the keys machine, login and +password and no others. + +Default value: $apt::params::auth_conf_entries + +##### `root` + +Data type: `String` + +Specifies root directory of Apt executable. + +Default value: $apt::params::root + +##### `sources_list` + +Data type: `String` + +Specifies the path of the sources_list file to use. + +Default value: $apt::params::sources_list + +##### `sources_list_d` + +Data type: `String` + +Specifies the path of the sources_list.d file to use. + +Default value: $apt::params::sources_list_d + +##### `conf_d` + +Data type: `String` + +Specifies the path of the conf.d file to use. + +Default value: $apt::params::conf_d + +##### `preferences` + +Data type: `String` + +Specifies the path of the preferences file to use. + +Default value: $apt::params::preferences + +##### `preferences_d` + +Data type: `String` + +Specifies the path of the preferences.d file to use. + +Default value: $apt::params::preferences_d + +##### `config_files` + +Data type: `Hash` + +A hash made up of the various configuration files used by Apt. + +Default value: $apt::params::config_files + +##### `update_defaults` + +Data type: `Hash` + + + +Default value: $apt::params::update_defaults + +##### `purge_defaults` + +Data type: `Hash` + + + +Default value: $apt::params::purge_defaults + +##### `proxy_defaults` + +Data type: `Hash` + + + +Default value: $apt::params::proxy_defaults + +##### `include_defaults` + +Data type: `Hash` + + + +Default value: $apt::params::include_defaults + +##### `source_key_defaults` + +Data type: `Hash` + + + +Default value: $apt::params::source_key_defaults + +### apt::backports + +Manages backports. + +#### Examples + +##### Set up a backport for linuxmint qiana + +```puppet +apt::backports { 'qiana': + location => 'http://us.archive.ubuntu.com/ubuntu', + release => 'trusty-backports', + repos => 'main universe multiverse restricted', + key => { + id => '630239CC130E1A7FD81A27B140976EAF437D05B5', + server => 'hkps.pool.sks-keyservers.net', + }, +} +``` + +#### Parameters + +The following parameters are available in the `apt::backports` class. + +##### `location` + +Data type: `Optional[String]` + +Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Default value for Debian and +Ubuntu varies: + +- Debian: 'http://deb.debian.org/debian' + +- Ubuntu: 'http://archive.ubuntu.com/ubuntu' + +Default value: `undef` + +##### `release` + +Data type: `Optional[String]` + +Specifies a distribution of the Apt repository containing the backports to manage. 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. + +Default value: `undef` + +##### `repos` + +Data type: `Optional[String]` + +Specifies a component of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. +Default value for Debian and Ubuntu varies: + +- Debian: 'main contrib non-free' + +- Ubuntu: 'main universe multiverse restricted' + +Default value: `undef` + +##### `key` + +Data type: `Optional[Variant[String, Hash]]` + +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. Default value +for Debian and Ubuntu varies: + +- Debian: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553' + +- Ubuntu: '630239CC130E1A7FD81A27B140976EAF437D05B5' + +Default value: `undef` + +##### `pin` + +Data type: `Optional[Variant[Integer, String, Hash]]` + +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 value: 200 + +## Defined types + +### apt::conf + +Specifies a custom Apt configuration file. + +#### Parameters + +The following parameters are available in the `apt::conf` defined type. + +##### `content` + +Data type: `Optional[String]` + +Required unless `ensure` is set to 'absent'. Directly supplies content for the configuration file. + +Default value: `undef` + +##### `ensure` + +Data type: `Enum['present', 'absent']` + +Specifies whether the configuration file should exist. Valid options: 'present' and 'absent'. + +Default value: present + +##### `priority` + +Data type: `Variant[String, Integer]` + +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 or an integer. + +Default value: 50 + +##### `notify_update` + +Data type: `Optional[Boolean]` + +Specifies whether to trigger an `apt-get update` run. + +Default value: `undef` + +### apt::key + +Manages the GPG keys that Apt uses to authenticate packages. + +* **Note** The apt::key defined type makes use of the apt_key type, but includes extra functionality to help prevent duplicate keys. + +#### Examples + +##### Declare Apt key for apt.puppetlabs.com source + +```puppet +apt::key { 'puppetlabs': + id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', + server => 'hkps.pool.sks-keyservers.net', + options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"', +} +``` + +#### Parameters + +The following parameters are available in the `apt::key` defined type. + +##### `id` + +Data type: `Pattern[/\A(0x)?[0-9a-fA-F]{8}\Z/, /\A(0x)?[0-9a-fA-F]{16}\Z/, /\A(0x)?[0-9a-fA-F]{40}\Z/]` + +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 value: $title + +##### `ensure` + +Data type: `Enum['present', 'absent', 'refreshed']` + +Specifies whether the key should exist. Valid options: 'present', 'absent' or 'refreshed'. Using 'refreshed' will make keys auto +update when they have expired (assuming a new key exists on the key server). + +Default value: present + +##### `content` + +Data type: `Optional[String]` + +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. + +Default value: `undef` + +##### `source` + +Data type: `Optional[Pattern[/\Ahttps?:\/\//, /\Aftp:\/\//, /\A\/\w+/]]` + +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 value: `undef` + +##### `server` + +Data type: `Pattern[/\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?$/]` + +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 value: $::apt::keyserver + +##### `options` + +Data type: `Optional[String]` + +Passes additional options to `apt-key adv --keyserver-options`. + +Default value: `undef` + +### apt::pin + +Manages Apt pins. Does not trigger an apt-get update run. + +* **See also** +http://linux.die.net/man/5/apt_preferences +for context on these parameters + +#### Parameters + +The following parameters are available in the `apt::pin` defined type. + +##### `ensure` + +Data type: `Optional[Enum['file', 'present', 'absent']]` + +Specifies whether the pin should exist. Valid options: 'file', 'present', and 'absent'. + +Default value: present + +##### `explanation` + +Data type: `Optional[String]` + +Supplies a comment to explain the pin. Default: "${caller_module_name}: ${name}". + +Default value: `undef` + +##### `order` + +Data type: `Variant[Integer]` + +Determines the order in which Apt processes the pin file. Files with lower order numbers are loaded first. + +Default value: 50 + +##### `packages` + +Data type: `Variant[String, Array]` + +Specifies which package(s) to pin. + +Default value: '*' + +##### `priority` + +Data type: `Variant[Numeric, String]` + +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 value: 0 + +##### `release` + +Data type: `Optional[String]` + +Tells APT to prefer packages that support the specified release. Typical values include 'stable', 'testing', and 'unstable'. + +Default value: '' + +##### `release_version` + +Data type: `Optional[String]` + +Tells APT to prefer packages that support the specified operating system release version (such as Debian release version 7). + +Default value: '' + +##### `component` + +Data type: `Optional[String]` + +Names the licensing component associated with the packages in the directory tree of the Release file. + +Default value: '' + +##### `originator` + +Data type: `Optional[String]` + +Names the originator of the packages in the directory tree of the Release file. + +Default value: '' + +##### `label` + +Data type: `Optional[String]` + +Names the label of the packages in the directory tree of the Release file. + +Default value: '' + +##### `origin` + +Data type: `Optional[String]` + + + +Default value: '' + +##### `version` + +Data type: `Optional[String]` + + + +Default value: '' + +##### `codename` + +Data type: `Optional[String]` + + + +Default value: '' + +### apt::ppa + +Manages PPA repositories using `add-apt-repository`. Not supported on Debian. + +#### Examples + +##### Example declaration of an Apt PPA + +```puppet +apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': } +``` + +#### Parameters + +The following parameters are available in the `apt::ppa` defined type. + +##### `ensure` + +Data type: `String` + +Specifies whether the PPA should exist. Valid options: 'present' and 'absent'. + +Default value: 'present' + +##### `options` + +Data type: `Optional[String]` + +Supplies options to be passed to the `add-apt-repository` command. Default: '-y'. + +Default value: $::apt::ppa_options + +##### `release` + +Data type: `Optional[String]` + +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 value: $facts['lsbdistcodename'] + +##### `package_name` + +Data type: `Optional[String]` + +Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'. + +Default value: $::apt::ppa_package + +##### `package_manage` + +Data type: `Boolean` + +Specifies whether Puppet should manage the package that provides `apt-add-repository`. + +Default value: `false` + +### apt::setting + +Manages Apt configuration files. + +* **See also** +https://docs.puppetlabs.com/references/latest/type.html#file-attributes +for more information on source and content parameters + +#### Parameters + +The following parameters are available in the `apt::setting` defined type. + +##### `priority` + +Data type: `Variant[String, Integer, Array]` + +Determines the order in which Apt processes the configuration file. Files with higher priority numbers are loaded first. + +Default value: 50 + +##### `ensure` + +Data type: `Optional[Enum['file', 'present', 'absent']]` + +Specifies whether the file should exist. Valid options: 'present', 'absent', and 'file'. + +Default value: file + +##### `source` + +Data type: `Optional[String]` + +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 link above for Puppet's native file type source attribute. + +Default value: `undef` + +##### `content` + +Data type: `Optional[String]` + +Required, unless `source` is set. Directly supplies content for the configuration file. Cannot be used in combination with `source`. Valid +options: see link above for Puppet's native file type content attribute. + +Default value: `undef` + +##### `notify_update` + +Data type: `Boolean` + +Specifies whether to trigger an `apt-get update` run. + +Default value: `true` + +### apt::source + +Manages the Apt sources in /etc/apt/sources.list.d/. + +#### Examples + +##### Install the puppetlabs apt source + +```puppet +apt::source { 'puppetlabs': + location => 'http://apt.puppetlabs.com', + repos => 'main', + key => { + id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', + server => 'hkps.pool.sks-keyservers.net', + }, +} +``` + +#### Parameters + +The following parameters are available in the `apt::source` defined type. + +##### `location` + +Data type: `Optional[String]` + +Required, unless ensure is set to 'absent'. Specifies an Apt repository. Valid options: a string containing a repository URL. + +Default value: `undef` + +##### `comment` + +Data type: `String` + +Supplies a comment for adding to the Apt source file. + +Default value: $name + +##### `ensure` + +Data type: `String` + +Specifies whether the Apt source file should exist. Valid options: 'present' and 'absent'. + +Default value: present + +##### `release` + +Data type: `Optional[String]` + +Specifies a distribution of the Apt repository. + +Default value: `undef` + +##### `repos` + +Data type: `String` + +Specifies a component of the Apt repository. + +Default value: 'main' + +##### `include` + +Data type: `Optional[Variant[Hash]]` + +Configures include options. Valid options: a hash of available keys. + +Options: + +* **:deb** `Boolean`: Specifies whether to request the distribution's compiled binaries. Default true. +* **:src** `Boolean`: Specifies whether to request the distribution's uncompiled source code. Default false. + +Default value: {} + +##### `key` + +Data type: `Optional[Variant[String, Hash]]` + +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 value: `undef` + +##### `pin` + +Data type: `Optional[Variant[Hash, Numeric, String]]` + +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 value: `undef` + +##### `architecture` + +Data type: `Optional[String]` + +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). + +Default value: `undef` + +##### `allow_unsigned` + +Data type: `Boolean` + +Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked. + +Default value: `false` + +##### `notify_update` + +Data type: `Boolean` + +Specifies whether to trigger an `apt-get update` run. + +Default value: `true` + +## Resource types + +## Tasks + +### init + +Allows you to perform apt functions + +**Supports noop?** false + +#### Parameters + +##### `action` + +Data type: `Enum[update, upgrade]` + +Action to perform + diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/01_apt_class_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/01_apt_class_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/01_apt_class_spec.rb 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/01_apt_class_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -0,0 +1,16 @@ +require 'spec_helper_acceptance' + +describe 'apt class' do + context 'with default parameters' do + # Using puppet_apply as a helper + it 'works with no errors' do + pp = <<-MANIFEST + class { 'apt': } + MANIFEST + + # Run it twice and test for idempotency + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end + end +end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/apt_key_provider_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/apt_key_provider_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/apt_key_provider_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/apt_key_provider_spec.rb 2018-10-01 08:30:41.000000000 +0000 @@ -1,25 +1,23 @@ require 'spec_helper_acceptance' -PUPPETLABS_GPG_KEY_SHORT_ID = 'EF8D349F'.freeze -PUPPETLABS_GPG_KEY_LONG_ID = '7F438280EF8D349F'.freeze -PUPPETLABS_GPG_KEY_FINGERPRINT = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze -PUPPETLABS_APT_URL = 'apt.puppetlabs.com'.freeze -PUPPETLABS_GPG_KEY_FILE = 'DEB-GPG-KEY-puppet'.freeze -CENTOS_GPG_KEY_SHORT_ID = 'C105B9DE'.freeze -CENTOS_GPG_KEY_LONG_ID = '0946FCA2C105B9DE'.freeze -CENTOS_GPG_KEY_FINGERPRINT = 'C1DAC52D1664E8A4386DBA430946FCA2C105B9DE'.freeze -CENTOS_REPO_URL = 'ftp.cvut.cz/centos'.freeze -CENTOS_GPG_KEY_FILE = 'RPM-GPG-KEY-CentOS-6'.freeze - -SHOULD_NEVER_EXIST_ID = 'EF8D349F'.freeze - -KEY_CHECK_COMMAND = 'apt-key adv --list-keys --with-colons --fingerprint | grep '.freeze -PUPPETLABS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{PUPPETLABS_GPG_KEY_FINGERPRINT}".freeze -CENTOS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{CENTOS_GPG_KEY_FINGERPRINT}".freeze - -MAX_TIMEOUT_RETRY = 3 -TIMEOUT_RETRY_WAIT = 5 -TIMEOUT_ERROR_MATCHER = %r{no valid OpenPGP data found} +PUPPETLABS_GPG_KEY_SHORT_ID = 'EF8D349F'.freeze +PUPPETLABS_GPG_KEY_LONG_ID = '7F438280EF8D349F'.freeze +PUPPETLABS_GPG_KEY_FINGERPRINT = '6F6B15509CF8E59E6E469F327F438280EF8D349F'.freeze +PUPPETLABS_APT_URL = 'apt.puppetlabs.com'.freeze +PUPPETLABS_GPG_KEY_FILE = 'DEB-GPG-KEY-puppet'.freeze +CENTOS_GPG_KEY_SHORT_ID = 'C105B9DE'.freeze +CENTOS_GPG_KEY_LONG_ID = '0946FCA2C105B9DE'.freeze +CENTOS_GPG_KEY_FINGERPRINT = 'C1DAC52D1664E8A4386DBA430946FCA2C105B9DE'.freeze +CENTOS_REPO_URL = 'ftp.cvut.cz/centos'.freeze +CENTOS_GPG_KEY_FILE = 'RPM-GPG-KEY-CentOS-6'.freeze +PUPPETLABS_EXP_KEY_LONG_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'.freeze +PUPPETLABS_EXP_KEY_DATES = 'pub:e:4096:1:1054B7A24BD6EC30:2010-07-10:2017-01-05::-:Puppet Labs Release Key'.freeze +SHOULD_NEVER_EXIST_ID = 'EF8D349F'.freeze +KEY_CHECK_COMMAND = 'apt-key adv --list-keys --with-colons --fingerprint | grep '.freeze +PUPPETLABS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{PUPPETLABS_GPG_KEY_FINGERPRINT}".freeze +CENTOS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{CENTOS_GPG_KEY_FINGERPRINT}".freeze +PUPPETLABS_EXP_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} '#{PUPPETLABS_EXP_KEY_DATES}'".freeze +DEBIAN_PUPPETLABS_EXP_CHECK_COMMAND = 'apt-key list | grep -F -A 1 \'pub rsa4096 2010-07-10 [SC] [expired: 2017-01-05]\' | grep \'47B3 20EB 4C7C 375A A9DA E1A0 1054 B7A2 4BD6 EC30\''.freeze def populate_default_options_pp(value) default_options_pp = <<-MANIFEST @@ -32,15 +30,18 @@ end def install_key(key) - retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do - shell("apt-key adv --keyserver hkps.pool.sks-keyservers.net \ - --recv-keys #{key}") + retry_on_error_matching do + shell("apt-key adv --keyserver pgp.mit.edu --recv-keys #{key}") end end def apply_manifest_twice(manifest_pp) - apply_manifest(manifest_pp, catch_failures: true) - apply_manifest(manifest_pp, catch_changes: true) + retry_on_error_matching do + apply_manifest(manifest_pp, catch_failures: true) + end + retry_on_error_matching do + apply_manifest(manifest_pp, catch_changes: true) + end end invalid_key_length_pp = <<-MANIFEST @@ -63,6 +64,84 @@ } MANIFEST +refresh_pp = <<-MANIFEST + apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}': + id => '#{PUPPETLABS_EXP_KEY_LONG_ID}', + ensure => 'present', + content => '-----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1 + + 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+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYWJAhwEEAEC + AAYFAlHk3M4ACgkQSjMLmtZI+uP5hA//UTZfD340ukip6jPlMzxwSD/QapwtO7D4 + gsGTsXezDkO97D21d1pNaNT0RrXAMagwk1ElDxmn/YHUDfMovZa2bKagjWmV38xk + Ws+Prh1P44vUDG30CAU6KZ+mTGLUbolfOvDffCTm9Mn1i2kxFaJxbVhWR6zR28KZ + R28s1IBsrqeTCksYfdKdkuw1/j850hW8MM3hPBJ/48VLx5QEFfnlXwt1fp+LygAv + rIyJw7vJtsa9QjCIkQk2tcv77rhkiZ6ADthgVIx5j3yDWSm4nLqFpwbQTKrNRrCb + 5XbL/oIMeHJuFICb2HckDS1KuKXHmqvDuLoRr0/wFEZMps5XQevomUa7JkMeS5j9 + AubCG4g1zKEtPPaGDsfDKBljCHBKwUysQj5oGU5w8VvlOPnS62DBfsgU2y5ipmmI + TYkjSOL6LXwO6xG5/sxA8cyoJSmbN286imcY6AHloTiiu6/N7Us+CNrhw/V7HAun + 56etWBn3bZWCRGGAPF3qJr4y2sUMY0E3Ha7OPEHIKfBb4MiJnpXntWT28nQfF3dl + TFTthAzwcnZchx2es4yrfDXn33Y4eisqxWCbTluErXUogUEKH1KohSatYMtxencv + 7bUlzIr22zSUCYyVf9cyg50kBy+0J7seEpqG5K5R8z9s/63BT5Oghmi6bB2s5iK5 + fBt3Tu1IYpw= + =cXcR + -----END PGP PUBLIC KEY BLOCK-----' + } + MANIFEST + gpg_key_pp = <<-MANIFEST apt_key { 'puppetlabs': id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}', @@ -387,7 +466,7 @@ apt_key { 'puppetlabs': id => '#{PUPPETLABS_GPG_KEY_LONG_ID}', ensure => 'present', - server => 'hkps.pool.sks-keyservers.net', + server => 'pgp.mit.edu', } MANIFEST @@ -395,7 +474,7 @@ apt_key { 'puppetlabs': id => '#{PUPPETLABS_GPG_KEY_FINGERPRINT}', ensure => 'present', - server => 'hkp://hkps.pool.sks-keyservers.net:80', + server => 'hkp://pgp.mit.edu:80', } MANIFEST @@ -551,6 +630,34 @@ } MANIFEST +refresh_true_pp = <<-MANIFEST + apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}': + id => '#{PUPPETLABS_EXP_KEY_LONG_ID}', + ensure => 'present', + refresh => true, + } + MANIFEST + +refresh_false_pp = <<-MANIFEST + apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}': + id => '#{PUPPETLABS_EXP_KEY_LONG_ID}', + ensure => 'present', + refresh => false, + } +MANIFEST + +refresh_del_key_pp = <<-MANIFEST + apt_key { '#{PUPPETLABS_EXP_KEY_LONG_ID}': + ensure => 'absent', + } +MANIFEST + +refresh_check_for_dirmngr_pp = <<-MANIFEST + package { 'dirmngr': + ensure => 'present', + } +MANIFEST + describe 'apt_key' do before(:each) do # Delete twice to make sure everything is cleaned @@ -612,7 +719,7 @@ end end - context 'when absent, added with long key', unless: (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '6') do + context 'when absent, added with long key' do it 'is removed' do # Install the key first (retry because key pool may timeout) install_key(PUPPETLABS_GPG_KEY_LONG_ID) @@ -630,7 +737,7 @@ context 'with puppetlabs gpg key' do it 'works' do # Apply the manifest (Retry if timeout error is received from key pool) - retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do + retry_on_error_matching do apply_manifest(gpg_key_pp, catch_failures: true) end @@ -656,10 +763,10 @@ end describe 'server =>' do - context 'with hkps.pool.sks-keyservers.net' do + context 'with pgp.mit.edu' do it 'works' do # Apply the manifest (Retry if timeout error is received from key pool) - retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do + retry_on_error_matching do apply_manifest(hkps_pool_pp, catch_failures: true) end @@ -668,9 +775,9 @@ end end - context 'with hkp://hkps.pool.sks-keyservers.net:80' do + context 'with hkp://pgp.mit.edu:80' do it 'works' do - retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do + retry_on_error_matching do apply_manifest(hkp_pool_pp, catch_failures: true) end @@ -682,7 +789,7 @@ context 'with nonexistant.key.server' do it 'fails' do apply_manifest(nonexistant_key_server_pp, expect_failures: true) do |r| - expect(r.stderr).to match(%r{(Host not found|Couldn't resolve host)}) + expect(r.stderr).to match(%r{(Host not found|Couldn't resolve host|No name)}) end end end @@ -721,7 +828,8 @@ end end - context 'with ftp://' do + # disabled when running in travis, security issues prevent FTP + context 'with ftp://', unless: (ENV['TRAVIS'] == 'true') do before(:each) do shell("apt-key del #{CENTOS_GPG_KEY_LONG_ID}", acceptable_exit_codes: [0, 1, 2]) @@ -833,4 +941,39 @@ end end end + + describe 'refresh' do + if fact('osfamily') == 'Debian' && (fact('lsbdistcodename') == 'stretch' || fact('lsbdistcodename') == 'bionic') + # Set Debian Stetch specific value of puppetlabs_exp_check_command + let(:puppetlabs_exp_check_command) { DEBIAN_PUPPETLABS_EXP_CHECK_COMMAND } + else + # Set default value of puppetlabs_exp_check_command + let(:puppetlabs_exp_check_command) { PUPPETLABS_EXP_CHECK_COMMAND } + end + before(:each) do + if fact('lsbdistcodename') == 'stretch' || fact('lsbdistcodename') == 'bionic' + # Ensure dirmngr package is installed + apply_manifest(refresh_check_for_dirmngr_pp, acceptable_exit_codes: [0, 2]) + # Export environment variable to disable apt-key warning when using grep + shell('export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1') + end + # Delete the Puppet Labs Release Key and install an expired version of the key + apply_manifest(refresh_del_key_pp) + apply_manifest(refresh_pp, catch_failures: true) + end + context 'when refresh => true' do + it 'updates an expired key' do + apply_manifest(refresh_true_pp) + # Check key has been updated to new version + shell(puppetlabs_exp_check_command.to_s, acceptable_exit_codes: [0]) + end + end + context 'when refresh => false' do + it 'does not replace an expired key' do + apply_manifest(refresh_false_pp) + # Expired key is present and has not been updated by the new version + shell(puppetlabs_exp_check_command.to_s, acceptable_exit_codes: [1]) + end + end + end end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/apt_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/apt_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/apt_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/apt_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -1,24 +1,16 @@ require 'spec_helper_acceptance' -MAX_TIMEOUT_RETRY = 3 -TIMEOUT_RETRY_WAIT = 5 -TIMEOUT_ERROR_MATCHER = %r{no valid OpenPGP data found} - everything_everything_pp = <<-MANIFEST - if $::lsbdistcodename == 'lucid' { - $sources = undef - } else { - $sources = { - 'puppetlabs' => { - 'ensure' => present, - 'location' => 'http://apt.puppetlabs.com', - 'repos' => 'main', - 'key' => { - 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', - 'server' => 'hkps.pool.sks-keyservers.net', - }, + $sources = { + 'puppetlabs' => { + 'ensure' => present, + 'location' => 'http://apt.puppetlabs.com', + 'repos' => 'main', + 'key' => { + 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', + 'server' => 'pool.sks-keyservers.net', }, - } + }, } class { 'apt': update => { @@ -46,11 +38,9 @@ context 'with all the things' do it 'works with no errors' do # Apply the manifest (Retry if timeout error is received from key pool) - retry_on_error_matching(MAX_TIMEOUT_RETRY, TIMEOUT_RETRY_WAIT, TIMEOUT_ERROR_MATCHER) do + retry_on_error_matching do apply_manifest(everything_everything_pp, catch_failures: true) end - - apply_manifest(everything_everything_pp, catch_failures: true) end it 'stills work' do shell('apt-get update') diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/class_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/class_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/class_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/class_spec.rb 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -require 'spec_helper_acceptance' - -describe 'apt class' do - context 'with default parameters' do - # Using puppet_apply as a helper - it 'works with no errors' do - pp = <<-MANIFEST - class { 'apt': } - MANIFEST - - # Run it twice and test for idempotency - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_changes: true) - end - end -end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/locales_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/locales_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/acceptance/locales_spec.rb 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/acceptance/locales_spec.rb 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,65 @@ +require 'spec_helper_acceptance' +require 'beaker/i18n_helper' + +PUPPETLABS_GPG_KEY_LONG_ID = '7F438280EF8D349F'.freeze +PUPPETLABS_LONG_FINGERPRINT = '123456781274D2C8A956789A456789A456789A9A'.freeze + +id_short_warning_pp = <<-MANIFEST + apt_key { 'puppetlabs': + id => '#{PUPPETLABS_GPG_KEY_LONG_ID}', + ensure => 'present', + source => 'http://apt.puppetlabs.com/herpderp.gpg', + } + MANIFEST + +id_doesnt_match_fingerprint_pp = <<-MANIFEST + apt_key { '#{PUPPETLABS_LONG_FINGERPRINT}': + ensure => 'present', + content => '123456781274D2C8A956789A456789A456789A9B', + } + MANIFEST + +location_not_specified_fail_pp = <<-MANIFEST + apt::source { 'puppetlabs': + ensure => 'present', + repos => 'main', + key => { + id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', + server => 'hkps.pool.sks-keyservers.net', + }, + } + MANIFEST + +describe 'apt', if: (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5')) do + before :all do + hosts.each do |host| + on(host, "sed -i \"96i FastGettext.locale='ja'\" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb") + change_locale_on(host, 'ja_JP.utf-8') + end + end + + describe 'i18n translations' do + it 'warns with shortened id' do + apply_manifest(id_short_warning_pp, catch_failures: true) do |r| + expect(r.stderr).to match(%r{Ŧħḗ īḓ şħǿŭŀḓ ƀḗ ȧ ƒŭŀŀ ƒīƞɠḗřƥřīƞŧ}) + end + end + it 'fails with different id and fingerprint' do + apply_manifest(id_doesnt_match_fingerprint_pp, expect_failures: true) do |r| + expect(r.stderr).to match(%r{Ŧħḗ īḓ īƞ ẏǿŭř ḿȧƞīƒḗşŧ 123456781274D2C8A956789A456789A456789A9A}) + end + end + it 'fails with no location' do + apply_manifest(location_not_specified_fail_pp, expect_failures: true) do |r| + expect(r.stderr).to match(%r{ƈȧƞƞǿŧ ƈřḗȧŧḗ ȧ şǿŭřƈḗ ḗƞŧřẏ ẇīŧħǿŭŧ şƥḗƈīƒẏīƞɠ ȧ ŀǿƈȧŧīǿƞ}) + end + end + end + + after :all do + hosts.each do |host| + on(host, 'sed -i "96d" /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet.rb') + change_locale_on(host, 'en_US') + end + end +end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/classes/apt_backports_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/classes/apt_backports_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/classes/apt_backports_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/classes/apt_backports_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -7,10 +7,10 @@ context 'with defaults on deb' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -19,18 +19,18 @@ is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian', key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', repos: 'main contrib non-free', - release: 'wheezy-backports', - pin: { 'priority' => 200, 'release' => 'wheezy-backports' }) + release: 'jessie-backports', + pin: { 'priority' => 200, 'release' => 'jessie-backports' }) } end context 'with defaults on ubuntu' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -39,18 +39,18 @@ 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' }) + release: 'xenial-backports', + pin: { 'priority' => 200, 'release' => 'xenial-backports' }) } end context 'with everything set' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -75,11 +75,11 @@ context 'when set things with hashes' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -185,11 +185,11 @@ describe 'validation' do let(:facts) do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, lsbdistid: 'Ubuntu', osfamily: 'Debian', - lsbdistcodename: 'trusty', - lsbdistrelease: '14.04', + lsbdistcodename: 'xenial', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/classes/apt_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/classes/apt_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/classes/apt_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/classes/apt_spec.rb 2018-10-01 08:30:41.000000000 +0000 @@ -35,7 +35,7 @@ describe 'apt' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', lsbdistcodename: 'wheezy', @@ -60,6 +60,8 @@ is_expected.to contain_file('preferences.d').that_notifies('Class[Apt::Update]').only_with(preferences_d) } + it { is_expected.to contain_file('/etc/apt/auth.conf').with_ensure('absent') } + it 'lays 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', @@ -186,13 +188,59 @@ } end + context 'with entries for /etc/apt/auth.conf' do + let(:params) do + { + auth_conf_entries: [ + { machine: 'deb.example.net', + login: 'foologin', + password: 'secret' }, + { machine: 'apt.example.com', + login: 'aptlogin', + password: 'supersecret' }, + ], + } + end + + auth_conf_content = "// This file is managed by Puppet. DO NOT EDIT. +machine deb.example.net login foologin password secret +machine apt.example.com login aptlogin password supersecret +" + + it { + is_expected.to contain_file('/etc/apt/auth.conf').with(ensure: 'present', + owner: 'root', + group: 'root', + mode: '0600', + notify: 'Class[Apt::Update]', + content: auth_conf_content) + } + end + + context 'with improperly specified entries for /etc/apt/auth.conf' do + let(:params) do + { + auth_conf_entries: [ + { machinn: 'deb.example.net', + username: 'foologin', + password: 'secret' }, + { machine: 'apt.example.com', + login: 'aptlogin', + password: 'supersecret' }, + ], + } + end + + it { is_expected.to raise_error(Puppet::Error) } + end + context 'with sources defined on valid osfamily' do let :facts do - { os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04' } }, + { os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Ubuntu', - lsbdistrelease: '12.04', + lsbdistrelease: '16.04', puppetversion: Puppet.version } end let(:params) do @@ -224,15 +272,15 @@ 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(%r{^deb http://apt.puppetlabs.com precise main$}) } + it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenial main$}) } end context 'with confs defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } @@ -260,9 +308,9 @@ context 'with keys defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } @@ -290,11 +338,11 @@ context 'with ppas defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'ubuntu', - lsbdistrelease: '12.04', + lsbdistrelease: '16.04', puppetversion: Puppet.version, } end @@ -312,9 +360,9 @@ context 'with settings defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } @@ -333,9 +381,9 @@ context 'with pins defined on valid osfamily' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } }, + os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } }, osfamily: 'Debian', - lsbdistcodename: 'precise', + lsbdistcodename: 'xenial', lsbdistid: 'Debian', puppetversion: Puppet.version, } diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/classes/apt_update_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/classes/apt_update_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/classes/apt_update_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/classes/apt_update_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -10,11 +10,11 @@ context "when $::apt_update_last_success indicates #{desc}" do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', apt_update_last_success: factval, - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -31,10 +31,10 @@ context 'when $::apt_update_last_success is nil' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -55,11 +55,11 @@ context "when $::apt_update_last_success indicates #{desc}" do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', apt_update_last_success: factval, - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -74,10 +74,10 @@ context 'when $::apt_update_last_success is nil' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -89,17 +89,17 @@ end end end - %w[daily weekly].each do |update_frequency| + ['daily', 'weekly'].each do |update_frequency| context "when apt::update['frequency'] has the value of #{update_frequency}" do { 'we are due for a run' => 1_406_660_561, 'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval| context "when $::apt_update_last_success indicates #{desc}" do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', apt_update_last_success: factval, - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -114,10 +114,10 @@ context 'when the $::apt_update_last_success fact has a recent value' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', apt_update_last_success: Time.now.to_i, puppetversion: Puppet.version, } @@ -132,10 +132,10 @@ context 'when $::apt_update_last_success is nil' do let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', apt_update_last_success: nil, puppetversion: Puppet.version, } diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/default_facts.yml puppet-module-puppetlabs-apt-6.1.1/spec/default_facts.yml --- puppet-module-puppetlabs-apt-4.5.1/spec/default_facts.yml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/default_facts.yml 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,8 @@ +# Use default_module_facts.yml for module specific facts. +# +# Facts specified here will override the values provided by rspec-puppet-facts. +--- +concat_basedir: "" +ipaddress: "172.16.254.254" +is_pe: false +macaddress: "AA:AA:AA:AA:AA:AA" diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/conf_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/conf_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/conf_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/conf_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -5,10 +5,10 @@ end let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/key_compat_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/key_compat_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/key_compat_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/key_compat_spec.rb 2018-10-01 08:30:41.000000000 +0000 @@ -23,7 +23,7 @@ let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, @@ -271,7 +271,7 @@ end it 'fails' do - is_expected.to raise_error(%r{expects a match}) + is_expected.to raise_error(%r{evaluating a Resource}) end end @@ -319,7 +319,7 @@ end it 'fails' do - is_expected.to raise_error(%r{Enum\['absent', 'present'\]}) + is_expected.to raise_error(%r{Enum\['absent', 'present', 'refreshed'\]}) end end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/key_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/key_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/key_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/key_spec.rb 2018-10-01 08:30:41.000000000 +0000 @@ -43,10 +43,10 @@ let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -99,6 +99,21 @@ end end + describe 'ensure => refreshed' do + let :params do + { + ensure: 'refreshed', + } + end + + it 'contains the apt_key with refresh => true' do + is_expected.to contain_apt_key(title).with( + ensure: 'present', + refresh: true, + ) + end + end + describe 'set a bunch of things!' do let :params do { @@ -276,7 +291,7 @@ end it 'fails' do - is_expected.to raise_error(%r{expects a match}) + is_expected.to raise_error(%r{evaluating a Resource}) end end @@ -317,7 +332,7 @@ end context 'with invalid ensure' do - %w[foo aabsent absenta apresent presenta].each do |param| + ['foo', 'aabsent', 'absenta', 'apresent', 'presenta', 'refresh', 'arefreshed', 'refresheda'].each do |param| let :params do { ensure: param, @@ -325,7 +340,7 @@ end it 'fails' do - is_expected.to raise_error(%r{for Enum\['absent', 'present'\], got}) + is_expected.to raise_error(%r{for Enum\['absent', 'present', 'refreshed'\], got}) end end end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/pin_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/pin_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/pin_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/pin_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -5,10 +5,10 @@ end let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/ppa_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/ppa_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/ppa_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/ppa_spec.rb 2018-08-24 13:23:05.000000000 +0000 @@ -7,9 +7,9 @@ describe 'defaults' do let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - lsbdistrelease: '11.04', - lsbdistcodename: 'natty', + os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '41.04' } }, + lsbdistrelease: '14.04', + lsbdistcodename: 'trusty', operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', @@ -22,8 +22,8 @@ it { is_expected.not_to 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', # rubocop:disable Metrics/LineLength - unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-natty.list', # rubocop:disable Metrics/LineLength + command: '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow+type || (rm /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && false)', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow_type-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow_type.gpg', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } @@ -46,8 +46,8 @@ 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 -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list', + command: '/usr/bin/add-apt-repository -y ppa:user/foo || (rm /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && false)', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-ubuntu-foo-wily.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user_ubuntu_foo.gpg', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } @@ -65,9 +65,9 @@ end let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - lsbdistrelease: '11.04', - lsbdistcodename: 'natty', + os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + lsbdistrelease: '14.04', + lsbdistcodename: 'trusty', operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', @@ -80,54 +80,14 @@ 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', # rubocop:disable Metrics/LineLength - 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', # rubocop:disable Metrics/LineLength + 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Metrics/LineLength + 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength '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 - { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - 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 -f /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') + is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') } end @@ -137,9 +97,9 @@ end let :facts do { - os: { family: 'Debian', name: 'Ubuntu', release: { major: '11', full: '11.04' } }, - lsbdistrelease: '11.04', - lsbdistcodename: 'natty', + os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } }, + lsbdistrelease: '14.04', + lsbdistcodename: 'trusty', operatingsystem: 'Ubuntu', osfamily: 'Debian', lsbdistid: 'Ubuntu', @@ -157,14 +117,14 @@ it { is_expected.not_to 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', # rubocop:disable Metrics/LineLength - 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-natty.list', # rubocop:disable Metrics/LineLength + 'command' => '/usr/bin/add-apt-repository -y ppa:needs/such.substitution/wow || (rm /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && false)', # rubocop:disable Metrics/LineLength + 'unless' => '/usr/bin/test -f /etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/needs-such_substitution-wow.gpg', # rubocop:disable Metrics/LineLength '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') + is_expected.to contain_file('/etc/apt/sources.list.d/needs-such_substitution-wow-trusty.list').that_requires('Exec[add-apt-repository-ppa:needs/such.substitution/wow]').with('ensure' => 'file') } end @@ -198,8 +158,8 @@ 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 -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } @@ -233,8 +193,8 @@ 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 -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } @@ -268,8 +228,8 @@ 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 -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } @@ -303,8 +263,8 @@ 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 -f /etc/apt/sources.list.d/user-foo-trusty.list', + command: '/usr/bin/add-apt-repository ppa:user/foo || (rm /etc/apt/sources.list.d/user-foo-trusty.list && false)', # rubocop:disable Metrics/LineLength + unless: '/usr/bin/test -f /etc/apt/sources.list.d/user-foo-trusty.list && /usr/bin/test -f /etc/apt/trusted.gpg.d/user-foo.gpg', # rubocop:disable Metrics/LineLength user: 'root', logoutput: 'on_failure') } diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/setting_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/setting_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/setting_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/setting_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -4,9 +4,9 @@ let(:pre_condition) { 'class { "apt": }' } let :facts do { - os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, - lsbdistrelease: '7.0', - lsbdistcodename: 'wheezy', + os: { distro: { codename: 'wheezy' }, family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, + lsbdistrelease: '8.0', + lsbdistcodename: 'jessie', operatingsystem: 'Debian', osfamily: 'Debian', lsbdistid: 'Debian', @@ -77,10 +77,10 @@ end let(:facts) do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/source_compat_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/source_compat_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/source_compat_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/source_compat_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -10,9 +10,9 @@ context 'with mostly defaults' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -26,16 +26,16 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb-src http://debian.mirror.iweb.ca/debian/ jessie main\n}) } end context 'with no defaults' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -74,9 +74,9 @@ context 'when allow_unsigned true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -89,15 +89,15 @@ } end - it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[trusted=yes\] http://debian.mirror.iweb.ca/debian/ wheezy main\n}) } + it { is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[trusted=yes\] http://debian.mirror.iweb.ca/debian/ jessie main\n}) } end context 'with architecture equals x86_64' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -110,16 +110,16 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with_content(%r{# my_source\ndeb \[arch=x86_64\] http://debian.mirror.iweb.ca/debian/ jessie main\n}) } end context 'with ensure => absent' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -139,7 +139,7 @@ context 'with no release' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/defines/source_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/defines/source_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/defines/source_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/defines/source_spec.rb 2018-07-30 09:08:15.000000000 +0000 @@ -15,9 +15,9 @@ context 'without location' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, osfamily: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', puppetversion: Puppet.version, } end @@ -29,9 +29,9 @@ context 'with location' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -40,6 +40,7 @@ it { is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').without_content(%r{# my_source\ndeb-src hello.there wheezy main\n}) + is_expected.not_to contain_package('apt-transport-https') } end end @@ -47,12 +48,12 @@ describe 'no defaults' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', operatingsystem: 'Debian', - lsbdistrelease: '7.0', + lsbdistrelease: '8.0', puppetversion: Puppet.version, } end @@ -68,7 +69,7 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{hello.there jessie main\n}) } it { is_expected.to contain_file('/etc/apt/sources.list.d/my_source.list').that_notifies('Class[Apt::Update]') } @@ -183,9 +184,9 @@ context 'with allow_unsigned true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -198,7 +199,51 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb \[trusted=yes\] hello.there jessie main\n}) + } + end + + context 'with a https location, install apt-transport-https' do + let :facts do + { + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, + lsbdistid: 'Debian', + lsbdistcodename: 'jessie', + osfamily: 'Debian', + puppetversion: Puppet.version, + } + end + let :params do + { + location: 'HTTPS://foo.bar', + allow_unsigned: false, + } + end + + it { + is_expected.to contain_package('apt-transport-https') + } + end + + context 'with a https location, do not install apt-transport-https on oses not in list eg buster' do + let :facts do + { + os: { family: 'Debian', name: 'Debian', release: { major: '10', full: '10.0' } }, + lsbdistid: 'Debian', + lsbdistcodename: 'buster', + osfamily: 'Debian', + puppetversion: Puppet.version, + } + end + let :params do + { + location: 'https://foo.bar', + allow_unsigned: false, + } + end + + it { + is_expected.not_to contain_package('apt-transport-https') } end @@ -229,9 +274,9 @@ let :facts do { architecture: 'amd64', - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -244,16 +289,16 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb-src hello.there jessie main\n}) } end context 'with include_src => true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -266,16 +311,16 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there wheezy main\ndeb-src hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{# my_source\ndeb hello.there jessie main\ndeb-src hello.there jessie main\n}) } end context 'with include deb => false' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'debian', puppetversion: Puppet.version, } @@ -296,9 +341,9 @@ context 'with include src => true and include deb => false' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'debian', puppetversion: Puppet.version, } @@ -311,17 +356,17 @@ end it { - is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there wheezy main\n}) + is_expected.to contain_apt__setting('list-my_source').with(ensure: 'present').with_content(%r{deb-src hello.there jessie main\n}) } - it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there wheezy main\n}) } + it { is_expected.to contain_apt__setting('list-my_source').without_content(%r{deb hello.there jessie main\n}) } end context 'with ensure => absent' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -341,7 +386,7 @@ context 'with no release' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, @@ -357,7 +402,7 @@ context 'with release is empty string' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', osfamily: 'Debian', puppetversion: Puppet.version, @@ -371,9 +416,9 @@ context 'with invalid pin' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -393,9 +438,9 @@ context 'with notify_update = undef (default)' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -412,9 +457,9 @@ context 'with notify_update = true' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } @@ -432,9 +477,9 @@ context 'with notify_update = false' do let :facts do { - os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } }, + os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } }, lsbdistid: 'Debian', - lsbdistcodename: 'wheezy', + lsbdistcodename: 'jessie', osfamily: 'Debian', puppetversion: Puppet.version, } diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/spec_helper_acceptance.rb puppet-module-puppetlabs-apt-6.1.1/spec/spec_helper_acceptance.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/spec_helper_acceptance.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/spec_helper_acceptance.rb 2018-10-01 08:30:41.000000000 +0000 @@ -1,58 +1,22 @@ +require 'beaker-pe' +require 'beaker-puppet' require 'beaker-rspec' require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' - -def install_bolt_on(hosts) - on(hosts, "/opt/puppetlabs/puppet/bin/gem install --source http://rubygems.delivery.puppetlabs.net bolt -v '> 0.0.1'", acceptable_exit_codes: [0, 1]).stdout -end - -def pe_install? - ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i -end +require 'beaker-task_helper' +require 'beaker/i18n_helper' +require 'beaker-task_helper' run_puppet_install_helper +configure_type_defaults_on(hosts) install_bolt_on(hosts) unless pe_install? install_module_on(hosts) install_module_dependencies_on(hosts) -UNSUPPORTED_PLATFORMS = %w[RedHat Suse windows AIX Solaris].freeze - -DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant' - 'vagrant' - elsif default[:hypervisor] == 'vcloud' - 'Qu@lity!' - end - -def puppet_version - (on default, puppet('--version')).output.chomp -end - -def run_puppet_access_login(user:, password: - '~!@#$%^*-/ aZ', lifetime: '5y') - on(master, puppet('access', 'login', '--username', user, '--lifetime', lifetime), stdin: password) -end - -def run_task(task_name:, params: nil, password: DEFAULT_PASSWORD) - if pe_install? - run_puppet_task(task_name: task_name, params: params) - else - run_bolt_task(task_name: task_name, params: params, password: password) - end -end - -def run_bolt_task(task_name:, params: nil, password: DEFAULT_PASSWORD) - on(master, "/opt/puppetlabs/puppet/bin/bolt task run #{task_name} --modules /etc/puppetlabs/code/modules/service --nodes localhost --password #{password} #{params}", acceptable_exit_codes: [0, 1]).stdout # rubocop:disable Metrics/LineLength -end - -def run_puppet_task(task_name:, params: nil) - on(master, puppet('task', 'run', task_name, '--nodes', fact_on(master, 'fqdn'), params.to_s), acceptable_exit_codes: [0, 1]).stdout -end - -def expect_multiple_regexes(result:, regexes:) - regexes.each do |regex| - expect(result).to match(regex) - end -end +UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze +MAX_RETRY_COUNT = 12 +RETRY_WAIT = 10 +ERROR_MATCHER = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)} # This method allows a block to be passed in and if an exception is raised # that matches the 'error_matcher' matcher, the block will wait a set number @@ -65,9 +29,10 @@ # retry_on_error_matching(3, 5, /OpenGPG Error/) do # apply_manifest(pp, :catch_failures => true) # end -def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, error_matcher = nil) +def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interval_secs = RETRY_WAIT, error_matcher = ERROR_MATCHER) try = 0 begin + puts "retry_on_error_matching: try #{try}" unless try.zero? try += 1 yield rescue StandardError => e @@ -85,6 +50,28 @@ # Configure all nodes in nodeset c.before :suite do - run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)} + run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0')) + + hosts.each do |host| + # This will be removed, this is temporary to test localisation. + if (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && + (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5') && + Gem::Version.new(puppet_version) < Gem::Version.new('5.2.0')) + on(host, 'mkdir /opt/puppetlabs/puppet/share/locale/ja') + on(host, 'touch /opt/puppetlabs/puppet/share/locale/ja/puppet.po') + end + if fact('osfamily') == 'Debian' + # install language on debian systems + install_language_on(host, 'ja_JP.utf-8') if not_controller(host) + # This will be removed, this is temporary to test localisation. + end + # Required for binding tests. + if fact('osfamily') == 'RedHat' + if fact('operatingsystemmajrelease') =~ %r{7} || fact('operatingsystem') =~ %r{Fedora} + shell('yum install -y bzip2') + end + end + on host, puppet('module', 'install', 'stahnma/epel') + end end end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/spec_helper.rb puppet-module-puppetlabs-apt-6.1.1/spec/spec_helper.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/spec_helper.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/spec_helper.rb 2018-08-24 13:23:05.000000000 +0000 @@ -1,5 +1,12 @@ require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts' + +begin + require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb')) +rescue LoadError => loaderror + warn "Could not require spec_helper_local: #{loaderror.message}" +end + include RspecPuppetFacts default_facts = { @@ -20,4 +27,18 @@ RSpec.configure do |c| c.default_facts = default_facts + c.before :each do + # set to strictest setting for testing + # by default Puppet runs at warning level + Puppet.settings[:strict] = :warning + end end + +def ensure_module_defined(module_name) + module_name.split('::').reduce(Object) do |last_module, next_module| + last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module) + last_module.const_get(next_module) + end +end + +# 'spec_overrides' from sync.yml will appear below this line diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/unit/facter/apt_dist_package_security_updates_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/unit/facter/apt_dist_package_security_updates_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/unit/facter/apt_dist_package_security_updates_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/unit/facter/apt_dist_package_security_updates_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -53,7 +53,7 @@ if Facter.version < '2.0.0' it { is_expected.to eq('extremetuxracer,vim') } else - it { is_expected.to eq(%w[extremetuxracer vim]) } + it { is_expected.to eq(['extremetuxracer', 'vim']) } end end end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/unit/facter/apt_package_security_updates_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/unit/facter/apt_package_security_updates_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/unit/facter/apt_package_security_updates_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/unit/facter/apt_package_security_updates_spec.rb 2018-07-19 10:05:03.000000000 +0000 @@ -51,7 +51,7 @@ if Facter.version < '2.0.0' it { is_expected.to eq('tzdata,curl') } else - it { is_expected.to eq(%w[tzdata curl]) } + it { is_expected.to eq(['tzdata', 'curl']) } end end end diff -Nru puppet-module-puppetlabs-apt-4.5.1/spec/unit/puppet/type/apt_key_spec.rb puppet-module-puppetlabs-apt-6.1.1/spec/unit/puppet/type/apt_key_spec.rb --- puppet-module-puppetlabs-apt-4.5.1/spec/unit/puppet/type/apt_key_spec.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/spec/unit/puppet/type/apt_key_spec.rb 2018-10-01 08:30:41.000000000 +0000 @@ -28,6 +28,10 @@ it 'content is not set' do expect(resource[:content]).to eq nil end + + it 'refresh is not set' do + expect(resource[:refresh]).to eq nil + end end context 'with a lowercase 32bit key id' do @@ -138,6 +142,15 @@ }.to raise_error(%r{content and source are mutually exclusive}) end + it 'raises an error if refresh => true and ensure => absent' do + expect { + Puppet::Type.type(:apt_key).new(id: 'EF8D349F', + source: 'http://apt.puppetlabs.com/pubkey.gpg', + ensure: :absent, + refresh: :true) + }.to raise_error(%r{ensure => absent and refresh => true are mutually exclusive}) + end + it 'raises an error if a weird length key is used' do expect { Puppet::Type.type(:apt_key).new(id: 'FEF8D349F', diff -Nru puppet-module-puppetlabs-apt-4.5.1/tasks/init.rb puppet-module-puppetlabs-apt-6.1.1/tasks/init.rb --- puppet-module-puppetlabs-apt-4.5.1/tasks/init.rb 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/tasks/init.rb 2018-10-01 08:30:41.000000000 +0000 @@ -5,9 +5,9 @@ def apt_get(action) cmd = ['apt-get', action] - cmd << ' -y' if action == 'upgrade' + cmd << '-y' if action == 'upgrade' stdout, stderr, status = Open3.capture3(*cmd) - raise Puppet::Error, stderr if status != 0 + raise Puppet::Error, stderr if status != 0 # rubocop:disable GetText/DecorateFunctionMessage { status: stdout.strip } end diff -Nru puppet-module-puppetlabs-apt-4.5.1/templates/auth_conf.epp puppet-module-puppetlabs-apt-6.1.1/templates/auth_conf.epp --- puppet-module-puppetlabs-apt-4.5.1/templates/auth_conf.epp 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/templates/auth_conf.epp 2018-07-19 10:05:03.000000000 +0000 @@ -0,0 +1,5 @@ +<% if $apt::auth_conf_entries != [] { -%> +<% $apt::auth_conf_entries.each | $auth_conf_entry | { -%> +machine <%= $auth_conf_entry['machine'] %> login <%= $auth_conf_entry['login'] %> password <%= $auth_conf_entry['password'] %> +<% } -%> +<% } -%> diff -Nru puppet-module-puppetlabs-apt-4.5.1/templates/pin.pref.epp puppet-module-puppetlabs-apt-6.1.1/templates/pin.pref.epp --- puppet-module-puppetlabs-apt-4.5.1/templates/pin.pref.epp 2018-02-05 19:28:14.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/templates/pin.pref.epp 2018-07-19 10:05:03.000000000 +0000 @@ -1,14 +1,14 @@ <%- | $name, $pin_release, $release, $codename, $release_version, $component, $originator, $label, $version, $origin, $explanation, $packages_string, $priority | -%> <%- $pin = -if $pin_release.length > 0 { +if $pin_release != '' { $options = [ - if $release { "a=${release}" }, - if $codename { "n=${codename}" }, - if $release_version { "v=${release_version}"}, - if $component { "c=${component}" }, - if $originator { "o=${originator}" }, - if $label { "l=${label}" }, + if $release != '' { "a=${release}" }, + if $codename != '' { "n=${codename}" }, + if $release_version != '' { "v=${release_version}"}, + if $component != '' { "c=${component}" }, + if $originator != '' { "o=${originator}" }, + if $label != '' { "l=${label}" }, ].filter |$x| { $x != undef } "release ${options.join(', ')}" } diff -Nru puppet-module-puppetlabs-apt-4.5.1/types/auth_conf_entry.pp puppet-module-puppetlabs-apt-6.1.1/types/auth_conf_entry.pp --- puppet-module-puppetlabs-apt-4.5.1/types/auth_conf_entry.pp 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/types/auth_conf_entry.pp 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,20 @@ +# @summary Login configuration settings that are recorded in the file `/etc/apt/auth.conf`. +# +# @see https://manpages.debian.org/testing/apt/apt_auth.conf.5.en.html for more information +# +# @param machine +# Hostname of machine to connect to. +# +# @param login +# Specifies the username to connect with. +# +# @param password +# Specifies the password to connect with. +# +type Apt::Auth_conf_entry = Struct[ + { + machine => String[1], + login => String, + password => String + } +] diff -Nru puppet-module-puppetlabs-apt-4.5.1/types/proxy.pp puppet-module-puppetlabs-apt-6.1.1/types/proxy.pp --- puppet-module-puppetlabs-apt-4.5.1/types/proxy.pp 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-puppetlabs-apt-6.1.1/types/proxy.pp 2018-10-01 08:30:41.000000000 +0000 @@ -0,0 +1,26 @@ +# @summary Configures Apt to connect to a proxy server. +# +# @param ensure +# Specifies whether the proxy should exist. Valid options: 'file', 'present', and 'absent'. Prefer 'file' over 'present'. +# +# @param host +# Specifies a proxy host to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a hostname. +# +# @param port +# Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: an integer containing a port number. +# +# @param https +# Specifies whether to enable https proxies. +# +# @param direct +# Specifies whether or not to use a `DIRECT` https proxy if http proxy is used but https is not. +# +type Apt::Proxy = Struct[ + { + ensure => Optional[Enum['file', 'present', 'absent']], + host => Optional[String], + port => Optional[Integer[0, 65535]], + https => Optional[Boolean], + direct => Optional[Boolean], + } +]