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 2.0.x to master #502

Merged
merged 125 commits into from
Apr 22, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
6cdbe56
Starting to clean up init.pp
Feb 15, 2015
61080fb
Unbreak broken tests
Feb 15, 2015
6b5e4d1
and an acceptance test
Feb 15, 2015
87b087e
Get rid of unattended upgrades and cleanup unused templates
Feb 15, 2015
b09a699
move tests to examples
Feb 15, 2015
9debb1a
Remove backports and debian
Feb 15, 2015
501a1b5
stop including params everywhere
Feb 15, 2015
4def398
Remove some vars for unattended_upgrades.
daenney Feb 15, 2015
6dc52c1
Merge pull request #1 from puppet-community/daenney/remove_unattended…
Feb 15, 2015
90cc951
get rid of builddep
Feb 15, 2015
8cc7d40
Get rid of force
Feb 15, 2015
0809774
Get rid of release
Feb 15, 2015
8ef58a4
Get rid of hold
Feb 15, 2015
e965fe4
Update examples
Feb 15, 2015
e626423
Placeholders for needed examples
Feb 15, 2015
1534042
Fix broken unit tests
Feb 18, 2015
9f758e8
Fix acceptance tests
Feb 18, 2015
59782da
Fix lint issue in examples
Feb 19, 2015
463a61c
Merge pull request #424 from mhaskel/hulk_smash
daenney Feb 19, 2015
bb3a1f0
Remove required packages
Feb 19, 2015
3e407d7
apt::params: Add two missing entries, use them.
daenney Feb 19, 2015
ab92827
Merge pull request #427 from mhaskel/required_packages
daenney Feb 20, 2015
59c362a
Merge pull request #426 from puppetlabs/daenney/fix-missing-param-and…
Feb 20, 2015
0d9bab3
Remove 'include apt::update'
Feb 20, 2015
12a3589
Fix typo from #426
Feb 20, 2015
58f7167
Merge pull request #429 from mhaskel/remove_include_update
daenney Feb 20, 2015
92c405b
Merge pull request #430 from mhaskel/fix_typo
daenney Feb 20, 2015
76c88af
apt: Add apt::setting defined type.
daenney Feb 20, 2015
e75e603
Merge pull request #428 from puppetlabs/daenney/apt-setting
Feb 21, 2015
4f4d8ae
Type is a reserved word in puppet 4
Feb 21, 2015
7c5a62f
Stop redeclaring variables from params
Feb 20, 2015
f880081
Merge pull request #431 from mhaskel/local_variable_declarations
daenney Feb 21, 2015
7e7e3e2
Merge pull request #435 from mhaskel/setting_fix
daenney Feb 21, 2015
0a178c3
Cleanup for `apt::source`
Feb 19, 2015
10f313c
Convert apt::source to use apt::setting
Feb 21, 2015
c4981a0
Merge pull request #432 from mhaskel/source_cleanup
daenney Feb 21, 2015
1b6e046
PPA Cleanup, pt 1
Feb 20, 2015
cddf549
Merge pull request #433 from mhaskel/ppa
daenney Feb 23, 2015
3b5145b
apt::params: Make the class private.
daenney Feb 24, 2015
1139f80
Convert specs to RSpec 3.1.7 syntax with Transpec
Feb 24, 2015
4e45319
Merge pull request #438 from puppetlabs/daenney/cant-touch-params-nan…
Feb 25, 2015
d6ac23f
Merge pull request #439 from mhaskel/rspec3
daenney Feb 25, 2015
e0f058c
Allow priorities to be zero-padded
Feb 24, 2015
1236ecf
Add base_name parameter to apt::setting
Feb 24, 2015
fd71aed
Merge pull request #440 from mhaskel/fix_setting_validation
daenney Feb 25, 2015
1c0c6f1
Merge pull request #442 from mhaskel/add_base_name
daenney Feb 25, 2015
3e44b68
proxy_* params were removed from class apt
Feb 25, 2015
351c8d5
Convert to use apt::setting instead of file resources
Feb 24, 2015
a634fe2
Merge pull request #441 from mhaskel/use_setting
daenney Feb 26, 2015
e588ab6
Merge pull request #443 from mhaskel/proxy_updates
daenney Feb 26, 2015
d261d8f
apt::setting: Parse type and name from title.
daenney Feb 26, 2015
a21c183
Merge pull request #444 from puppetlabs/daenney/parse-setting-from-name
Feb 26, 2015
0475e50
Make apt::setting notify Exec['apt_update'] by default
Feb 26, 2015
b6c70b7
Merge pull request #445 from mhaskel/updates_everywhere
daenney Feb 27, 2015
b53ea1b
spec/(apt|ppa): Enough with all the strings.
daenney Feb 27, 2015
d81c3d9
apt: Add proxy support on the class.
daenney Feb 27, 2015
aae853b
Merge pull request #446 from puppetlabs/daenney/apt-proxy
Feb 27, 2015
a1ce8bd
apt: Change how purging is managed.
daenney Feb 28, 2015
fe22843
apt: Change how update is managed.
daenney Feb 28, 2015
95ae9ab
apt: Add settings, keys and ppas.
daenney Feb 28, 2015
0f3bdcd
apt(::key|_key) Remove the `key.*_` prefixes.
daenney Feb 28, 2015
ea4f615
apt::source: Allow passing in a complex key.
daenney Feb 28, 2015
061bc49
apt::key: Rename $key to $id to match apt_key.
daenney Mar 1, 2015
0cb48b0
apt::key: Be explicit about the keyserver.
daenney Mar 1, 2015
3960368
Merge pull request #447 from puppetlabs/daenney/hulk-smash-2
Mar 2, 2015
7a35ea0
apt::setting: Remove file_perms.
daenney Mar 2, 2015
d05e712
Merge pull request #448 from puppetlabs/daenney/kill-file-perms
Mar 2, 2015
c57d2dd
apt: Fix all strict variable cases.
daenney Mar 2, 2015
001e3a4
Merge pull request #449 from puppetlabs/daenney/fix-strict-vars
Mar 3, 2015
1c707c7
apt::params: Complete $xfacts.
daenney Mar 3, 2015
acd280b
Merge pull request #450 from puppetlabs/daenney/guard-lsb-facts
Mar 3, 2015
a220dcf
apt::source: Merge `include_*` options into hash.
daenney Mar 5, 2015
2a28938
Merge pull request #451 from puppetlabs/daenney/consolidate-include
Mar 5, 2015
90bade9
apt::source: Rename `trusted_source`.
daenney Mar 5, 2015
a8250ae
Merge pull request #452 from puppetlabs/daenney/rename-trusted-source
Mar 6, 2015
41a2725
apt::source: Make location mostly required.
daenney Mar 5, 2015
481846b
Merge pull request #453 from puppetlabs/daenney/location-required
Mar 6, 2015
79db539
Inheritance of apt::params means it can't be private
Mar 11, 2015
4fa2820
Merge pull request #461 from mhaskel/boo_inheritance
daenney Mar 11, 2015
c7354b9
Actually make it possible to use apt_key
Mar 18, 2015
f5c6775
Make the acceptance tests work
Mar 18, 2015
df47ca7
Remove `update['always'] = true` support
Mar 18, 2015
adf9634
Linux open-source builds are regularly maxed out.
Mar 18, 2015
22c7799
Merge pull request #474 from mhaskel/containers_ftw
daenney Mar 19, 2015
0cbd24a
Merge pull request #473 from mhaskel/freq_cleanup
daenney Mar 19, 2015
ff51f71
Merge pull request #472 from mhaskel/acceptance_test_fixes
daenney Mar 19, 2015
3730f31
README updates for 2.x rewrite
Mar 20, 2015
2188a03
Merge pull request #477 from mhaskel/doc_updates
daenney Mar 20, 2015
215b043
Fix typo
Mar 20, 2015
d64fc74
README: Add highlighting for code blocks.
daenney Mar 20, 2015
794c758
README: update['frequency'] is not a boolean
daenney Mar 20, 2015
911c4de
(MODULES-1156, MODULES-769) Remove unnecessary anchors
Mar 23, 2015
6d12a03
Merge pull request #479 from mhaskel/update_anchors
daenney Mar 25, 2015
79890bc
We got rid of the funny proxy removal
Mar 23, 2015
556c1ad
Add an example for backports
Mar 23, 2015
411679c
We've got things in params, let's use those!
Mar 25, 2015
895ecb5
Add examples for force.
Mar 25, 2015
1b4d8ba
Example for disabling keys
Mar 25, 2015
073e8f1
Example for fancy progress.
Mar 25, 2015
dc74673
Merge remote-tracking branch 'upstream/master' into merge_master_to_next
Mar 25, 2015
913a64e
Merge pull request #484 from mhaskel/merge_master_to_next
daenney Mar 26, 2015
0f26779
Example updates
Mar 25, 2015
43ab92c
Merge pull request #483 from mhaskel/examples
daenney Mar 27, 2015
7aba77e
Lint cleanup
Apr 6, 2015
06bce84
Merge pull request #490 from mhaskel/lint_cleanup
daenney Apr 6, 2015
214a6ca
more lint cleanup
Apr 6, 2015
778aae8
Merge pull request #491 from mhaskel/lint_cleanup
cmurphy Apr 6, 2015
791012b
source: Support complex pin, like key does.
daenney Apr 6, 2015
37043df
backports: Add support back for backports.
daenney Apr 7, 2015
044fb5f
Add testing, docs, and examples for backports
Apr 7, 2015
75ac82c
Merge pull request #494 from mhaskel/cleanup-backports
bmjen Apr 13, 2015
d3ca10f
Remove default support for Linux Mint and Cumulus Networks
Apr 7, 2015
c8c1710
Try to make gepetto happy.
Apr 13, 2015
d6c1234
Merge pull request #495 from mhaskel/gepetto
bmjen Apr 13, 2015
02e1e05
Merge pull request #493 from mhaskel/remove_mint
hunner Apr 13, 2015
fe60980
apt::conf: Don't require content `ensure=>absent`.
daenney Apr 14, 2015
db9daeb
Merge pull request #496 from puppetlabs/allow-undef-content-conf
Apr 14, 2015
3a20254
Don't purge by default. That seems unnecessarily destructive.
Apr 14, 2015
94976bb
2.0.0 prep
Mar 30, 2015
dc79ae5
Merge pull request #497 from mhaskel/dont_purge_by_default
hunner Apr 14, 2015
33c296b
Merge pull request #489 from mhaskel/2.0.0-prep
hunner Apr 14, 2015
cdbb2e8
Fogot to remove the purge warning
Apr 14, 2015
c464a4f
Merge pull request #498 from mhaskel/missed_purge_reference
hunner Apr 14, 2015
2802868
Iterate through multiple keys
Apr 20, 2015
6816f99
Merge pull request #501 from mhaskel/MODULES-1934
cyberious Apr 20, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
backports: Add support back for backports.
This is currently lacking tests.
  • Loading branch information
