Commit graph

87 commits

Author SHA1 Message Date
intrigeri
2cd9496999 Merge remote branch 'nadir/master'
Conflicts:
	README
	manifests/custom_sources.pp
	manifests/default_preferences.pp
	manifests/init.pp
	manifests/unattended_upgrades.pp
	templates/Debian/sources.list.volatile.erb
2010-11-10 10:19:06 +01:00
nadir
851d20a7b6 merged with immerda/master 2010-10-22 19:17:57 +02:00
mh
e2ac1b3d8d Merge remote branch 'lelutin/master'
Integrate no custom preference into our new
way to manage the preferences.

Conflicts:
	README
	manifests/default_preferences.pp
	manifests/init.pp
2010-10-21 01:59:41 +02:00
Gabriel Filion
4dbcd09281 Make it possible to ensure preferences is absent
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-18 01:51:16 -04:00
Gabriel Filion
9736578481 Remove unnecessary exec
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-18 01:43:24 -04:00
Gabriel Filion
ebcda455df Make $apt_clean effective in all cases
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-17 20:36:45 -04:00
Gabriel Filion
296593bcbd Merge remote branch 'riseup/master'
Conflicts:
	manifests/init.pp
2010-10-17 20:35:35 -04:00
intrigeri
8a9bea09e9 Need to update APT lists after apt.conf.d changes. 2010-10-17 16:47:38 +02:00
intrigeri
e0e1b80c4e No need to update APT lists when pinning changes (bis). 2010-10-17 16:46:55 +02:00
intrigeri
3f20c7823e Fix one more relationship. 2010-10-17 16:43:56 +02:00
intrigeri
20b67058ab No need to refresh APT lists after changes to pinning preferences. 2010-10-17 16:43:04 +02:00
intrigeri
487855daf2 Fix indentation. 2010-10-17 16:42:15 +02:00
intrigeri
7b9ba44340 Fix relationships. 2010-10-17 16:41:40 +02:00
mh
e19c94dcd2 minor improvements, especially do not refresh apt every run 2010-10-17 15:18:08 +02:00
mh
4d28e6668f introduce preferences snippet
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-17 13:58:59 +02:00
intrigeri
e42b54af40 Support choosing a custom Ubuntu mirror. 2010-10-17 10:51:06 +02:00
intrigeri
2d75cda2db Use append_if_no_such_line instead of line. 2010-10-17 02:54:20 +02:00
intrigeri
7a0dc9a37a Migrate config file to line-editing.
This allows other modules to add lines there too.
2010-10-17 02:30:28 +02:00
intrigeri
8ce3c34be5 Backward compatibility: ensure old renamed file is absent. 2010-10-17 02:13:59 +02:00
intrigeri
e3c8c1b6af Bring /etc/apt/apt.conf.d/99from_puppet to init.
APT configuration has (unfortunately) nothing to do with APT preferences.
2010-10-17 02:11:41 +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
7613ddde67 Rename $apt_use_volatile to $apt_volatile_enabled.
This will help merging with Nadir's changes.
2010-10-17 01:18:33 +02:00
root
7ed78d549b Manage a /etc/apt/apt.conf.d/99-puppet file. 2010-10-17 01:18:30 +02:00
intrigeri
f0320059a9 Add support for customizing the repos list (main, contrib, etc.)
The templates already made use of it, but the code didn't set a default value.
2010-10-10 11:06:07 +02:00
nadir
eae01000c1 re-added apt::custom_sources_template to deploy custom sources.list.d/xyz.list 2010-10-09 14:39:11 +02:00
intrigeri
fab154da39 Allow specifying custom mirrors for every supported archive. 2010-10-06 13:29:38 +02:00
intrigeri
53ca6e2235 Add opt-in support for next Debian release sources. 2010-10-06 12:39:50 +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
b312c866d5 Reindent for consistency with previous work. 2010-10-06 11:52:07 +02:00
intrigeri
32e9d9b922 Remove unneeded dependencies. 2010-10-06 11:30:56 +02:00
intrigeri
9139d33562 Initialize $release, $next_release, $codename, $next_codename in init.pp. 2010-10-06 11:17:30 +02:00
mh
521ccfec19 improve decision handling, remove unnecessary exec 2010-09-15 22:31:42 +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
Micah Anderson
cb9e265ad2 clean up the multiple File subscribes 2010-09-02 19:15:47 -04:00
Micah Anderson
92fd1d1351 quote all aliases to be consistent 2010-09-02 19:14:23 -04:00
mh
33f1b53c89 improve exec naming 2010-08-10 16:27:54 +02:00
mh
604cef0cc9 fix relation 2010-08-09 14:37:54 +02:00
mh
6aee66b509 remove unnecessary fileserver variable (#2460) 2010-08-07 02:12:12 +02:00
mh
bcb3ff88cd set loglevel to info so we don't pollute the logs 2010-06-28 21:49:09 +02:00
mh
a41c9ef86b adjust new module dir path 2010-05-09 22:44:40 +02:00
mh
f315dedce6 fix preseeding dir path 2009-11-14 14:35:09 +01:00
mh
64d2c07735 change pending module file resources to new 0.25 style 2009-11-02 01:12:12 +01:00
mh
848dff40a3 fixing requirements 2009-10-30 22:19:07 +01:00
mh
17be8ac184 switch to new lsb way 2009-10-30 22:04:48 +01:00
mh
61142025e7 our module_dir is currently called modules_dir 2009-10-30 21:43:43 +01:00
mh
84f7ca7641 introduce a class to manage unattended-upgrades 2009-10-30 20:35:30 +01:00
mh
87d2fe06d1 refactor to fit pbp
- refactor every class and define into its very own file to fit
  better (at least our) puppet's best practices.

- some cosmetic rearrangements

- no code changes have been made, only reordering
2009-10-30 18:21:42 +01:00
Micah Anderson
28c7b3d5f4 Merge commit 'sarava/master' 2009-09-03 19:18:34 -04:00