tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

munin: Fixes for variable usage

Browse source
This commit is contained in:
Ossi Salmi 2013-06-16 22:27:10 +03:00
parent ff003d864c
commit e577489411
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
munin/manifests/init.pp
View file

@ -65,9 +65,9 @@ class munin::node {
notify => Exec["munin-node-configure"], notify => Exec["munin-node-configure"],
} }
@@file { "/etc/munin/conf.d/${homename}.conf": @@file { "/etc/munin/conf.d/${::homename}.conf":
ensure => present, ensure => present,
content => "[${homename}]\n address ${homename}\n use_node_name yes\n", content => "[${::homename}]\n address ${::homename}\n use_node_name yes\n",
tag => "munin", tag => "munin",
} }
@ -128,7 +128,7 @@ define munin::snmpnode($snmp_community="public", $snmp_version="2") {
@@file { "/etc/munin/conf.d/${name}.conf": @@file { "/etc/munin/conf.d/${name}.conf":
ensure => present, ensure => present,
content => "[${name}]\n address ${ipaddress}\n use_node_name no\n", content => "[${name}]\n address ${::homename}\n use_node_name no\n",
tag => "munin", tag => "munin",
} }
@ -178,7 +178,7 @@ define munin::plugin($config = "") {
if ($config) { if ($config) {
file { "/etc/munin/plugin-conf.d/${config}": file { "/etc/munin/plugin-conf.d/${config}":
ensure => present, ensure => present,
source => [ "puppet:///files/munin/plugin-conf/${config}.${fqdn}", source => [ "puppet:///files/munin/plugin-conf/${config}.${::homename}",
"puppet:///files/munin/plugin-conf/${config}", "puppet:///files/munin/plugin-conf/${config}",
"puppet:///modules/munin/plugin-conf/${config}", ], "puppet:///modules/munin/plugin-conf/${config}", ],
owner => "root", owner => "root",
@ -298,7 +298,7 @@ class munin::server {
atboot => true, atboot => true,
device => "none", device => "none",
fstype => "tmpfs", fstype => "tmpfs",
options => "uid=munin,gid=${$apache::sslserver::group},mode=0775", options => "uid=munin,gid=${apache::sslserver::group},mode=0775",
dump => "0", dump => "0",
pass => "0", pass => "0",
require => File["/var/cache/munin"], require => File["/var/cache/munin"],
@ -359,7 +359,7 @@ class munin::server {
include ssl include ssl
file { "${ssl::certs}/munin.crt": file { "${ssl::certs}/munin.crt":
ensure => present, ensure => present,
source => "${puppet_ssldir}/certs/${homename}.pem", source => "${::puppet_ssldir}/certs/${::homename}.pem",
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => "munin", group => "munin",
@ -367,7 +367,7 @@ class munin::server {
} }
file { "${ssl::private}/munin.key": file { "${ssl::private}/munin.key":
ensure => present, ensure => present,
source => "${puppet_ssldir}/private_keys/${homename}.pem", source => "${::puppet_ssldir}/private_keys/${::homename}.pem",
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => "munin", group => "munin",