Commit graph

47 commits

Author SHA1 Message Date
Antoine Beaupré
e4a9222d86 move backports to snippets
this allows for third party modules to enable this on the fly
2015-12-04 12:36:25 -05:00
Jerome Charaoui
e4d777e5ec Fix merge conflict in README 2015-10-09 12:08:26 -04:00
Antoine Beaupré
dbee5c9487 typo 2015-06-09 11:28:54 -04:00
Antoine Beaupré
5ea69cb039 allow possibility of disabling backports 2015-06-09 11:25:34 -04:00
Jerome Charaoui
d007a40333 Replace debian_*() parser functions with facts
* Removes dependency on lsb-release and/or Facter >1.7
    (values are based on $::lsbdistcodename, when available)
* Simplifies maintenance: only lib/facter/util/* require updates as new
  releases are made

Caveats:
* apt::codename is removed; to override debian_* facts, set the
  FACTER_debian_codename environment variable for puppet
* If tracking unstable, make sure lsb-release is installed, as other
  methods can't tell between testing and unstable
2015-05-11 12:01:35 -04:00
Jerome Charaoui
ae4771b452 Adjusted sources.list template: LTS is now 'oldoldstable' 2015-05-07 18:37:24 -04:00
Jerome Charaoui
8ed07cac2f Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
Conflicts:
	templates/Debian/sources.list.erb
2015-02-20 16:15:02 -05:00
intrigeri
7c55bee06a Merge remote-tracking branch 'shared/master' into feature/squeeze-lts 2015-02-07 16:25:05 +00:00
intrigeri
85c7554c4b Add support for Squeeze LTS. 2015-02-07 16:12:55 +00:00
Gabriel Filion
671610fab5 flip around security support for debian
with the release of squeeze-lts, the current way we deal with security
sources is problemaic. by flipping things around we hope to make the
files contents more stable.
2014-12-05 21:29:09 -05:00
mh
53e78e61fe Merge remote-tracking branch 'shared/master' 2014-04-18 11:00:04 +02:00
mh
af616677e6 address puppet 3.x deprecation warnings 2014-04-18 10:59:26 +02:00
Micah Anderson
98ad878c1a add apt listchanges template symlink for jessie - same as the others 2014-03-21 12:09:32 -04:00
Micah Anderson
7006cda333 add apticron_jessie symlink, same version in wheezy and sid 2014-03-21 12:07:19 -04:00
Micah Anderson
51b69c2661 Merge branch 'master' of buse.riseup.net:shared-apt 2014-03-21 12:04:25 -04:00
Micah Anderson
082a2f7768 add jessie preferences file 2014-03-21 12:03:56 -04:00
intrigeri
f8aa2ef872 Drop Debian Etch and Lenny compatibility.
Both have been unsupported for ages.
2013-12-08 21:58:20 +00:00
intrigeri
aac83e728c Lookup next_release in template the same way we lookup next_codename.
next_release was forgotten when next_codename was fixed.
2013-01-02 16:52:10 +01:00
Micah Anderson
07a031f205 fix for $lsbdistcodename regression introduced by ac166366d7
What happened here was the $codename = $::lsbdistcodename was removed from
init.pp and replaced with just $::lsbdistcodename whereever $codename was
used. Then in the sources.list.erb and preferences files things were changed
like this:

<pre>+### Debian current: <%= codename = scope.lookupvar('::lsbdistcodename') %>
...
-deb <%= debian_url %> <%= codename %> <%= repos %>
...
+deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= repos=scope.lookupvar('apt::repos') %>
</pre>

This meant that the codename was always set to lsbdistcodename, and you because
in newer puppet versions you cannot assign a value to a top-level facter
variable, it is not possible to change this.

Because we cannot change $lsbdistcodename, we have to fix this by allowing the
user to pass a different, non-top-level scoped variable to the class as a
parameter, which defaults to $::lsbdistcodename, so that upgrades can be
triggered.

This is documented in the README in an upgrade notice
2012-12-05 13:46:23 -05:00
mh
f823fcd5b7 fix auto repo selection
the actual repos are in real_repos as by default we have auto.
2012-06-18 17:33:49 -03:00
mh
ac166366d7 refactor things for >2.7 2012-06-08 12:16:46 -03:00
mh
39917fb4db new style for 2.7 2012-06-05 21:31:15 -03:00
intrigeri
c7322addd5 Add apticron.conf template for Debian sid. 2011-10-06 19:09:48 +02:00
intrigeri
5ea84049ef Add listchanges.conf template for Debian sid. 2011-10-06 19:04:42 +02:00
intrigeri
546b5cbdbc Add preferences, listchanges, apticron templates for Debian Wheezy. 2011-06-20 20:07:24 +02:00
intrigeri
4e6f65b0d5 Add empty line at the end of preferences templates.
... else the first block added by apt::preferences_snippet is in the same
paragraph as the last block provided by the template.
2011-05-07 18:15:02 +02:00
intrigeri
b3b704d02e Debian sources: don't use next release's backports.
The APT pinning we ship does not support that, and this seems a bit too much of
a corner case to me to deserve being supported out-of-the-box.

Anyone willing to use current release + next release + next release backports
(e.g. Lenny + Squeeze + squeeze-backports) can anyway do so using
apt::sources_list and apt::preferences_snippet.

https://labs.riseup.net/code/issues/2856 is the bug that triggered this change.
2011-04-23 13:08:33 +02:00
intrigeri
e2b4f42b54 Remove pinning for backports on Squeeze.
This is now done automatically by APT.
2011-04-03 19:27:43 +02:00
intrigeri
840ea9ed9d Debian Squeeze pinning: pin squeeze-updates as much as regular squeeze.
The previous template was indeed ensuring no package from squeeze-updates could
be easily or automatically installed.
2011-02-14 10:52:25 +01:00
intrigeri
045e1fc748 Stop hard-coding Wheezy name in Squeeze's pinning template.
Every needed function has been updated since Squeeze was released and we can
thus use a nice generic template.
2011-02-07 11:41:49 +01:00
intrigeri
e19b574e23 Starting from Squeeze, Debian Volatile is deprecated in favor of CODENAME-updates.
Take this into account in the Debian sources.list template:
  - go on using volatile.d.o for <= Lenny sources lines
  - start using CODENAME-updates for Squeeze and newer.

Reference: http://lists.debian.org/debian-volatile/2011/01/msg00008.html
2011-02-07 11:17:07 +01:00
intrigeri
c0377ca737 Apply fix from 67dc9a22 to Squeeze template as well. 2010-12-15 22:20:08 +01:00
Micah Anderson
67dc9a2259 fix apticron template 2010-12-15 15:46:20 -05:00
Micah Anderson
5237f9dab0 change $listchanges_* to $apt_listchanges, not nice to clutter up the namespace like that 2010-12-15 14:49:34 -05:00
intrigeri
4103a27054 Additionally use version number in Lenny default pinning.
Lenny's APT does not support pinning like this:

  Pin: release o=Debian,n=<%= codename %>

We therefore switched (in commit ef2ebdffd) to:

  Pin: release o=Debian,a=<%= release %>

With such a pinning setup, when Squeeze is released, systems using this module
with $apt_use_next_release set to true would immediately switch to prefer
packages from Squeeze. If an automated upgrade process is setup, they would be
automatically upgraded to Squeeze.

This does not sound safe to me, so let's use the release version number as an
additional selection criterion to prevent upgrades to Squeeze to happen behind
our back:

  Pin: release o=Debian,a=<%= release %>,v=<%= release_version %>*

Note that the trailing '*' is intentional and necessary to match stable
point-releases.
2010-12-12 09:57:42 +01:00
Micah Anderson
d32573ae83 fix template missing <%- end -%> 2010-12-08 22:29:45 -05:00
Micah Anderson
13bf7d0623 add apt-listchanges support. this is a nice compliment to using the upgrade_package functionality, because you get an email when the package has been upgraded. 2010-12-08 22:25:09 -05:00
Micah Anderson
fbb291ed19 add apticron support.
Why apticron, when we have cron-apt already? Some people have different preferences, we use apticron along with the upgrade_package functionality in this module. I know someone who uses cron-apt to run the upgrades, but apticron for notifications, because apticron's notifications are much nicer (cron-apt just gives you the output of apt-get upgrade)
2010-12-08 22:24:24 -05:00
Micah Anderson
ef2ebdffd2 switch to archive name for lenny default preferences
the templates/Debian/preferences_lenny.erb file checked in with
e2f80db7b7 contains pinning based on codename,
which is not supported in lenny (see #433624 - if you look at the version graph,
you see, "Fixed in version 0.7.21", and lenny has 0.7.20.2+lenny1.)
2010-12-07 22:59:58 -05:00
intrigeri
10c7939f65 Merge remote branch 'immerda/master'.
Conflicts:
	README
	files/preferences
	templates/Debian/sources.list.deb-src.erb
	templates/Debian/sources.list.volatile.erb
	templates/Ubuntu/sources.list.backports.erb
	templates/Ubuntu/sources.list.deb-src.erb
2010-11-21 17:03:57 +01:00
intrigeri
71d42350d1 Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.
Merging one more commit.

Conflicts:
	files/preferences
	templates/Debian/sources.list.deb-src.erb
	templates/Debian/sources.list.volatile.erb
	templates/Ubuntu/sources.list.backports.erb
	templates/Ubuntu/sources.list.deb-src.erb
2010-11-21 16:38:50 +01:00
Gabriel Filion
bd3b46ac07 Change "brought to you" into "managed" in headers
File headers are there to indicate that the files should not be touched
directly on the server. By changing the first sentence to "This file is
managed by Puppet", we reinforce the idea that it is already taken care
of by something else.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25 14:19:58 -04:00
Gabriel Filion
e2578c3b98 Add $main_apt_source
Currently, it's either we use the default source that's hardcoded in the
sources.list template or we redefine entirely this template.

Make it easier to just change the URL of the apt source while using the
rest of the default template by adding a $main_apt_source variable.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25 14:12:18 -04:00
Gabriel Filion
1b0bc41597 Add file headers for awareness of puppet presence
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25 01:13:44 -04:00
intrigeri
e2f80db7b7 Bring in a bit of Ubuntu support from Nadir. 2010-10-17 01:35:37 +02:00
nadir
db06babc5d removed backports template in favor of main sources.list 2010-10-09 13:42:26 +02:00
Varac
5972a35566 Increased Ubuntu support 2009-12-17 15:53:27 +01:00