reorder code parts and add depencies / fixes bfraser#2 and bfraser#3 of

bfraser#34
rplessl · Jun 7, 2015 · 3ddcb15 · 3ddcb15
1 parent 748962e
commit 3ddcb15
Showing 1 changed file with 11 additions and 6 deletions.
diff --git 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,25 +62,26 @@
             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',
             gpgcheck => 1,
             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']