From 673a99876359620b4cd55ce8b5fa8831aec8fd88 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 15 Apr 2012 20:41:18 +0100 Subject: [PATCH] first stab at this ... Signed-off-by: Stephen Gran --- modules/debian-org/manifests/init.pp | 13 +++++++++++++ modules/debian-org/templates/debian_facts.yaml.erb | 2 ++ modules/samhain/templates/samhainrc.erb | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 modules/debian-org/templates/debian_facts.yaml.erb diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 369aade3d..da54711e5 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -86,6 +86,19 @@ class debian-org { key => 'puppet:///modules/debian-org/db.debian.org.asc', } + file { '/etc/facter': + ensure => directory, + purge => true, + force => true, + recurse => true, + source => 'puppet:///files/empty/', + } + file { '/etc/facter/facts.d': + ensure => directory, + } + file { '/etc/facter/facts.d/debian_facts.yaml': + content => template('debian-org/debian_facts.yaml.erb') + } file { '/etc/apt/preferences': source => 'puppet:///modules/debian-org/apt.preferences', } diff --git a/modules/debian-org/templates/debian_facts.yaml.erb b/modules/debian-org/templates/debian_facts.yaml.erb new file mode 100644 index 000000000..2dcf7961f --- /dev/null +++ b/modules/debian-org/templates/debian_facts.yaml.erb @@ -0,0 +1,2 @@ +--- +hoster: <%= scope.lookupvar('site::nodeinfo')['hoster']['name'] %> diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 92853db0d..84db47869 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -122,6 +122,8 @@ file=/etc/munin file=/etc/munin/plugins file=/etc/munin/plugin-conf.d file=/etc/exim4 +file=/etc/facter +file=/etc/facter/facts.d file=/etc/exim4/ssl file=/etc/apt file=/etc/apt/apt.conf.d -- 2.20.1