diff --git a/data/Debian/Ubuntu/common.yaml b/data/Debian/Ubuntu/common.yaml index 80257b4..a458182 100644 --- a/data/Debian/Ubuntu/common.yaml +++ b/data/Debian/Ubuntu/common.yaml @@ -6,3 +6,7 @@ icinga::repos: location: http://packages.icinga.com/ubuntu 'icinga-snapshot-builds': location: http://packages.icinga.com/ubuntu + 'netways-plugins-release': + location: http://packages.netways.de/plugins/ubuntu + 'netways-extras-release': + location: http://packages.netways.de/extras/ubuntu diff --git a/data/Debian/common.yaml b/data/Debian/common.yaml index 6948de9..1d80cb1 100644 --- a/data/Debian/common.yaml +++ b/data/Debian/common.yaml @@ -21,3 +21,17 @@ icinga::repos: key: id: F51A91A5EE001AA5D77D53C4C6E319C334410682 source: http://packages.icinga.com/icinga.key + 'netways-plugins-release': + location: http://packages.netways.de/plugins/debian + release: '%{facts.os.distro.codename}' + repos: main + key: + id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E + source: https://packages.netways.de/netways-repo.asc + 'netways-extras-release': + location: http://packages.netways.de/extras/debian + release: '%{facts.os.distro.codename}' + repos: main + key: + id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E + source: https://packages.netways.de/netways-repo.asc diff --git a/data/Linux-kernel.yaml b/data/Linux-kernel.yaml index b3137ff..b858b13 100644 --- a/data/Linux-kernel.yaml +++ b/data/Linux-kernel.yaml @@ -4,7 +4,8 @@ icinga::repos::manage_testing: false icinga::repos::manage_nightly: false icinga::repos::configure_backports: false icinga::repos::manage_epel: false -icinga::repos::manage_scl: false +icinga::repos::manage_plugins: false +icinga::repos::manage_extras: false icinga::redis::globals::package_name: icinga-redis icinga::redis::globals::redis_bin: /usr/bin/icinga-redis-server diff --git a/data/RedHat/common.yaml b/data/RedHat/common.yaml index 48b81ca..be40272 100644 --- a/data/RedHat/common.yaml +++ b/data/RedHat/common.yaml @@ -20,3 +20,15 @@ icinga::repos: gpgcheck: 1 gpgkey: https://packages.icinga.com/icinga.key metadata_expire: 1d + netways-plugins-release: + descr: NETWAYS plugins provide some monitoring plugins - Enterprise Linux + baseurl: 'https://packages.netways.de/plugins/epel/$releasever' + enabled: 0 + gpgcheck: 1 + gpgkey: https://packages.netways.de/netways-repo.asc + netways-extras-release: + descr: NETWAYS extras provide monitoring extras - Enterprise Linux + baseurl: 'https://packages.netways.de/extras/epel/$releasever' + enabled: 0 + gpgcheck: 1 + gpgkey: https://packages.netways.de/netways-repo.asc diff --git a/manifests/repos.pp b/manifests/repos.pp index 60ab173..753b891 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -21,6 +21,12 @@ # Manage the EPEL (Extra Packages Enterprise Linux) repository that is needed for some package # like newer Boost libraries. Has only an effect on plattforms simular to RedHat Enterprise. # +# @param [Boolean] manage_plugins +# Manage the NETWAYS plugins repository that provides some packages for additional plugins. +# +# @param [Boolean] manage_extras +# Manage the NETWAYS extras repository that provides some packages for extras. +# # @example # require icinga::repos # @@ -30,14 +36,18 @@ Boolean $manage_nightly, Boolean $configure_backports, Boolean $manage_epel, + Boolean $manage_plugins, + Boolean $manage_extras, ) { $list = lookup('icinga::repos', Hash, 'deep', {}) $enabled = { - icinga-stable-release => $manage_stable, - icinga-testing-builds => $manage_testing, - icinga-snapshot-builds => $manage_nightly, - epel => $manage_epel, + icinga-stable-release => $manage_stable, + icinga-testing-builds => $manage_testing, + icinga-snapshot-builds => $manage_nightly, + epel => $manage_epel, + netways-plugins-release => $manage_plugins, + netways-extras-release => $manage_extras, } case $::facts['os']['family'] {