summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2017-09-21 15:50:36 +0200
committerJulien Dessaux2017-10-10 14:57:55 +0200
commit6f9e848e65cff04395b0dad1c36620ba6afe39f8 (patch)
tree0835025f1949b081b1f3e565008ef5e4316c745a
parentAdded nrpe policy (diff)
downloadmasterfiles-6f9e848e65cff04395b0dad1c36620ba6afe39f8.tar.gz
masterfiles-6f9e848e65cff04395b0dad1c36620ba6afe39f8.tar.bz2
masterfiles-6f9e848e65cff04395b0dad1c36620ba6afe39f8.zip
Fix classify classes that are no longer globals
-rw-r--r--promises.cf1
-rw-r--r--services/main.cf9
2 files changed, 7 insertions, 3 deletions
diff --git a/promises.cf b/promises.cf
index 3721c62..5712848 100644
--- a/promises.cf
+++ b/promises.cf
@@ -8,6 +8,7 @@ body common control
@(core_policies.bundles),
classify,
@(classify.bundles),
+ main,
};
inputs => {
@(cfengine_controls.inputs),
diff --git a/services/main.cf b/services/main.cf
index 48697a7..4acafbc 100644
--- a/services/main.cf
+++ b/services/main.cf
@@ -8,7 +8,7 @@ body file control
};
}
-bundle agent classify
+bundle common classify
{
vars:
any::
@@ -18,6 +18,7 @@ bundle agent classify
"julien",
"bareos_fd",
"check_mk",
+ "nrpe",
"sshd",
};
classes:
@@ -38,11 +39,13 @@ bundle agent classify
};
"mail_servers" or => { "legend" };
"nrpe" expression => "freebsd";
+}
+
+bundle agent main
+{
methods:
ipam::
"ipam" usebundle => ipam;
nagios::
"nagios" usebundle => nagios;
- nrpe::
- "nrpe" usebundle => nrpe;
}