Commit graph

26 commits

Author SHA1 Message Date
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
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
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
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
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