Commit graph

59 commits

Author SHA1 Message Date
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
intrigeri
248d7e46ff Bypass default APT proxy to access bugs.debian.org.
This is needed when using apt-listbugs with an APT proxy that only {wants,can}
proxy "normal" APT traffic.
2010-12-11 19:58:19 +01:00
Micah Anderson
c67abe8d16 fix compile syntax error in ubuntu sources.list, closes #2639 2010-12-09 09:48:38 -05: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
3de76e7b05 Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits.

Conflicts:
	manifests/init.pp
2010-11-21 16:50:43 +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
intrigeri
ee6d13d1e4 Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'
(Starting to merge changes from immerda.)

Conflicts:
	manifests/default_sources_list.pp
	manifests/init.pp
2010-11-21 16:24:57 +01:00
mh
ebb46ca200 fixing comments
apt preferences actually want // to comment, while sources are fine
to be commented with # ...
2010-10-28 22:27:28 +02:00
mh
90c45cfe44 put the file at the right place & fix typos 2010-10-28 22:05:37 +02: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
26714ae4d2 Include the protocol in the proxy URL
The current proxy_client template makes it possible to communicate with
the proxy only via HTTP. Add the protocol to the variable so that it's
possible to change the protocol.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25 14:14:26 -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
Gabriel Filion
d97a49b7b2 refactor: simplify and remove inline content
Simplifications: make apt_conf_snippet repeat less code, make code that
generates sources.list more concise.

Remove all inline content in favor of templates and static files.
The ability to include sources for static files was needed for
the main 'preferences' file, so it was added to the preferences_snippet
define.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25 00:14:33 -04:00
Gabriel Filion
ac76a5d52d Add apt_conf_snippet and use it where possible
With the new define, it's easy to add an apt.conf snippet in apt.conf.d
It accepts either 'sources' to get a static file or 'content' to define
content inline or with the help of a template.

Put it to use where we create files in apt.conf.d

Finally, fix the dependancy to the apt_config file (however, I don't see
the need for this dependancy)

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-24 09:17:09 -04:00
intrigeri
e42b54af40 Support choosing a custom Ubuntu mirror. 2010-10-17 10:51:06 +02:00
intrigeri
b4d6f30fae Support $apt_repos for Ubuntu as well. 2010-10-17 02:08:17 +02:00
intrigeri
bcfb35c969 Merge remote branch 'nadir/master' into wip
Conflicts:
	manifests/default_preferences.pp
	manifests/default_sources_list.pp
	manifests/init.pp
	templates/Debian/sources.list.deb-src.erb
	templates/Debian/sources.list.erb
	templates/Debian/sources.list.volatile.erb
	templates/Ubuntu/sources.list.erb
2010-10-17 01:57:55 +02:00
intrigeri
e2f80db7b7 Bring in a bit of Ubuntu support from Nadir. 2010-10-17 01:35:37 +02:00
intrigeri
e5c40bc6f0 Trim more empty lines. 2010-10-10 12:38:18 +02:00
intrigeri
1cea889f8c Trim empty lines in template. 2010-10-10 12:35:05 +02:00
intrigeri
7b7fe9497a Fix template syntax. 2010-10-09 21:31:25 +02:00
nadir
db06babc5d removed backports template in favor of main sources.list 2010-10-09 13:42:26 +02:00
intrigeri
fab154da39 Allow specifying custom mirrors for every supported archive. 2010-10-06 13:29:38 +02:00
intrigeri
6dd6642588 Bugfix. 2010-10-06 13:28:09 +02:00
intrigeri
53ca6e2235 Add opt-in support for next Debian release sources. 2010-10-06 12:39:50 +02:00
intrigeri
1183a04b48 Track installed backports upgrades on Lenny and Squeeze. 2010-10-06 12:32:29 +02:00
intrigeri
ff73987f30 Add per-release preferences files.
The previous default pinning preferences only supported tracking stable.
Tracking squeeze or sid is now possible.
2010-10-06 12:30:50 +02:00
intrigeri
81fe80d914 Remove unneeded template. 2010-10-06 12:21:27 +02:00
intrigeri
50136de420 Add opt-in support for deb-src. 2010-10-06 12:09:38 +02:00
intrigeri
de94b807ee Add opt-in support for Debian Volatile. 2010-10-06 12:04:17 +02:00
intrigeri
967df2f010 Really use backports as the documentation pretends. 2010-10-06 11:56:56 +02:00
intrigeri
e643c14ee2 Use new variables. 2010-10-06 11:30:46 +02:00
Matt Taggart
356ff93340 backports.org has merged with the normal debian archive, the apt source changed and we don't need a separate apt-key for it now 2010-09-08 15:39:33 -07:00
Varac
5972a35566 Increased Ubuntu support 2009-12-17 15:53:27 +01:00
nadir
0c86627838 added $apt_volatile_enabled, updated README 2009-12-13 15:14:39 +01:00
root
854f3c10b0 Added apt::unattended_upgrades class, and extra template for "deb-src" 2009-12-11 17:51:49 +01:00
nadir
2b2950b20e added $backports_enabled for including backports repository 2009-12-10 11:00:00 +01:00
Varac
c1694ae337 added $backports_enabled for including backports repository 2009-12-10 11:00:00 +01:00
Micah Anderson
e0a6bf1b7a Revert "turn preferences into a simple file"
This reverts commit 0011e70a24.
2008-09-28 18:00:56 -04:00
Micah Anderson
746d47f424 set default sources.list to use the most generic mirror. customized
mirrors that are closer, or internal proxy mirror configurations
should be set in the $custom_sources_list instead so that the default
is kept as generic as possible
2008-09-28 17:59:17 -04:00
Micah Anderson
7ad7d5658d remove unused and commented out entries in sources.list 2008-09-28 17:57:11 -04:00
Micah Anderson
ab49db3d67 Revert " split out backports and unstable sources.list"
This reverts commit d203a72afc.

Conflicts:

	templates/sources.list+backports.erb
	templates/sources.list+unstable.erb
2008-09-28 17:56:11 -04:00