Age | Commit message (Collapse) | Author |
|
(Starting to merge changes from immerda.)
Conflicts:
manifests/default_sources_list.pp
manifests/init.pp
|
|
apt preferences actually want // to comment, while sources are fine
to be commented with # ...
|
|
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
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>
|
|
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>
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The previous default pinning preferences only supported tracking stable.
Tracking squeeze or sid is now possible.
|
|
|
|
|
|
|
|
|
|
|
|
changed and we don't need a separate apt-key for it now
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 0011e70a24ff49169da294b00b6b39b77fb05c86.
|
|
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
|
|
|
|
This reverts commit d203a72afc814bc8aa8a8e30b973d46e0cce8862.
Conflicts:
templates/sources.list+backports.erb
templates/sources.list+unstable.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@124 f03ff2f1-f02d-0410-970d-b9634babeaa1
|
|
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@65 f03ff2f1-f02d-0410-970d-b9634babeaa1
|
|
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@58 f03ff2f1-f02d-0410-970d-b9634babeaa1
|