Commit graph

365 commits

Author SHA1 Message Date
Hunter Haugen
9568ecf26d Merge pull request #134 from spali/my_changes
replace aptitude with apt in apt::force
2013-07-02 13:54:12 -07:00
Thomas Spalinger
7c66ab5f39 fixed test for changing aptitude to apt-get 2013-07-02 21:59:26 +02:00
Hunter Haugen
6f68c5180c Merge pull request #114 from johnnyrun/master
location change
2013-07-02 11:53:14 -07:00
Hunter Haugen
46d47f79d2 Merge pull request #118 from opeckojo/apt-sources-arch
Add optional architecture qualifier to apt-sources
2013-07-02 11:48:06 -07:00
Hunter Haugen
91d917495e Merge pull request #123 from ctrlaltdel/fix-required-packages
Install required_packages before 'apt-get update'
2013-07-02 11:37:39 -07:00
Hunter Haugen
add5060d64 Merge pull request #122 from strangeman/master
Add a $key_options parameter to apt::key.
2013-07-02 11:34:21 -07:00
Hunter Haugen
2e206e31e4 Merge pull request #124 from DavidS/geppetto-infrastructure
Geppetto infrastructure
2013-07-02 11:28:48 -07:00
Hunter Haugen
c00888f6d0 Merge pull request #131 from mbornoz/apt-preferences
apt::pin: handling all apt preferences properties
2013-07-01 17:46:24 -07:00
Ashley Penney
cde19bb83e Merge pull request #138 from hunner/release_111
Release 111
2013-07-01 17:28:19 -07:00
Ashley Penney
1471730b8a Merge pull request #137 from hunner/revert_135
Revert "Merge pull request #135 from CERIT-SC/master"
2013-07-01 17:26:21 -07:00
Hunter Haugen
84f1cfca0d Revert "Merge pull request #135 from CERIT-SC/master"
This reverts commit e17208a86c, reversing
changes made to 0665a5d77a.
2013-07-01 17:19:27 -07:00
Hunter Haugen
1e0e92c1e4 Adding one more fix 2013-07-01 17:18:35 -07:00
Hunter Haugen
e17208a86c Merge pull request #135 from CERIT-SC/master
Support APT pinning by codename
2013-07-01 16:55:57 -07:00
Hunter Haugen
0665a5d77a Merge pull request #136 from hunner/change_specs
Update travis and bundler
2013-07-01 16:19:48 -07:00
Hunter Haugen
142b72bbe2 Merge pull request #133 from benben/master
trim keys to 8 chars for matching with apt-key list (fix for #100)
2013-07-01 16:18:14 -07:00
Hunter Haugen
c1c61c6541 Update travis and bundler
- Use ruby 2.0.0 instead of ruby-head
- Remove puppet 2.6 testing
- Add more bundler gems
2013-07-01 16:11:34 -07:00
Benjamin Knofe
733ece66e7 apt:🔑 trim keys to 8 chars to match with apt-key list, refs puppetlabs/puppetlabs-apt#100 2013-06-29 13:06:26 +02:00
Vlastimil Holer
3191f0552a Support APT pinning by codename (e.g. squeeze, wheezy) 2013-06-28 14:06:05 +02:00
Thomas Spalinger
ca810b37c6 Merge branch 'master' into my_changes 2013-06-25 22:53:14 +02:00
Mathieu Bornoz
62ba61fc3c Improve apt::pin example 2013-06-19 09:13:08 +02:00
Raphaël Pinson
e8f11eac01 Fix apt::pin for Puppet 2.6 2013-06-18 15:14:00 +02:00
Mathieu Bornoz
414c57926c apt::pin: handling all apt preferences properties
The two forms of APT preferences records (general & specific) can now be
completely and not partially defined. All distribution properties can be passed
as resource parameters. This change is totally backward-compatible.
2013-06-18 11:31:38 +02:00
David Schmitt
ffb89f6d5d Update .gitignore 2013-06-03 20:15:42 +02:00
David Schmitt
9033eb687e Add geppetto project definition 2013-06-03 20:15:14 +02:00
Francois Deppierraz
37a0dcd0b6 Install required_packages before 'apt-get update'
This is necessary when required_packages contains GPG keys that are used for
authenticating other packages. Tested with package ubuntu-cloud-keyring which
is included in Ubuntu main and used by the Ubuntu Cloud Archive.

I think the same problem applies to other *-keyring packages as well.
2013-06-03 09:57:58 +00:00
Anton Markelov
409ed73140 fix 'puppetlabs/stdlib' dependency 2013-06-03 12:04:37 +12:00
Markelov Anton
0ba3af7de8 fix conflicts 2013-06-03 10:53:17 +11:00
Markelov Anton
6283f6cf72 Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-apt
Conflicts:
	.travis.yml
	Modulefile
2013-06-03 10:10:03 +11:00
Joe O'Pecko
b3d67c8937 Add optional architecture qualifier to apt-sources 2013-06-02 11:55:36 -07:00
Ken Barber
4dbd2c7948 Release 1.1.1
CHANGELOG & Modulefile updated.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-06-02 19:54:32 +01:00
Ken Barber
18ee4cc6c9 Merge pull request #117 from bkg/docfix
Fix apt::release example in readme
2013-06-02 11:07:13 -07:00
Ken Barber
aacce08bcf Merge branch 'proxy'
* proxy:
  Add spec test for removing proxy configuration.
  Update manifests/init.pp
  Update manifests/init.pp
  Update manifests/init.pp
2013-06-02 18:56:10 +01:00
Dean Reilly
d8e2cf24a5 Add spec test for removing proxy configuration. 2013-06-02 18:51:27 +01:00
Scott Barber
041548bcbe Update manifests/init.pp 2013-06-02 18:51:27 +01:00
Scott Barber
f985752a1a Update manifests/init.pp 2013-06-02 18:51:27 +01:00
Scott Barber
1b07921c0c Update manifests/init.pp
If a proxy is set and then later unset we need to remove the proxy file. As it currently sits it'll just sit there hanging out.
2013-06-02 18:51:27 +01:00
Ken Barber
4f83e75083 Merge branch 'template_deprecation_warnings'
* template_deprecation_warnings:
  Update travis.yml to latest versions of puppet
  Remove deprecation warnings for pin.pref.erb as well
  add @ to variables in template
2013-06-02 18:37:24 +01:00
Ken Barber
54d6dcad82 Update travis.yml to latest versions of puppet
Signed-off-by: Ken Barber <ken@bob.sh>
2013-06-02 18:31:00 +01:00
Ken Barber
a7e6048103 Remove deprecation warnings for pin.pref.erb as well
Signed-off-by: Ken Barber <ken@bob.sh>
2013-06-02 18:24:33 +01:00
Peter Hoeg
597bc3d82d add @ to variables in template 2013-05-30 18:28:57 +08:00
Brian Galey
976d81a3b5 Fix apt::release example in readme 2013-05-29 14:46:32 -07:00
johnnyrun
256c90e0fd Location changed:
http://backports.debian.org/news/Backports_integrated_into_the_main_archive/
2013-05-07 14:13:59 +02:00
Thomas Spalinger
7b5d30ed18 replace aptitude with apt in apt::force 2013-02-26 21:35:49 +01:00
Ken Barber
e01bbb61b2 Merge pull request #112 from richardc/patch-1
Restrict the versions and add 3.1
2013-02-25 12:03:35 -08:00
Richard Clamp
06a964c500 Restrict the versions and add 3.1 2013-02-25 19:56:03 +00:00
Matthaus Owens
dc2a963a57 Merge remote-tracking branch 'lauren/master'
Conflicts:
	README.md
2013-02-15 19:16:31 -08:00
Lauren Rother
6d8a013bbe Updated content to conform to README best practices template
*Note: I thought this was small enough to forgo a TOC. Please let me
know if one is desired and I can add it in.*

Before alterations, this content was the module author- determined
description of and instructions for use of the module.

As part of a joint Forge/Docs team effort to standardize formatting and
encourage quality module documentation, a best practices README
template was created via internal and external user testing. That
template was then applied to this module.

I pulled in content from the original README on GitHub. Standard
headings were added (Overview, Module Description, Setup, Usage,
Implementation, etc.) to organize content, existent content was moved
under its appropriate heading and edited for tone/flow/clarity, and
basic formatting was done to adhere to template standards.
2013-02-15 17:51:44 -08:00
Ken Barber
5a87544aa9 Merge pull request #107 from blkperl/travis_update
Standardize travis.yml on pattern introduced in stdlib
2013-02-02 17:11:55 -08:00
William Van Hevelingen
122cafe62a Standardize travis.yml on pattern introduced in stdlib 2013-02-02 17:01:38 -08:00
Ken Barber
cbce722b1f Merge pull request #106 from blkperl/build_all_branches
Build all branches on travis
2013-02-02 16:20:17 -08:00