first stab at this ...

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 369aade3d941d7f40fcdbf05fee431ed87d9a3df..da54711e5eebc3d37ee08aa808adea9cf087ccb6 100644 (file)
--- 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 (file)
index 0000000..2dcf796
--- /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 92853db0d5dcda32c00ee497062c61dd9a3c2ce8..84db478696c8d9fd55163c81ec12a245b4eb1736 100644 (file)
--- 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