From 0d8659d2bbcdc2da8481aa1445affc069b61c2e7 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 3 Nov 2015 18:42:01 +0100
Subject: [feat] Release-specific apt sources file for leap

- Related: #6920
---
 puppet/modules/site_apt/manifests/leap_repo.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 2d4ba0e1..462b2686 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -1,9 +1,11 @@
+# install leap deb repo together with leap-keyring package
+# containing the apt signing key
 class site_apt::leap_repo {
   $platform = hiera_hash('platform')
   $major_version = $platform['major_version']
 
   apt::sources_list { 'leap.list':
-    content => "deb http://deb.leap.se/${major_version} wheezy main\n",
+    content => "deb http://deb.leap.se/${major_version} ${::lsbdistcodename} main\n",
     before  => Exec[refresh_apt]
   }
 
-- 
cgit v1.2.3


From 02b1b484ad9a5d065ceac72b8263b7bcc112c923 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 3 Nov 2015 19:12:59 +0100
Subject: [feat] install couchdb from unstable on jessie

- Related: #6920
---
 puppet/modules/site_apt/manifests/sid_repo.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 puppet/modules/site_apt/manifests/sid_repo.pp

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/sid_repo.pp b/puppet/modules/site_apt/manifests/sid_repo.pp
new file mode 100644
index 00000000..7c1d8783
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/sid_repo.pp
@@ -0,0 +1,11 @@
+# configure debian unstable aka "sid"
+# currently only used for installations that
+# use plain couchdb instead of bigcouch
+class site_apt::sid_repo {
+
+  apt::sources_list { 'debian_sid.list':
+    content => "deb http://httpredir.debian.org/debian/ sid main\n",
+    before  => Exec[refresh_apt]
+  }
+
+}
-- 
cgit v1.2.3


From 36f4b8df0eb9d7d8a9a6fa5d4874d09e9d5c2020 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 19 Nov 2015 15:06:01 +0100
Subject: [bug] [jessie] Install pnp4nagios deb from stretch

Configure the apt class together with "use_next_release => true", so
pnp4nagios* packages can get installed from strech.
No other package will be upgraded as the apt module pins stretch very
low, so that only packages are installed if there are no other sources
available.

- Resolves: #7604
---
 puppet/modules/site_apt/manifests/init.pp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index cf49f870..635ba975 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -7,11 +7,19 @@ class site_apt {
   $apt_url_security  = $apt_config['security']
   $apt_url_backports = $apt_config['backports']
 
+  # needed on jessie hosts for getting pnp4nagios from testing
+  if ( $::operatingsystemmajrelease == '8' ) {
+    $use_next_release = true
+  } else {
+    $use_next_release = false
+  }
+
   class { 'apt':
-    custom_key_dir => 'puppet:///modules/site_apt/keys',
-    debian_url     => $apt_url_basic,
-    security_url   => $apt_url_security,
-    backports_url  => $apt_url_backports
+    custom_key_dir   => 'puppet:///modules/site_apt/keys',
+    debian_url       => $apt_url_basic,
+    security_url     => $apt_url_security,
+    backports_url    => $apt_url_backports,
+    use_next_release => $use_next_release
   }
 
   # enable http://deb.leap.se debian package repository
-- 
cgit v1.2.3


From 20b2b4cc8ee1e85cf1bc8dfaa4db9fb70dcac72b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 30 Nov 2015 15:36:41 +0100
Subject: Revert "[feat] install couchdb from unstable on jessie"

This reverts commit 02b1b484ad9a5d065ceac72b8263b7bcc112c923.

Now that we have a proper couchdb jessie package we don't need to
install it from Debian unstable.
---
 puppet/modules/site_apt/manifests/sid_repo.pp | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 puppet/modules/site_apt/manifests/sid_repo.pp

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/sid_repo.pp b/puppet/modules/site_apt/manifests/sid_repo.pp
deleted file mode 100644
index 7c1d8783..00000000
--- a/puppet/modules/site_apt/manifests/sid_repo.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# configure debian unstable aka "sid"
-# currently only used for installations that
-# use plain couchdb instead of bigcouch
-class site_apt::sid_repo {
-
-  apt::sources_list { 'debian_sid.list':
-    content => "deb http://httpredir.debian.org/debian/ sid main\n",
-    before  => Exec[refresh_apt]
-  }
-
-}
-- 
cgit v1.2.3


From efed34739df6cafbb5f5e8144aa98a87d96d6924 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 10 Dec 2015 11:16:17 +0100
Subject: [feat] Make leap apt sources url configurable

So we can use the experimental-0.8 repo instead of 0.8 i.e.

Use this to customize the main LEAP deb url:

    "sources": {
      "apt": {
        "leap": {
          "basic": "http://deb.leap.se/experimental-0.9"
        }
      }
    }
---
 puppet/modules/site_apt/manifests/init.pp      | 16 +++++++++++-----
 puppet/modules/site_apt/manifests/leap_repo.pp |  8 +++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 635ba975..5d177e7f 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,11 +1,17 @@
 # setup apt on all nodes
 class site_apt {
 
-  $sources           = hiera('sources')
-  $apt_config        = $sources['apt']
-  $apt_url_basic     = $apt_config['basic']
-  $apt_url_security  = $apt_config['security']
-  $apt_url_backports = $apt_config['backports']
+  $sources            = hiera('sources')
+  $apt_config         = $sources['apt']
+
+  # debian repo urls
+  $apt_url_basic      = $apt_config['basic']
+  $apt_url_security   = $apt_config['security']
+  $apt_url_backports  = $apt_config['backports']
+
+  # leap repo url
+  $apt_config_leap    = $apt_config['leap']
+  $apt_url_leap_basic = $apt_config_leap['basic']
 
   # needed on jessie hosts for getting pnp4nagios from testing
   if ( $::operatingsystemmajrelease == '8' ) {
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 462b2686..317c2f12 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -4,8 +4,14 @@ class site_apt::leap_repo {
   $platform = hiera_hash('platform')
   $major_version = $platform['major_version']
 
+  if $::site_apt::apt_url_leap_basic == '' {
+    $content = "deb http://deb.leap.se/${major_version} ${::lsbdistcodename} main\n"
+  } else {
+    $content = "deb ${::site_apt::apt_url_leap_basic} ${::lsbdistcodename} main\n"
+  }
+
   apt::sources_list { 'leap.list':
-    content => "deb http://deb.leap.se/${major_version} ${::lsbdistcodename} main\n",
+    content => $content,
     before  => Exec[refresh_apt]
   }
 
-- 
cgit v1.2.3


From 1f9da0490a3d55831e2b834ab5801c629123d226 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 10 Dec 2015 12:30:52 +0100
Subject: [bug] Configure default sources.platform.apt.basic

Providing a custom sources.platform.apt.basic value worked
with the last commit, but without that the platform would fail.
So we provide a default value now in provider_base/common.json,
which can get overridden.
---
 puppet/modules/site_apt/manifests/init.pp      | 14 +++++++-------
 puppet/modules/site_apt/manifests/leap_repo.pp |  8 +-------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 5d177e7f..c809a837 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,17 +1,17 @@
 # setup apt on all nodes
 class site_apt {
 
-  $sources            = hiera('sources')
-  $apt_config         = $sources['apt']
+  $sources           = hiera('sources')
+  $apt_config        = $sources['apt']
 
   # debian repo urls
-  $apt_url_basic      = $apt_config['basic']
-  $apt_url_security   = $apt_config['security']
-  $apt_url_backports  = $apt_config['backports']
+  $apt_url_basic     = $apt_config['basic']
+  $apt_url_security  = $apt_config['security']
+  $apt_url_backports = $apt_config['backports']
 
   # leap repo url
-  $apt_config_leap    = $apt_config['leap']
-  $apt_url_leap_basic = $apt_config_leap['basic']
+  $platform_sources       = $sources['platform']
+  $apt_url_platform_basic = $platform_sources['apt']['basic']
 
   # needed on jessie hosts for getting pnp4nagios from testing
   if ( $::operatingsystemmajrelease == '8' ) {
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 317c2f12..a1382374 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -4,14 +4,8 @@ class site_apt::leap_repo {
   $platform = hiera_hash('platform')
   $major_version = $platform['major_version']
 
-  if $::site_apt::apt_url_leap_basic == '' {
-    $content = "deb http://deb.leap.se/${major_version} ${::lsbdistcodename} main\n"
-  } else {
-    $content = "deb ${::site_apt::apt_url_leap_basic} ${::lsbdistcodename} main\n"
-  }
-
   apt::sources_list { 'leap.list':
-    content => $content,
+    content => "deb ${::site_apt::apt_url_platform_basic} ${::lsbdistcodename} main\n",
     before  => Exec[refresh_apt]
   }
 
-- 
cgit v1.2.3


From 5825513bcd14efd39031ba5cab3613a39c3027ec Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 9 Dec 2015 17:06:59 +0100
Subject: [feat] Remove double run of apt-get update

---
 puppet/modules/site_apt/manifests/dist_upgrade.pp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index 08de31bb..250f4b70 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -3,15 +3,11 @@ 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',
-      refreshonly => false,
-      timeout     => 360,
-    }
     exec{'initial_apt_dist_upgrade':
       command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold'  dist-upgrade",
       refreshonly => false,
       timeout     => 1200,
+      require     => Exec['refresh_apt']
     }
   }
 }
-- 
cgit v1.2.3


From 3bb37824d5cf1e146a257d14d5cf41d7df3def5d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 9 Dec 2015 17:13:23 +0100
Subject: [style] Lint site_apt::dist_upgrade

---
 puppet/modules/site_apt/manifests/dist_upgrade.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index 250f4b70..40e2dd58 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -1,6 +1,10 @@
+# upgrade all packages
 class site_apt::dist_upgrade {
 
+  # facter returns 'true' as string
+  # lint:ignore:quoted_booleans
   if $::apt_running == 'true' {
+  # lint:endignore
     fail ('apt-get is running in background - Please wait until it finishes. Exiting.')
   } else {
     exec{'initial_apt_dist_upgrade':
-- 
cgit v1.2.3


From bb76a5a1c77bd23ba988f2591a093693619b23f9 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 25 Jan 2016 15:09:28 +0100
Subject: [bug] Fix unattended-upgrades on jessie

- Resolves: #7842
---
 puppet/modules/site_apt/manifests/unattended_upgrades.pp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/unattended_upgrades.pp b/puppet/modules/site_apt/manifests/unattended_upgrades.pp
index 40111deb..42f1f4c6 100644
--- a/puppet/modules/site_apt/manifests/unattended_upgrades.pp
+++ b/puppet/modules/site_apt/manifests/unattended_upgrades.pp
@@ -1,9 +1,20 @@
+# configute unattended upgrades so packages from both Debian and LEAP
+# repos get upgraded unattended
 class site_apt::unattended_upgrades {
   # override unattended-upgrades package resource to make sure
   # that it is upgraded on every deploy (#6245)
 
+  # configure upgrades for Debian
   class { 'apt::unattended_upgrades':
-    config_content => template('site_apt/50unattended-upgrades'),
     ensure_version => latest
   }
+
+  # configure LEAP upgrades
+  apt::apt_conf { '51unattended-upgrades-leap':
+    source      => [
+      "puppet:///modules/site_apt/${::lsbdistid}/51unattended-upgrades-leap"],
+    require     => Package['unattended-upgrades'],
+    refresh_apt => false,
+  }
+
 }
-- 
cgit v1.2.3


From 2211934991158ea66b8d64ac8de4fb8b971f736e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 1 Feb 2016 11:54:33 +0100
Subject: [refactor] Don't declare dependencies for apt resources

The apt module now takes care of all the dependencies removed
from `site_apt`.
Also, the dependency to install the `lsb` package after
`refresh_apt` is unnesseccary because lsb facts won't work
anyway on the first run if `lsb` is not installed before, so
we can safely remove it.
---
 puppet/modules/site_apt/manifests/init.pp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index c809a837..fea4b8e7 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -52,13 +52,10 @@ class site_apt {
     pin      => 'origin "deb.leap.se"'
   }
 
-  # All packages should be installed _after_ refresh_apt is called,
-  # which does an apt-get update.
-  # There is one exception:
-  # The creation of sources.list depends on the lsb package
+# All packages should be installed _after_ refresh_apt is called,
+# which does an apt-get update.
+
+  Exec['refresh_apt'] ->
+  Package <||>
 
-  File['/etc/apt/preferences'] ->
-    Apt::Preferences_snippet <| |> ->
-    Exec['refresh_apt'] ->
-    Package <| ( title != 'lsb' ) |>
 }
-- 
cgit v1.2.3


From 5d4642e94c8a1a460988fe11419556753ce0f1aa Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 1 Feb 2016 13:24:53 +0100
Subject: [refactor] Remove atomic apt package dependecy

`site_config::default.pp` takes care the all packages are
installed before `Exec['refresh_apt']`, so we don't need to
add it here for a single package.
---
 puppet/modules/site_apt/manifests/leap_repo.pp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index a1382374..60948d91 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -13,7 +13,4 @@ class site_apt::leap_repo {
     ensure => latest
   }
 
-  # We wont be able to install the leap-keyring package unless the leap apt
-  # source has been added and apt has been refreshed
-  Exec['refresh_apt'] -> Package['leap-keyring']
 }
-- 
cgit v1.2.3


From 559b2ccaa71e2c5c459d7a6bea39de975f15cb1c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 1 Feb 2016 16:53:10 +0100
Subject: [refactor] Use Exec[apt_updated] instead of Exec[refresh_apt]

Because this is the recommended way of depnending in the apt README.
---
 puppet/modules/site_apt/manifests/dist_upgrade.pp | 2 +-
 puppet/modules/site_apt/manifests/init.pp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index 40e2dd58..0eb98cea 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -11,7 +11,7 @@ class site_apt::dist_upgrade {
       command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold'  dist-upgrade",
       refreshonly => false,
       timeout     => 1200,
-      require     => Exec['refresh_apt']
+      require     => Exec['apt_updated']
     }
   }
 }
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index fea4b8e7..04b1ce69 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -55,7 +55,7 @@ class site_apt {
 # All packages should be installed _after_ refresh_apt is called,
 # which does an apt-get update.
 
-  Exec['refresh_apt'] ->
+  Exec['apt_updated'] ->
   Package <||>
 
 }
-- 
cgit v1.2.3


From 5471630d583d21bc21ec1e6a1e17056c2bdecb23 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 1 Feb 2016 17:35:16 +0100
Subject: [refactor] Dont duplicate Package resource override

`site_apt` aready ensures for installing packages after Exec[update_apt]
is run, so we don't need to duplicate this in `site_config::default.pp`.
---
 puppet/modules/site_apt/manifests/init.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 04b1ce69..447e1781 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -52,10 +52,8 @@ class site_apt {
     pin      => 'origin "deb.leap.se"'
   }
 
-# All packages should be installed _after_ refresh_apt is called,
-# which does an apt-get update.
-
-  Exec['apt_updated'] ->
-  Package <||>
+  # All packages should be installed after 'update_apt' is called,
+  # which does an 'apt-get update'.
+  Exec['update_apt'] -> Package <||>
 
 }
-- 
cgit v1.2.3


From ff818d6be896201adf0b1c9ded9316949dc954d2 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 16 Feb 2016 16:43:54 -0800
Subject: remove pinning of openvpn package to backports

---
 puppet/modules/site_apt/manifests/init.pp                | 7 ++++---
 puppet/modules/site_apt/manifests/preferences/openvpn.pp | 9 ---------
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 puppet/modules/site_apt/manifests/preferences/openvpn.pp

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 447e1781..d6fe0e72 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -37,9 +37,10 @@ class site_apt {
 
   include ::site_apt::unattended_upgrades
 
-  apt::sources_list { 'secondary.list.disabled':
-    content => template('site_apt/secondary.list');
-  }
+  # not currently used
+  #apt::sources_list { 'secondary.list':
+  #  content => template('site_apt/secondary.list');
+  #}
 
   apt::preferences_snippet { 'facter':
     release  => "${::lsbdistcodename}-backports",
diff --git a/puppet/modules/site_apt/manifests/preferences/openvpn.pp b/puppet/modules/site_apt/manifests/preferences/openvpn.pp
deleted file mode 100644
index c7ddae25..00000000
--- a/puppet/modules/site_apt/manifests/preferences/openvpn.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_apt::preferences::openvpn {
-
-  apt::preferences_snippet { 'openvpn':
-    package  => 'openvpn',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999;
-  }
-
-}
-- 
cgit v1.2.3


From 274b1805f13355cdbb0c2b98fb5ef9ce8d3a97f6 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 8 Mar 2016 10:23:27 -0500
Subject: change name of leap-keyring package to leap-archive-keyring (#7950)

Change-Id: I5f04e31e49642597c69895b5aca3ff5326dfd6ec
---
 puppet/modules/site_apt/manifests/leap_repo.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 60948d91..5eedce45 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -9,7 +9,7 @@ class site_apt::leap_repo {
     before  => Exec[refresh_apt]
   }
 
-  package { 'leap-keyring':
+  package { 'leap-archive-keyring':
     ensure => latest
   }
 
-- 
cgit v1.2.3


From 65335becbf8602b65ed385090400088f56293d9b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 10 Mar 2016 21:12:11 +0100
Subject: [jessie] Remove obsolete backports pinning

---
 puppet/modules/site_apt/manifests/init.pp                  |  5 -----
 puppet/modules/site_apt/manifests/preferences/obfsproxy.pp |  9 ---------
 puppet/modules/site_apt/manifests/preferences/twisted.pp   |  9 ---------
 puppet/modules/site_apt/manifests/preferences/unbound.pp   | 10 ----------
 4 files changed, 33 deletions(-)
 delete mode 100644 puppet/modules/site_apt/manifests/preferences/obfsproxy.pp
 delete mode 100644 puppet/modules/site_apt/manifests/preferences/twisted.pp
 delete mode 100644 puppet/modules/site_apt/manifests/preferences/unbound.pp

(limited to 'puppet/modules/site_apt/manifests')

diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index d6fe0e72..455425c1 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -42,11 +42,6 @@ class site_apt {
   #  content => template('site_apt/secondary.list');
   #}
 
-  apt::preferences_snippet { 'facter':
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999
-  }
-
   apt::preferences_snippet { 'leap':
     priority => 999,
     package  => '*',
diff --git a/puppet/modules/site_apt/manifests/preferences/obfsproxy.pp b/puppet/modules/site_apt/manifests/preferences/obfsproxy.pp
deleted file mode 100644
index 75b01956..00000000
--- a/puppet/modules/site_apt/manifests/preferences/obfsproxy.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_apt::preferences::obfsproxy {
-
-  apt::preferences_snippet { 'obfsproxy':
-    package  => 'obfsproxy',
-    release  => 'wheezy-backports',
-    priority => 999;
-  }
-
-}
diff --git a/puppet/modules/site_apt/manifests/preferences/twisted.pp b/puppet/modules/site_apt/manifests/preferences/twisted.pp
deleted file mode 100644
index abff6838..00000000
--- a/puppet/modules/site_apt/manifests/preferences/twisted.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_apt::preferences::twisted {
-
-  apt::preferences_snippet { 'python-twisted':
-    package  => 'python-twisted*',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999;
-  }
-
-}
diff --git a/puppet/modules/site_apt/manifests/preferences/unbound.pp b/puppet/modules/site_apt/manifests/preferences/unbound.pp
deleted file mode 100644
index 6da964f9..00000000
--- a/puppet/modules/site_apt/manifests/preferences/unbound.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class site_apt::preferences::unbound {
-
-  apt::preferences_snippet { 'unbound':
-    package  => 'libunbound* unbound*',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999,
-    before   => Class['unbound::package'];
-  }
-
-}
-- 
cgit v1.2.3