daenney authored and Morgan Haskel committed Apr 9, 2015
commit 37043dff8572f490fcb77317784d042d1f7a4c70
59 changes: 59 additions & 0 deletions manifests/backports.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
class apt::backports (
$location = undef,
$release = undef,
$repos = undef,
$key = undef,
$pin = 200,
){
if $location {
validate_string($location)
$_location = $location
}
if $release {
validate_string($release)
$_release = $release
}
if $repos {
validate_string($repos)
$_repos = $repos
}
if $key {
unless is_hash($key) {
validate_string($key)
}
$_key = $key
}
unless is_hash($pin) {
unless (is_numeric($pin) or is_string($pin)) {
fail('pin must be either a string, number or hash')
}
}

if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
unless $location {
$_location = $::apt::backports['location']
}
unless $release {
$_release = "${::apt::xfacts['lsbdistcodename']}-backports"
}
unless $repos {
$_repos = $::apt::backports['repos']
}
unless $key {
$_key = $::apt::backports['key']
}
} else {
unless $location and $release and $repos and $key {
fail('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')
}
}

apt::source { 'backports':
location => $_location,
release => $_release,
repos => $_repos,
key => $_key,
pin => $pin,
}

}
20 changes: 20 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,27 @@
}
}
case $distid {
'debian': {
case $distcodename {
'squeeze': {
$backports = {'location' => 'http://backports.debian.org/debian-backports',
'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'repos' => 'main contrib non-free',
}
}
default: {
$backports = {'location' => 'http://ftp.debian.org/debian/',
'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD624692555',
'repos' => 'main contrib non-free',
}
}
}
}
'ubuntu': {
$backports = {'location' => 'http://archive.ubuntu.com/ubuntu',
'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5',
'repos' => 'main universe multiverse restricted',
}
case $distcodename {
'lucid': {
$ppa_options = undef
Expand Down