Commit graph

346 commits

Author SHA1 Message Date
Micah Anderson
88bfe5fbab fix for the following: warning: Dynamic lookup of $custom_preferences at modules/apt/manifests/preferences_snippet.pp:16 is deprecated. For more information, see http://docs.puppetlabs.com/guides/scope_and_puppet.html. To see the change in behavior, use the --debug flag. 2013-06-20 15:32:51 -04:00
Micah Anderson
61a2f48948 Merge branch 'master' into leap 2013-05-26 17:04:05 -04:00
intrigeri
c38be6cb7c Wheezy was released! 2013-05-03 17:09:34 +02:00
intrigeri
46c58b07bf Use the main Debian archive's URL as the default URL for backports on Wheezy.
The backports are now fully integrated with the main archive.

See:
https://labs.riseup.net/code/issues/4270
https://lists.debian.org/debian-devel-announce/2013/03/msg00007.html
2013-03-20 22:11:46 +01:00
intrigeri
5ec8ffb4ef Move apt class parameters to a ::params class.
This brings no behaviour change yet, but will allow to set class parameters'
default value depending on system facts.
2013-03-20 22:09:29 +01:00
varac
6bf7a6ab5d Revert "deploy /etc/apt/preferences before File['apt_config']"
This reverts commit 7e8113b3fc.

see https://leap.se/code/issues/1990 for the miserious details.
2013-03-15 20:46:29 +01:00
varac
7e8113b3fc deploy /etc/apt/preferences before File['apt_config'] 2013-03-14 22:19:33 +01:00
varac
c8a28eb80e apt keys: always deploy before Exec[refresh_apt], also with $custom_preferences 2013-03-14 20:01:35 +01:00
varac
f0a107ffee fix #4249: Ubuntu: wrong sources.list entries 2013-03-05 09:39:23 +01:00
intrigeri
d51e2af9d4 Don't check for a package priority to be set when removing an APT preferences snippet.
The problem I'm facing is that the sanity checks prevent one from
using a simple:

  apt::preferences_snippet { "bla": ensure => absent }

So, first set a default value for the `priority' parameter, so
that it's not required anymore. Second, add a sanity check to
error out when priority is not set, to get the safe old behaviour.

Then, wrap all sanity checks about arguments within
a "if $ensure == 'present'" block.
2013-02-16 14:58:43 -05:00
varac
f16a0727dc Install unattended-upgrades after Exec[refresh_apt]
Before, including apt::unattended_upgrades on a host without
the unattended-upgrades package would fail on the first run,
because the module tries to install the package before apt is
finally configured.
This commit does:

- introduce the option $refresh_apt for apt::apt_conf
  (Defaults to true). Can be used to not trigger Exec['refresh_apt']
- install the unattended-upgrades package after a final
  Exec['refresh_apt']. To not run into a loop, it calls
  Apt_conf['50unattended-upgrades'] with the option
  refresh_apt => false, which is also not needed for the configuration
2013-02-01 15:52:29 +01:00
varac
6c135ea7bc Merge remote-tracking branch 'remotes/shared/master' 2013-01-30 16:47:30 +01:00
varac
92d2d7be5f added custom fact apt_running 2013-01-20 17:32:02 +01:00
intrigeri
14670466be Don't check for source / content to be set when removing an APT source.
Else, the sanity checks prevent one from using a simple
  apt::sources_list { "sid.list": ensure => absent }
2013-01-08 18:13:23 +01:00
intrigeri
354283d54e Merge remote-tracking branch 'leap/feature/unattended_upgrades' into review
Conflicts:
	files/lenny/50unattended-upgrades
2013-01-08 14:05:49 +01:00
Micah Anderson
2fe3df225c replace a missed Concat reference change with File['apt_config'] 2013-01-03 14:55:55 -05:00
Micah Anderson
39f089405e lint README 2013-01-03 14:18:44 -05:00
intrigeri
9a3e6c173e Add dependency back to the README.
It was erroneously removed at some point,
but this module still depends on the "common" one,
at least for the time being.
2013-01-03 19:59:37 +01:00
intrigeri
1fe1fe66c3 Fix overzealous linting.
We do want to see \n expanded in this string.
2013-01-03 19:57:44 +01:00
varac
f3daf58b9e forgot ${distro_codename}-updates in 50unattended-upgrades fallback 2013-01-02 17:29:05 +01:00
Gabriel Filion
ded81d8edc Apply code style corrections from puppet-lint
Signed-off-by: Gabriel Filion <lelutin@gmail.com>

+ more linting by intrigeri.

Conflicts:
	manifests/apticron.pp
	manifests/cron/dist_upgrade.pp
	manifests/cron/download.pp
	manifests/dist_upgrade/initiator.pp
	manifests/init.pp
	manifests/listchanges.pp
	manifests/preferences.pp
	manifests/preseeded_package.pp
	manifests/proxy_client.pp
	manifests/unattended_upgrades.pp
	manifests/update.pp
2013-01-02 17:28:59 +01:00
intrigeri
17f67d9fac Simplify codename handling.
Have the codename class parameter default to $::lsbdistcodename, and derive
$release from it.
2013-01-02 16:54:03 +01:00
intrigeri
aac83e728c Lookup next_release in template the same way we lookup next_codename.
next_release was forgotten when next_codename was fixed.
2013-01-02 16:52:10 +01:00
intrigeri
09710a29b1 Remove duplicated settings, resulting from wrong merge. 2013-01-02 16:40:26 +01:00
intrigeri
dc38efc891 Fix README formatting. 2013-01-02 16:39:24 +01:00
intrigeri
fbe9bac5ae Finish updating README to reflect move to parameterized classes. 2013-01-02 16:38:59 +01:00
intrigeri
517040bb2e Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
	README
	manifests/cron/dist_upgrade.pp
	manifests/cron/download.pp
	manifests/init.pp
	manifests/preferences.pp
2013-01-02 16:14:06 +01:00
Gabriel Filion
cda713fcf6 Merge branch 'master' into issue_3953 2013-01-02 07:32:12 -05:00
intrigeri
37e5594770 Merge remote-tracking branch 'riseup/feature/http_debian_net' 2012-12-30 13:59:08 +01:00
intrigeri
8e5ce0b397 Merge remote-tracking branch 'riseup/feature/unknown_lsbdistcodename' 2012-12-30 13:58:59 +01:00
nadir
37e40416d2 exec{'apt_dist-upgrade'} just requires Exec['apt_updated'] if apt::disable_update if false 2012-12-19 18:30:29 +01:00
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