summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2019-07-20 13:50:45 +0200
committerJan Dittberner <jandd@cacert.org>2019-07-20 13:50:45 +0200
commit16c9ebbb54b4b4a8b9462166e4b0153b8c29ec0a (patch)
treee746fa47a0ecd27b1bac94fa6519334c77792cb1
parent33a345a9c37b8332b218aa422b1772d7eb7f9db5 (diff)
downloadcacert-puppet-16c9ebbb54b4b4a8b9462166e4b0153b8c29ec0a.tar.gz
cacert-puppet-16c9ebbb54b4b4a8b9462166e4b0153b8c29ec0a.tar.xz
cacert-puppet-16c9ebbb54b4b4a8b9462166e4b0153b8c29ec0a.zip
Use Icinga2 from stretch backports on stretch
-rw-r--r--Puppetfile1
-rw-r--r--sitemodules/profiles/manifests/icinga2_master.pp14
2 files changed, 14 insertions, 1 deletions
diff --git a/Puppetfile b/Puppetfile
index e92196f..b11528e 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,3 +1,4 @@
+mod 'puppetlabs/apt'
mod 'puppetlabs/mailalias_core'
mod 'puppetlabs/stdlib'
mod 'saz/sudo'
diff --git a/sitemodules/profiles/manifests/icinga2_master.pp b/sitemodules/profiles/manifests/icinga2_master.pp
index 171285d..273e9f4 100644
--- a/sitemodules/profiles/manifests/icinga2_master.pp
+++ b/sitemodules/profiles/manifests/icinga2_master.pp
@@ -103,9 +103,21 @@ class profiles::icinga2_master (
value => 'true', # lint:ignore:quoted_booleans
seen => true,
}
- package { ['icinga2', 'icinga2-ido-pgsql']:
+ if $facts['os']['distro']['codename'] == 'stretch' {
+ apt::pin { 'icinga2_backports':
+ packages => ['icinga2', 'icinga2-ido-pgsql'],
+ priority => 500,
+ release => 'stretch-backports',
+ }
+ }
+ package { 'icinga2':
+ ensure => installed,
+ require => Apt::Pin['icinga2_backports'],
+ }
+ package { 'icinga2-ido-pgsql':
ensure => installed,
require => [
+ Apt::Pin['icinga2_backports'],
Debconf['icinga2-ido-pgsql/pgsql/app-pass'],
Debconf['icinga2-ido-pgsql/app-password-confirm'],
Debconf['icinga2-ido-pgsql/remote/host'],