summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
Diffstat (limited to 'services')
-rw-r--r--services/common.cf7
-rw-r--r--services/debian.cf2
-rw-r--r--services/freebsd.cf10
-rw-r--r--services/main.cf10
-rw-r--r--services/ubuntu.cf2
5 files changed, 24 insertions, 7 deletions
diff --git a/services/common.cf b/services/common.cf
index 0e866a0..729ba1a 100644
--- a/services/common.cf
+++ b/services/common.cf
@@ -3,7 +3,7 @@ bundle agent common
vars:
any::
"packages" slist => {
- @(distrib.packages),
+ @(flavour.packages),
@(specific.packages),
};
files:
@@ -19,6 +19,11 @@ bundle agent common
policy => "present",
package_module => apt_get,
classes => if_repaired("common_packages_$(wanted)_add_repaired");
+ freebsd::
+ "$(packages)"
+ policy => "present",
+ package_module => pkg,
+ classes => if_repaired("common_packages_$(wanted)_add_repaired");
reports:
any::
"$(this.bundle): /etc/hosts repaired" ifvarclass => "common_hosts_files_repaired";
diff --git a/services/debian.cf b/services/debian.cf
index 8b250d3..30f09c6 100644
--- a/services/debian.cf
+++ b/services/debian.cf
@@ -1,4 +1,4 @@
-bundle common distrib
+bundle common flavour
{
vars:
debian::
diff --git a/services/freebsd.cf b/services/freebsd.cf
new file mode 100644
index 0000000..8327832
--- /dev/null
+++ b/services/freebsd.cf
@@ -0,0 +1,10 @@
+bundle agent flavour
+{
+ vars:
+ freebsd::
+ "packages" slist => {
+ "devel/libstatgrab",
+ "sysutils/muse",
+ "sysutils/ipmitool",
+ };
+}
diff --git a/services/main.cf b/services/main.cf
index 047e4b1..266cd86 100644
--- a/services/main.cf
+++ b/services/main.cf
@@ -4,16 +4,18 @@ bundle common classify
any::
"bundles" slist => {
"common",
- "distrib",
+ "flavour",
};
"inputs" slist => {
"services/common.cf",
- "services/$(distrib).cf",
+ "services/$(flavour).cf",
};
debian::
- "distrib" string => "debian";
+ "flavour" string => "debian";
+ freebsd::
+ "flavour" string => "freebsd";
ubuntu::
- "distrib" string => "ubuntu";
+ "flavour" string => "ubuntu";
classes:
any::
"containers" or => {
diff --git a/services/ubuntu.cf b/services/ubuntu.cf
index 1f69f82..919a5fe 100644
--- a/services/ubuntu.cf
+++ b/services/ubuntu.cf
@@ -1,4 +1,4 @@
-bundle common distrib
+bundle common flavour
{
vars:
ubuntu::