Commit graph

415 commits

Author SHA1 Message Date
varac
507d5448c8 Merge remote-tracking branch 'riseup/feature/unknown_lsbdistcodename' 2012-12-19 17:38:32 +01:00
varac
ffb44c91db Merge branch 'master' of git://labs.riseup.net/shared-apt 2012-12-19 09:40:53 +01:00
Micah Anderson
7de392c40e On a sid system, $lsbdistcodename is reports 'n/a', this doesn't work because the module
looks for a template based on the $lsbdistcodename, so you get this error:

      Could not find template 'apt/Debian/preferences_n/a.erb'

The slash in 'n/a' appears to be a path (confusing!)

So I've set an error message when 'n/a' is encountered, encouraging the user to set the $lsbdistcodename.

I was not confident in the idea of pointing any occurrence of 'n/a' to the sid
templates, as I could imagine a case where this might occur on a non-sid system
where the lsbdistcodename isn't properly detected
2012-12-18 16:45:38 -05:00
Micah Anderson
e66823269e switch default $debian_url to use http.debian.net which is more accurate and up-to-date than cdn.debian.net 2012-12-18 16:41:10 -05:00
nadir
3a473dafd5 comparing variabled should use double quotes (interestingly, it does work with only one too) 2012-12-18 22:31:00 +01:00
nadir
4718ae27c9 updated README to explain $apt_disable_update 2012-12-18 22:26:53 +01:00
nadir
4204847fdd added $apt_disable_update to disable "apt-get update" during puppetruns 2012-12-18 22:26:45 +01:00
varac
0d5311b1a9 use codename instead of archive variable for Debian 2012-12-16 11:12:15 +01:00
varac
727b0cd218 squeeze: use colon seperator to be able to include backport updates,
also force unattended upgrades
2012-12-16 10:46:21 +01:00
varac
f1f64edd89 use oldstable for lenny, force unattended upgrades 2012-12-16 10:44:55 +01:00
varac
2fa22c2268 refactor 50unattended-upgrades default file
The syntax is valid from v0.70 on (Debian Wheezy, Ubuntu Oneiric
and later).
It includes Unattended-Upgrade::Origins-Patterns both for Debian
and Ubuntu, which even work on systems with both package sources
enables. On Debian- or Ubuntu-only systems it doesn't hurt to have
both Patterns included.
2012-12-16 10:36:32 +01:00
varac
28f7fa6bc2 from Ubuntu oneiric (11.10) on, the 50unattended-upgrades default can be used 2012-12-16 10:35:04 +01:00
varac
29a6478ced 50unattended-upgrades: ubuntu quantal, symlink to precise 2012-12-15 15:29:48 +01:00
varac
1fffb559e5 50unattended-upgrades: ubuntu precise version 2012-12-15 15:29:08 +01:00
varac
55305baaa9 50unattended-upgrades: squeeze version 2012-12-15 12:57:28 +01:00
varac
4e553d4b5f 50unattended-upgrades: lenny version 2012-12-15 12:49:20 +01:00
varac
e8c0500b5f Replaced fallback file for unattended-upgrades
with a decent one for wheezy onwards. The main syntax shouldn't
change, hopefully, from now on. It's a very basic generic one,
that uses variables for Distribution/Codename and should apply
to all coming distributions.

Removed from the default 50unattended-upgrades
----------------------------------------------

- APT::Periodic::Update-Package-Lists "1";
- APT::Periodic::Unattended-Upgrade "1";
cause this is not something the unattended upgrades class should
set by default.

