From 4c5f0726d3eee0caa62f509743762968dc4b544b Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 13 Oct 2012 11:00:17 +0200 Subject: use debian unstable for couchdb --- puppet/modules/site_apt/files/unstable.list | 1 + 1 file changed, 1 insertion(+) create mode 100644 puppet/modules/site_apt/files/unstable.list (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/files/unstable.list b/puppet/modules/site_apt/files/unstable.list new file mode 100644 index 00000000..0e289136 --- /dev/null +++ b/puppet/modules/site_apt/files/unstable.list @@ -0,0 +1 @@ +deb http://http.debian.net/debian unstable main -- cgit v1.2.3 From d54dabff2726e728da6a9d31588bc2a52783a9a6 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 10 Dec 2012 15:54:32 +0100 Subject: include site_apt::dist_upgrade (fixes #1107) --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 puppet/modules/site_apt/manifests/dist_upgrade.pp (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp new file mode 100644 index 00000000..5ae9297f --- /dev/null +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -0,0 +1,10 @@ +class site_apt::dist_upgrade inherits apt::dist_upgrade { + + # really upgrade on every puppetrun + Exec["apt_dist-upgrade"]{ + refreshonly => false, + } + + # Ensure apt-get upgrade has been run before installing any packages + Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> +} -- cgit v1.2.3 From 4639b19a10d0fc2e1562a2135fe1b33b70571155 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 14 Dec 2012 16:20:29 +0100 Subject: moved site_config::apt to site_apt --- puppet/modules/site_apt/manifests/init.pp | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 puppet/modules/site_apt/manifests/init.pp (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp new file mode 100644 index 00000000..7f8b09a1 --- /dev/null +++ b/puppet/modules/site_apt/manifests/init.pp @@ -0,0 +1,8 @@ +class site_apt { + + include ::apt + + apt::apt_conf { '90disable-pdiffs': + content => 'Acquire::PDiffs "false";'; + } +} -- cgit v1.2.3 From e074a620b3b661a46469f3bba43e699ec77c1a27 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 14 Dec 2012 16:58:51 +0100 Subject: leftover apt sources file, see commit febd45328 --- puppet/modules/site_apt/files/unstable.list | 1 - 1 file changed, 1 deletion(-) delete mode 100644 puppet/modules/site_apt/files/unstable.list (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/files/unstable.list b/puppet/modules/site_apt/files/unstable.list deleted file mode 100644 index 0e289136..00000000 --- a/puppet/modules/site_apt/files/unstable.list +++ /dev/null @@ -1 +0,0 @@ -deb http://http.debian.net/debian unstable main -- cgit v1.2.3 From d0e49a478584b6ac6e18846e2f0b9b4c0d1c5b21 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 14 Dec 2012 16:59:21 +0100 Subject: deploy custom unettended upgrade file --- puppet/modules/site_apt/files/50unattended-upgrades | 13 +++++++++++++ puppet/modules/site_apt/manifests/init.pp | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 puppet/modules/site_apt/files/50unattended-upgrades (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/files/50unattended-upgrades b/puppet/modules/site_apt/files/50unattended-upgrades new file mode 100644 index 00000000..1639e68a --- /dev/null +++ b/puppet/modules/site_apt/files/50unattended-upgrades @@ -0,0 +1,13 @@ +Unattended-Upgrade::Origins-Pattern { + "o=${distro_id},n=${distro_codename}"; + "o=${distro_id},n=${distro_codename}-updates"; + "o=${distro_id},n=${distro_codename}-proposed-updates"; + "o=${dis tro_id},n=${distro_codename},l=Debian-security"; +}; + + +Unattended-Upgrade::Mail "root"; + +Unattended-Upgrade::MailOnlyOnError "true"; + + diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 7f8b09a1..7d1d039c 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -5,4 +5,6 @@ class site_apt { apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; } + + include ::apt::unattended_upgrades } -- cgit v1.2.3 From af7885a5a4b59985f55d8b28200fc750eb72ddbc Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 16 Dec 2012 11:17:10 +0100 Subject: no need for custom 50unattended-upgrades with new unattended_upgrades class --- puppet/modules/site_apt/files/50unattended-upgrades | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 puppet/modules/site_apt/files/50unattended-upgrades (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/files/50unattended-upgrades b/puppet/modules/site_apt/files/50unattended-upgrades deleted file mode 100644 index 1639e68a..00000000 --- a/puppet/modules/site_apt/files/50unattended-upgrades +++ /dev/null @@ -1,13 +0,0 @@ -Unattended-Upgrade::Origins-Pattern { - "o=${distro_id},n=${distro_codename}"; - "o=${distro_id},n=${distro_codename}-updates"; - "o=${distro_id},n=${distro_codename}-proposed-updates"; - "o=${dis tro_id},n=${distro_codename},l=Debian-security"; -}; - - -Unattended-Upgrade::Mail "root"; - -Unattended-Upgrade::MailOnlyOnError "true"; - - -- cgit v1.2.3 From e97a022b52291a2593ee0efbab4c1b8f9d60be01 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 19 Dec 2012 10:56:06 +0100 Subject: move apt-get upgrade to inital stage --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 3 ++- puppet/modules/site_apt/manifests/init.pp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 5ae9297f..4baabc77 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -6,5 +6,6 @@ class site_apt::dist_upgrade inherits apt::dist_upgrade { } # Ensure apt-get upgrade has been run before installing any packages - Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> + # Disables because apt-get update is moved to stage initial + # Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> } diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 631f5742..99bcce4f 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,7 +1,7 @@ class site_apt { include ::apt - include site_apt::dist_upgrade + #include site_apt::dist_upgrade apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; -- cgit v1.2.3 From 27651e6188325880244fe17d3bf82c3068095e8a Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 18 Jan 2013 22:32:47 +0100 Subject: linted --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 4baabc77..adf165bd 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -1,11 +1,11 @@ class site_apt::dist_upgrade inherits apt::dist_upgrade { # really upgrade on every puppetrun - Exec["apt_dist-upgrade"]{ - refreshonly => false, + Exec['apt_dist-upgrade']{ + refreshonly => false, } # Ensure apt-get upgrade has been run before installing any packages # Disables because apt-get update is moved to stage initial - # Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> + # Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> } -- cgit v1.2.3 From 5fdcfd3b80a038a18aba9a975270acc686efd185 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 20 Jan 2013 17:47:03 +0100 Subject: don't run if another apt-get process is running --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index adf165bd..87a2fc00 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -1,11 +1,11 @@ class site_apt::dist_upgrade inherits apt::dist_upgrade { - # really upgrade on every puppetrun + if $::apt_running == 'true' { + fail ('apt-get is running in background - Please wait until it finishes. Exiting.') + } + # ensue dist-upgrade on every puppetrun Exec['apt_dist-upgrade']{ refreshonly => false, } - # Ensure apt-get upgrade has been run before installing any packages - # Disables because apt-get update is moved to stage initial - # Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> } -- cgit v1.2.3 From be81edd7aa5e35c9bd79cd77946e6e7d17288bee Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 29 Jan 2013 16:36:29 +0100 Subject: apt-get update + dist-upgrade in initial stage --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 87a2fc00..f129dd73 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -1,11 +1,15 @@ -class site_apt::dist_upgrade inherits apt::dist_upgrade { +class site_apt::dist_upgrade { if $::apt_running == 'true' { fail ('apt-get is running in background - Please wait until it finishes. Exiting.') + } else { + exec{'initial_apt_update': + command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean', + refreshonly => false, + } + exec{'initial_apt_dist_upgrade': + command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade", + refreshonly => false, + } } - # ensue dist-upgrade on every puppetrun - Exec['apt_dist-upgrade']{ - refreshonly => false, - } - } -- cgit v1.2.3 From 50bb4b8b4d3f71b2916acbbefca92df9fdc53e68 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 30 Jan 2013 10:32:15 -0500 Subject: provide a fall-back apt.sources.d entry that is disabled by default (#1348) This file will have the .disabled removed by the apt wrapper when the apt-get update fails --- puppet/modules/site_apt/manifests/init.pp | 5 +++++ puppet/modules/site_apt/templates/fallback.list | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 puppet/modules/site_apt/templates/fallback.list (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 99bcce4f..beef6fa5 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -8,4 +8,9 @@ class site_apt { } include ::apt::unattended_upgrades + + apt::sources_list { 'fallback.list.disabled': + content => template('site_apt/fallback.list'); + } + } diff --git a/puppet/modules/site_apt/templates/fallback.list b/puppet/modules/site_apt/templates/fallback.list new file mode 100644 index 00000000..fa6d041f --- /dev/null +++ b/puppet/modules/site_apt/templates/fallback.list @@ -0,0 +1,3 @@ +# basic +deb http://ftp.debian.org/debian/ <%= codename %> <%= repos %> + -- cgit v1.2.3 From 09649211f3c4b9ffd08af15deabe5916cf78df72 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 30 Jan 2013 11:19:20 -0500 Subject: codename is unavailable in the site_apt module, but $::lsbdistcodename is fine here --- puppet/modules/site_apt/templates/fallback.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/templates/fallback.list b/puppet/modules/site_apt/templates/fallback.list index fa6d041f..41334b0b 100644 --- a/puppet/modules/site_apt/templates/fallback.list +++ b/puppet/modules/site_apt/templates/fallback.list @@ -1,3 +1,3 @@ # basic -deb http://ftp.debian.org/debian/ <%= codename %> <%= repos %> +deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free -- cgit v1.2.3 From 1b01713860db2cb0df080874b31c0ba898323c35 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 12 Feb 2013 13:11:34 -0500 Subject: remove unused commented-out line --- puppet/modules/site_apt/manifests/init.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'puppet/modules/site_apt') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index beef6fa5..80c6fbde 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,7 +1,6 @@ class site_apt { include ::apt - #include site_apt::dist_upgrade apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; -- cgit v1.2.3