summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-06-09 09:23:37 +0200
committervarac <varacanero@zeromail.org>2015-06-09 09:23:37 +0200
commit0c12ab564590374c09ffe7a8049cab6d8c8b41fc (patch)
treed26674dfb6dd5abfc4e7f84bf2a19ee9fb5a08fc /puppet/modules
parent5c0fe23dccc285adde85e45a5ee41922d2e5a891 (diff)
parent18e247ae29e7ee787e350724e2884da0a74bbd63 (diff)
Merge branch '0.7.0' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp10
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp10
2 files changed, 15 insertions, 5 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index c32c29c4..cf49f870 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,3 +1,4 @@
+# setup apt on all nodes
class site_apt {
$sources = hiera('sources')
@@ -31,12 +32,19 @@ class site_apt {
priority => 999
}
+ apt::preferences_snippet { 'leap':
+ priority => 999,
+ package => '*',
+ 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
File['/etc/apt/preferences'] ->
+ Apt::Preferences_snippet <| |> ->
Exec['refresh_apt'] ->
- Package <| ( title != 'lsb' ) |>
+ Package <| ( title != 'lsb' ) |>
}
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index ae266c36..cb6c8d95 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -1,3 +1,4 @@
+# configures nagios on monitoring node
class site_nagios::server inherits nagios::base {
# First, purge old nagios config (see #1467)
@@ -42,10 +43,11 @@ class site_nagios::server inherits nagios::base {
# deploy serverside plugins
file { '/usr/lib/nagios/plugins/check_openvpn_server.pl':
- source => 'puppet:///modules/nagios/plugins/check_openvpn_server.pl',
- mode => '0755',
- owner => 'nagios',
- group => 'nagios',
+ source => 'puppet:///modules/nagios/plugins/check_openvpn_server.pl',
+ mode => '0755',
+ owner => 'nagios',
+ group => 'nagios',
+ require => Package['nagios-plugins'];
}
create_resources ( site_nagios::add_host_services, $nagios_hosts )