- APT::UnattendedUpgrades::LogDir "/var/log/";
- APT::UnattendedUpgrades::LogFile "unattended_upgrades.log";
Because we shouldn't change the default logdest by default, which
is /var/log/unattended_upgrades/*.

- Blacklist for linux-image*, because this we shouldn't blacklist
  packages by default.
2012-12-15 12:46:19 +01:00
Micah Anderson
07a031f205 fix for $lsbdistcodename regression introduced by ac166366d7
What happened here was the $codename = $::lsbdistcodename was removed from
init.pp and replaced with just $::lsbdistcodename whereever $codename was
used. Then in the sources.list.erb and preferences files things were changed
like this:

<pre>+### Debian current: <%= codename = scope.lookupvar('::lsbdistcodename') %>
...
-deb <%= debian_url %> <%= codename %> <%= repos %>
...
+deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= repos=scope.lookupvar('apt::repos') %>
</pre>

This meant that the codename was always set to lsbdistcodename, and you because
in newer puppet versions you cannot assign a value to a top-level facter
variable, it is not possible to change this.

Because we cannot change $lsbdistcodename, we have to fix this by allowing the
user to pass a different, non-top-level scoped variable to the class as a
parameter, which defaults to $::lsbdistcodename, so that upgrades can be
triggered.

This is documented in the README in an upgrade notice
2012-12-05 13:46:23 -05:00
Gabriel Filion
d1d7f7b9bd Precision on file name format in preferences.d directory
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-09-20 04:08:38 -04:00
Gabriel Filion
9d7b48e37c Define an alias when enforcing absence of /etc/apt/preferences
This ensures that resources that set a dependecy on the
"File['apt_config']" file, as mentioned in the README, can always
resolve.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-09-20 04:00:38 -04:00
Gabriel Filion
2dee53c328 Some stylistic corrections in manifest examples in the README
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-09-20 03:59:58 -04:00
Gabriel Filion
8229505ecb Make apt::preferences_snippet place files in /etc/apt/preferences.d
Since Debian Squeeze, apt supports a .d directory for preferences
(pinning). Simplify management by just placing files inside this .d
directory.

This removes the need for concat and concat::fragment resources, so
removes the dependency on the concat module. It also removes the need
for a moduledir that was needed for the concat module magic, so we also
get rid of the dependency on the common module.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-09-20 03:55:58 -04:00
Gabriel Filion
978378623d Stop using config_file from the common module
This define doesn't add much of a shortcut and imposes a dependency on
the "common" module. We'll be better off with the small repetition but
less tightly coupled modules.

Sadly, the "common" module is still required, but that is going to be
the focus of the commit that follows this one.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-09-20 02:54:26 -04:00
Micah Anderson
460c1d54d1 Add upgrade notices about the changes to parameterized classes; add a Requirements header; move things that used to be called variables into the appropriate parameterized class section 2012-08-22 10:57:06 -04:00
Micah Anderson
b528cd0005 parameterize the apt::proxy_client class 2012-08-22 10:55:25 -04:00
mh
0c2f31b5d5 Merge remote-tracking branch 'shared/master'
Conflicts:
	README
	manifests/dist_upgrade/initiator.pp
	manifests/init.pp
	manifests/preseeded_package.pp
	manifests/unattended_upgrades.pp
2012-08-16 09:35:21 +02:00
Micah Anderson
4f433dbd52 update README to reflect the requirement of the lsb module 2012-08-08 11:25:02 -04:00
intrigeri
02bd326994 Make apt::preferences_snippet support Puppet < 2.7 again, when the 'package' parameter is not set.
Details:
  https://labs.riseup.net/code/issues/3467
  https://labs.riseup.net/code/issues/3468
2012-06-18 22:57:13 +02:00
mh
f823fcd5b7 fix auto repo selection
the actual repos are in real_repos as by default we have auto.
2012-06-18 17:33:49 -03:00
mh
5d75c10a4d fix relations and finally get rid off config_file 2012-06-18 17:10:40 -03:00
mh
d47addd2ed get rid off config_file wrapper 2012-06-18 11:41:04 -03:00
mh
0e016e968d migrate away from hiera stuff 2012-06-14 10:07:29 -03:00
intrigeri
2e4d22ddd9 Allow passing arbitrary Pin value to apt::preferences_snippet.
Closes: Redmine#3467.
2012-06-08 18:30:23 +02:00
intrigeri
13a0b4484f Support multiple APT preferences snippets for the same package name pattern.
This is implemented by adding a "package" parameter to apt::preferences_snippet,
so that define names can be kept unique while the package names are
not necessarily.

Closes: Redmine#3468.
2012-06-08 18:18:50 +02:00
mh
ac166366d7 refactor things for >2.7 2012-06-08 12:16:46 -03:00
mh
0cb3cd816e Migrate - in class names to _
In newer puppet releases the old way to name class/modules with a -,
won't anymore be supported.

Conflicts:

	manifests/unattended_upgrades.pp
2012-06-08 15:07:48 +02:00
mh
39917fb4db new style for 2.7 2012-06-05 21:31:15 -03:00
Silvio Rhatto
1af58e700e Changing ubuntu preferences templates to symlinks 2012-05-20 17:42:49 +02:00
Silvio Rhatto
235cdafaa4 Adding precise template 2012-05-20 17:40:51 +02:00
Silvio Rhatto
0528f86f5e Adding preferences_oneiric.erb 2012-05-20 17:40:39 +02:00
Gabriel Filion
1ac72986c4 Apply GPL-v3 license
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-04-21 05:54:28 -04:00
mh
f1a0eca466 Migrate - in class names to _
In newer puppet releases the old way to name class/modules with a -,
won't anymore be supported.
2012-04-15 15:41:58 +02:00
mh
bdc2446671 Merge remote-tracking branch 'shared/master'
Conflicts:
	README
2012-04-15 13:19:45 +02:00
intrigeri
ee33741aa1 Fix formatting. 2012-04-11 11:37:24 +02:00
intrigeri
1c96159d7e Depend on our shared concat module rather than ripienaar's one.
Most of us are likely to use and test against the former.
2012-04-11 11:36:31 +02:00
mh
56efade862 use correct references for new concat usage 2012-04-11 11:35:31 +02:00
mh
5173c71715 use the correct name 2012-04-11 11:35:31 +02:00
mh
8996d83489 migrate concatenated_file to the concat module 2012-04-11 11:35:31 +02:00
Gabriel Filion
a835369958 Force an apt-get update when changing an apt::sources_list
sources_list doesn't currently force puppet to run 'apt-get update'
after creating/modifying/removing files in sources.list.d.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-04-09 01:39:29 -04:00
Gabriel Filion
4d0ddd0057 Refactor: manage .d directories when using sources_list and apt_conf
The .d directories are only managed by the main 'apt' class. However,
both 'sources_list' and 'apt_conf' defines depend on those directories.
So in practice, the defines have an implicit need for those directories
to be somehow managed.

Let's turn this into an explicit relation, and include the directories
in the defines.

This makes it possible to use both defines without having to include the
main 'apt' class. (maybe when using puppet apply?)

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
2012-04-09 01:38:30 -04:00