From 3531cf3f764965f298d08b9e3733bdff51e02c11 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 28 Feb 2009 19:07:29 +0000 Subject: [PATCH] Some tweaks to make sure there is a facter directory installed. Why is this not in the package? Signed-off-by: Stephen Gran --- files/etc/puppet/puppet.conf | 2 +- modules/debian-org/manifests/init.pp | 17 +++++++++++++++++ puppet.conf | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf index 01e92a1a..1448729e 100644 --- a/files/etc/puppet/puppet.conf +++ b/files/etc/puppet/puppet.conf @@ -3,7 +3,7 @@ logdir=/var/log/puppet vardir=/var/lib/puppet ssldir=/var/lib/puppet/ssl rundir=/var/run/puppet -factpath=$vardir/lib/facter +factpath=$vardir/facter pluginsync=true [puppetmasterd] diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index cfafb9b5..24c90c9b 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -59,9 +59,26 @@ class debian-org { ensure => file, source => "puppet:///files/etc/puppet/puppet.conf", notify => Exec["puppet reload"]; + "/var/lib/puppet/facter": + ensure => directory, + owner => root, + group => root, + mode => 755, + purge => true; } exec { "puppet reload": path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin", refreshonly => true, } } + +class debian-proliant inherits debian-org { + file { + "/etc/apt/sources.list.d/debian.restricted.list": + owner => root, + group => root, + mode => 644, + ensure => file, + source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list"; + } +} diff --git a/puppet.conf b/puppet.conf index 58b22ab9..1448729e 100644 --- a/puppet.conf +++ b/puppet.conf @@ -3,8 +3,8 @@ logdir=/var/log/puppet vardir=/var/lib/puppet ssldir=/var/lib/puppet/ssl rundir=/var/run/puppet -factpath=$vardir/lib/facter -pluginsync=false +factpath=$vardir/facter +pluginsync=true [puppetmasterd] templatedir=/var/lib/puppet/templates -- 2.39.2