Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to next #484

Merged
merged 34 commits into from
Mar 26, 2015
Merged

Conversation

underscorgan
Copy link

it's about that time 😺

nibalizer and others added 30 commits February 19, 2015 13:55
fix hiera example in documentation
the apt module did not correctly detect Cumulus Linux with lsbdistid.
This change adds several lines in params.pp to detect Cumulus Linux and
set $distid and $distcodename
…mulus-linux

MODULES-1827 adding Cumulus Linux detection
better attempt at gpg version checking

adding in key length warning

removing version check, adding key check

adding tests

clean up the code

small changes

use commands

documentation updates
This is cherry-picked from the PPA cleanup happening for the 2.0.0 release.

Conflicts:
	manifests/params.pp
	manifests/ppa.pp
…erties

Make installation of software-properties optional
…unattended-upgrades

Cleaning 50unattended-upgrades.erb
…_version

initial commit for apt_key checking
This enables using Origins-Pattern in Ubuntu.
If one should happen to have redirected /usr/bin/gpg to run GnuPG 2.x
rather than the more usual GnuPG 1.x, the apt_key provider fails with
the following error:

Could not prefetch apt_key provider 'apt_key': invalid date

This is because the output of "--with-colons" defaults to using
"fixed-list-mode" in 2.x but did not do so for 1.x. This new format
gives much more information about keys and also uses timestamps in
seconds from 1970-01-01 (UNIX epoch) rather than dates in the format
YYYY-MM-DD.

This patch adds "--fixed-list-mode" when calling apt-key, and adjusts
the code to parse the timestamps instead. This actually has several
advantages:

- Works the same with GnuPG 1.x and 2.x.
- More accurate expiry time tracking, not just entire days.
- No need to require 'date' any longer.
- Will allow the provider to expose more key information in future.

Tested on:
- Debian Wheezy (Puppet 2.7.23, Ruby 1.8.7p358)
- Debian Jessie (Puppet 3.7.2, Ruby 2.1.5p273)
apt_key: fix parsing invalid dates when using GnuPG 2.x
Use the full fingerprint for all keys to silence the warning.
Fix gpg key checking warings after f588f26
Update all the unit tests to look for full fingerprints
documented more common parameters
…tended-upgrades

Extend docs for unattended_upgrades
puppetdb, etc

- support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile
@underscorgan underscorgan added this to the 2.0 milestone Mar 25, 2015
@underscorgan
Copy link
Author

intentionally did a merge instead of a rebase to make the history a little less terrible.

@daenney
Copy link

daenney commented Mar 26, 2015

This should wait until #483 is merged.

@daenney daenney assigned underscorgan and unassigned daenney Mar 26, 2015
@daenney
Copy link

daenney commented Mar 26, 2015

Or actually... doesn't really matter. It's master to next, not next to master, derp.

daenney added a commit that referenced this pull request Mar 26, 2015
@daenney daenney merged commit 913a64e into puppetlabs:next Mar 26, 2015
@underscorgan underscorgan deleted the merge_master_to_next branch May 8, 2015 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.