aboutsummaryrefslogtreecommitdiff
path: root/files
AgeCommit message (Collapse)Author
2010-11-21Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.intrigeri
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-21Merge commit 'd97a49b7b2c020c2c43df6524236f50a421789ee'.intrigeri
Going on merging immerda changes. Incompatible change: I do prefer my own generic apt/preferences template to shipping a static file that only supports Lenny. My own template supports security, backports, volatile, next release etc. Conflicts: files/preferences manifests/init.pp manifests/preferences.pp
2010-11-21Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'intrigeri
(Starting to merge changes from immerda.) Conflicts: manifests/default_sources_list.pp manifests/init.pp
2010-10-25Add file headers for awareness of puppet presenceGabriel Filion
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25refactor: simplify and remove inline contentGabriel Filion
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-24Add apt_conf_snippet and use it where possibleGabriel Filion
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-22merged with immerda/masternadir
2010-10-17Merge remote branch 'nadir/master' into wipintrigeri
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-09-08backports.org has merged with the normal debian archive, the apt source ↵Matt Taggart
changed and we don't need a separate apt-key for it now
2009-12-11fixed typoroot
2009-12-11cleaned 50unattended_upgradesroot
2009-12-11Added apt::unattended_upgrades class, and extra template for "deb-src"root
2009-03-16remove the riseup key file, we do not need to distribute this in thisMicah Anderson
module, its handled with our custom_key_dir
2009-03-15add riseup repo keyPietro Ferrari
2008-09-28Revert "turn preferences into a simple file"Micah Anderson
This reverts commit 0011e70a24ff49169da294b00b6b39b77fb05c86.
2008-01-25turn preferences into a simple fileroot
2007-06-25modularised aptdavid
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@58 f03ff2f1-f02d-0410-970d-b9634babeaa1