aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-11-21Merge commit '27d5808299045ebd6f428e7d8131d11d9ab37712'.intrigeri
One more painless merge commit. Conflicts: manifests/init.pp
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-11-10Do not refresh APT lists on every run.intrigeri
Let's set refreshonly on the 'update_apt' Exec (aliased to 'apt_updated') instead of removing it for backward compatibility: it may be in use at some places to trigger updates.
2010-11-10Merge remote branch 'nadir/master'intrigeri
Conflicts: README manifests/custom_sources.pp manifests/default_preferences.pp manifests/init.pp manifests/unattended_upgrades.pp templates/Debian/sources.list.volatile.erb
2010-10-28unfortunately no comments are allowed in that filemh
2010-10-28fixing commentsmh
apt preferences actually want // to comment, while sources are fine to be commented with # ...
2010-10-28Revert "remove comments as lenny apt doesn't like them"mh
This reverts commit 5de6431b89b696ce17874952dceb5968108449a9. Actually the comments are just the wrong way...
2010-10-28remove comments as lenny apt doesn't like themmh
I got errors like: E: Syntax error /etc/apt/apt.conf.d/03clean:4: Extra junk after value Removing these comments fixed these problems.
2010-10-28put the file at the right place & fix typosmh
2010-10-25Correct some errors in the READMEGabriel Filion
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25Change "brought to you" into "managed" in headersGabriel Filion
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-25Update the READMEGabriel Filion
Include new classes and defines and move things around for a little bit of consistency. Also remove the now unused variables. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25Ensure presence of sources.list.d and watch itGabriel Filion
Add a file resource on the apt/sources.list.d directory to ensure that it is created as a directory and watch it for modifications to automatically refresh the apt cache. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25Remove $apt_unattended_upgradesGabriel Filion
Unattended upgrades are not always necessary. Including the apt::unattended_upgrades class through the main apt class is not appropriate. It is better to make nodes include the apt::unattended_upgrades class explicitly. Remove the $apt_unattended_upgrades variable along with the include in the 'apt' class. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25Fix apt::preferences::absentGabriel Filion
Currently, setting the $custom_preferences variable to false fails because of the /etc/apt/preferences concatenated_file being re-defined. Fix this by setting dependencies on the resource only when we expect to create the /etc/apt/preferences file. Also, since there is no "ensure" parameter to concatenated_file, use a simple file resource to ensure that it is removed. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25Include the protocol in the proxy URLGabriel Filion
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-25Add $main_apt_sourceGabriel Filion
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-25Remove the now unused $apt_clean variableGabriel Filion
This variable was deprecated in favor of using a list of file sources. to change the value of the 'clean' property, you can either define a file '03clean' in a site-apt module, or a per-host '$fqdn/03clean' file in the same site-apt module. Also, move the moduledir stuff below nearer to where it's actually used. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-25rename things for easier understandingGabriel Filion
remove the use of _snippet in names (except for preferences_snippet) so that they represent directly a resource name. rename custom_sources_template to sources_list. modify sources_list to make it more flexible (gives the opportunity to provide sources or content). this changes its behaviour in that the name is now the name of the file in sources.list.d rename proxy-client to proxy_client to use the same standard for its name as the other classes. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
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-24Move default_sources_list into apt classGabriel Filion
The contents of the file default_sources_list.pp is used in only one place. Remove the file and move its contents inside the apt class in order to have one less useless depth level. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-22notify => Exec['refresh_apt']nadir
2010-10-22merged with immerda/masternadir
2010-10-21Merge remote branch 'lelutin/master'mh
Integrate no custom preference into our new way to manage the preferences. Conflicts: README manifests/default_preferences.pp manifests/init.pp
2010-10-18Make it possible to ensure preferences is absentGabriel Filion
The current code makes it mandatory to have a file /etc/apt/preferences present. In the event that this file is empty or contains a space, apt-get update cannot execute. Add a case with the special value "false" that ensures the file does not exist. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-18Remove unnecessary execGabriel Filion
When $custom_key_dir has not been assigned any value, a useless exec of /bin/true is run. Remove this by using 'if' instead of 'case'. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-17Add a proxy-client classGabriel Filion
The module currently doesn't have a handy way of making a server get its packages via a proxy. Add a "proxy-client" class that makes this easy. $apt_proxy declares the proxy server's fqdn $apt_proxy_port declares the port used for connection Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-17Make $apt_clean effective in all casesGabriel Filion
The file "/etc/apt/apt.conf.d/from_puppet" is currently only defined when $custom_sources_list is not used (it is declared in default_preferences). Bring this file up in the apt class so that using custom sources doesn't remove its addition. Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2010-10-17Merge remote branch 'riseup/master'Gabriel Filion
Conflicts: manifests/init.pp
2010-10-17Ensure apt-listbugs is absent in dist-upgrade mode.intrigeri
Else it will crash automatic upgrades.
2010-10-17Need to update APT lists after apt.conf.d changes.intrigeri
2010-10-17No need to update APT lists when pinning changes (bis).intrigeri
2010-10-17Fix one more relationship.intrigeri
2010-10-17No need to refresh APT lists after changes to pinning preferences.intrigeri
2010-10-17Fix indentation.intrigeri
2010-10-17Fix relationships.intrigeri
2010-10-17minor improvements, especially do not refresh apt every runmh
2010-10-17improve examplemh
2010-10-17empty line between snippetsmh
2010-10-17fix header filemh
2010-10-17fix classnamemh
2010-10-17fix modules directory stuffmh
2010-10-17improve prefrences snippetmh
2010-10-17introduce preferences snippetmh
Now, we have the possibility to externally add snippes, so that we can preferences for packages that are for example only in backports or unstable.
2010-10-17Support choosing a custom Ubuntu mirror.intrigeri
2010-10-17Use append_if_no_such_line instead of line.intrigeri