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
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
2008-09-28 17:56:11 -04:00
Antoine Beaupre
45e01f3eb9
use the closest mirror
2008-07-03 18:05:09 -04:00
root
d203a72afc
split out backports and unstable sources.list
2008-01-25 16:50:17 -05:00
root
0011e70a24
turn preferences into a simple file
2008-01-25 16:36:33 -05:00
root
7e0d36279b
sundry cleanup after offline work
2007-10-09 14:32:47 +02:00
root
e65ba34330
syntax fixes for offline work
2007-10-09 10:53:07 +02:00
Micah Anderson
de14197805
Make ls_release.pp more robust and handle sid in sources.list.erb
2007-10-08 11:40:09 +02:00
david
8b0afdb2c8
add my grandmother's PC and some minor fixes
...
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@124 f03ff2f1-f02d-0410-970d-b9634babeaa1
2007-07-21 09:14:02 +00:00
david
624475288e
after going the whole way with assert_lsb..., really use the var
...
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@65 f03ff2f1-f02d-0410-970d-b9634babeaa1
2007-06-27 12:28:13 +00:00
david
f0c91f753a
modularised apt
...
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@58 f03ff2f1-f02d-0410-970d-b9634babeaa1
2007-06-25 09:50:19 +00:00
