summaryrefslogtreecommitdiff
path: root/sitemodules/roles
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2019-07-29 16:35:09 +0200
committerJan Dittberner <jandd@cacert.org>2019-07-29 16:35:09 +0200
commit255b0f9e3828e50de32d542982284d0ffcb47137 (patch)
tree6dc242e7355b0698e81355ed2bfc72ee3063ee15 /sitemodules/roles
parent9638d55b23260adb9ff532b4535bdbe12c66cbd7 (diff)
downloadcacert-puppet-255b0f9e3828e50de32d542982284d0ffcb47137.tar.gz
cacert-puppet-255b0f9e3828e50de32d542982284d0ffcb47137.tar.xz
cacert-puppet-255b0f9e3828e50de32d542982284d0ffcb47137.zip
Purge nrpe_agent from icinga2 agent nodes
Diffstat (limited to 'sitemodules/roles')
-rw-r--r--sitemodules/roles/manifests/bugs.pp2
-rw-r--r--sitemodules/roles/manifests/emailout.pp2
-rw-r--r--sitemodules/roles/manifests/ircserver.pp2
-rw-r--r--sitemodules/roles/manifests/issue.pp2
-rw-r--r--sitemodules/roles/manifests/jenkins.pp2
-rw-r--r--sitemodules/roles/manifests/monitor.pp2
-rw-r--r--sitemodules/roles/manifests/motion.pp4
-rw-r--r--sitemodules/roles/manifests/proxyin.pp2
-rw-r--r--sitemodules/roles/manifests/proxyout.pp2
-rw-r--r--sitemodules/roles/manifests/puppetmaster.pp2
-rw-r--r--sitemodules/roles/manifests/svnserver.pp2
-rw-r--r--sitemodules/roles/manifests/translations.pp2
-rw-r--r--sitemodules/roles/manifests/web.pp2
-rw-r--r--sitemodules/roles/manifests/webstatic.pp2
14 files changed, 15 insertions, 15 deletions
diff --git a/sitemodules/roles/manifests/bugs.pp b/sitemodules/roles/manifests/bugs.pp
index 99a0439..07c8a6a 100644
--- a/sitemodules/roles/manifests/bugs.pp
+++ b/sitemodules/roles/manifests/bugs.pp
@@ -23,6 +23,6 @@
class roles::bugs {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/emailout.pp b/sitemodules/roles/manifests/emailout.pp
index a61a0b5..d6bd462 100644
--- a/sitemodules/roles/manifests/emailout.pp
+++ b/sitemodules/roles/manifests/emailout.pp
@@ -23,6 +23,6 @@
class roles::emailout {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/ircserver.pp b/sitemodules/roles/manifests/ircserver.pp
index 08ab594..f1ba1a9 100644
--- a/sitemodules/roles/manifests/ircserver.pp
+++ b/sitemodules/roles/manifests/ircserver.pp
@@ -22,6 +22,6 @@
class roles::ircserver {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/issue.pp b/sitemodules/roles/manifests/issue.pp
index 6b2561f..eb3b86b 100644
--- a/sitemodules/roles/manifests/issue.pp
+++ b/sitemodules/roles/manifests/issue.pp
@@ -23,6 +23,6 @@
class roles::issue {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/jenkins.pp b/sitemodules/roles/manifests/jenkins.pp
index 18d1404..0af7fe0 100644
--- a/sitemodules/roles/manifests/jenkins.pp
+++ b/sitemodules/roles/manifests/jenkins.pp
@@ -23,6 +23,6 @@
class roles::jenkins {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/monitor.pp b/sitemodules/roles/manifests/monitor.pp
index 5736e88..32f8c96 100644
--- a/sitemodules/roles/manifests/monitor.pp
+++ b/sitemodules/roles/manifests/monitor.pp
@@ -23,6 +23,6 @@
class roles::monitor {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_master
}
diff --git a/sitemodules/roles/manifests/motion.pp b/sitemodules/roles/manifests/motion.pp
index 8001cfe..3a87255 100644
--- a/sitemodules/roles/manifests/motion.pp
+++ b/sitemodules/roles/manifests/motion.pp
@@ -17,12 +17,12 @@
# Copyright
# ---------
#
-# Copyright 2017-2018 Jan Dittberner
+# Copyright 2017-2019 Jan Dittberner
#
class roles::motion {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
include profiles::cacert_boardvoting
}
diff --git a/sitemodules/roles/manifests/proxyin.pp b/sitemodules/roles/manifests/proxyin.pp
index 7bed9fd..3e77a4f 100644
--- a/sitemodules/roles/manifests/proxyin.pp
+++ b/sitemodules/roles/manifests/proxyin.pp
@@ -24,6 +24,6 @@ class roles::proxyin {
include profiles::base
include profiles::rsyslog
include profiles::sniproxy
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/proxyout.pp b/sitemodules/roles/manifests/proxyout.pp
index cf8f3a7..4faeb43 100644
--- a/sitemodules/roles/manifests/proxyout.pp
+++ b/sitemodules/roles/manifests/proxyout.pp
@@ -24,6 +24,6 @@ class roles::proxyout {
include profiles::base
include profiles::squid
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/puppetmaster.pp b/sitemodules/roles/manifests/puppetmaster.pp
index 74f5986..d75caa9 100644
--- a/sitemodules/roles/manifests/puppetmaster.pp
+++ b/sitemodules/roles/manifests/puppetmaster.pp
@@ -23,7 +23,7 @@
class roles::puppetmaster {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
include profiles::puppet_server
}
diff --git a/sitemodules/roles/manifests/svnserver.pp b/sitemodules/roles/manifests/svnserver.pp
index a34d7d6..2115c4c 100644
--- a/sitemodules/roles/manifests/svnserver.pp
+++ b/sitemodules/roles/manifests/svnserver.pp
@@ -23,6 +23,6 @@
class roles::svnserver {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/translations.pp b/sitemodules/roles/manifests/translations.pp
index add209e..006dd6f 100644
--- a/sitemodules/roles/manifests/translations.pp
+++ b/sitemodules/roles/manifests/translations.pp
@@ -23,7 +23,7 @@
class roles::translations {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
include profiles::pootle
}
diff --git a/sitemodules/roles/manifests/web.pp b/sitemodules/roles/manifests/web.pp
index f2697a6..99b019c 100644
--- a/sitemodules/roles/manifests/web.pp
+++ b/sitemodules/roles/manifests/web.pp
@@ -23,6 +23,6 @@
class roles::web {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}
diff --git a/sitemodules/roles/manifests/webstatic.pp b/sitemodules/roles/manifests/webstatic.pp
index 40cc7bf..e4a8d8b 100644
--- a/sitemodules/roles/manifests/webstatic.pp
+++ b/sitemodules/roles/manifests/webstatic.pp
@@ -23,6 +23,6 @@
class roles::webstatic {
include profiles::base
include profiles::rsyslog
- include profiles::nrpe_agent
+ include profiles::purge_nrpe_agent
include profiles::icinga2_agent
}