diff options
| author | Jesse Luehrs <doy@tozt.net> | 2018-12-28 04:37:00 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2018-12-28 04:37:00 -0500 |
| commit | 7b155e9b756db75b4940078c4b4a87d3cd82bef0 (patch) | |
| tree | 201a3b78216e51a6dc2641b595b49db11a79e5ad /modules | |
| parent | 9d47ae264dd27de7415b203043ca4c3042689d65 (diff) | |
| download | puppet-tozt-7b155e9b756db75b4940078c4b4a87d3cd82bef0.tar.gz puppet-tozt-7b155e9b756db75b4940078c4b4a87d3cd82bef0.zip | |
more munin fixes
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/munin/manifests/init.pp | 6 | ||||
| -rw-r--r-- | modules/munin/manifests/node.pp | 9 | ||||
| -rw-r--r-- | modules/tozt/files/nginx/munin-tls.conf | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp index 26672d3..7f6951c 100644 --- a/modules/munin/manifests/init.pp +++ b/modules/munin/manifests/init.pp @@ -15,4 +15,10 @@ class munin { source => 'puppet:///modules/munin/master.conf', require => Package['munin']; } + + exec { 'install munin crontab': + command => '/usr/bin/crontab /etc/munin/munin-cron-entry -u munin', + creates => '/var/spool/cron/munin', + require => Package['munin']; + } } diff --git a/modules/munin/manifests/node.pp b/modules/munin/manifests/node.pp index eca2080..a428cd1 100644 --- a/modules/munin/manifests/node.pp +++ b/modules/munin/manifests/node.pp @@ -5,6 +5,15 @@ class munin::node { before => Class['munin::conf']; } + service { 'munin-node': + ensure => running, + enable => true, + require => [ + Package['munin-node'], + File['/etc/munin/munin-conf.d/node'], + ]; + } + file { '/etc/munin/munin-conf.d/node': content => template('munin/node.conf'), require => Package['munin-node']; diff --git a/modules/tozt/files/nginx/munin-tls.conf b/modules/tozt/files/nginx/munin-tls.conf index d73a602..d5030e0 100644 --- a/modules/tozt/files/nginx/munin-tls.conf +++ b/modules/tozt/files/nginx/munin-tls.conf @@ -9,7 +9,6 @@ server { location / { root /srv/http/munin; - try_files /site$uri /site$uri/index.html /public_html$uri =404; } } # vim:ft=nginx |