From 3ddcb15a79b8951c024c1afa07c6c4612f1c9099 Mon Sep 17 00:00:00 2001 From: Roman Plessl Date: Sun, 7 Jun 2015 22:57:58 +0200 Subject: [PATCH] reorder code parts and add depencies / fixes #2 and #3 of https://github.com/bfraser/puppet-grafana/pull/34 --- manifests/install.pp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index ccaf2e179..704e0adcf 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -47,6 +47,10 @@ 'repo': { case $::osfamily { 'Debian': { + package { 'libfontconfig1': + ensure => present + } + if !defined( Class['apt'] ) { class { 'apt': } } @@ -58,15 +62,18 @@ key_source => 'https://packagecloud.io/gpg.key', include_src => false, } - package { 'libfontconfig1': - ensure => present - } + + package { 'grafana': ensure => present, require => Package['libfontconfig1'] } } 'RedHat': { + package { 'fontconfig': + ensure => present + } + yumrepo { 'grafana': descr => 'grafana repo', baseurl => 'https://packagecloud.io/grafana/stable/el/6/$basearch', @@ -74,9 +81,7 @@ gpgkey => 'https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', enabled => 1, } - package { 'fontconfig': - ensure => present - } + package { 'grafana': ensure => present, require => Package['fontconfig']