fix #75 redis-check-dump was renamed to redis-check-rdb in redis version

3.2
echocat · May 18, 2016 · 734defe · 734defe
1 parent d01c1f4
commit 734defe
Showing 1 changed file with 39 additions and 32 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -31,19 +31,20 @@
   $download_tool     = $::redis::params::download_tool,
   $redis_user        = $::redis::params::redis_user,
   $redis_group       = $::redis::params::redis_group,
-  $download_base     = $::redis::params::download_base,
-) inherits redis {
-  if ( $redis_package == true ) {
+  $download_base     = $::redis::params::download_base,) inherits redis {
+  if ($redis_package == true) {
     case $::operatingsystem {
-      'Debian', 'Ubuntu': {
-        package { 'redis-server' : ensure => $redis_version, }
-        service { 'redis-server' :
+      'Debian', 'Ubuntu' : {
+        package { 'redis-server': ensure => $redis_version, }
+
+        service { 'redis-server':
           ensure    => stopped,
           subscribe => Package['redis-server']
         }
       }
-      'Fedora', 'RedHat', 'CentOS', 'OEL', 'OracleLinux', 'Amazon', 'Scientific', 'SLES': {
-        package { 'redis' : ensure => $redis_version, }
+      'Fedora', 'RedHat', 'CentOS', 'OEL', 'OracleLinux', 'Amazon', 'Scientific', 'SLES' : {
+        package { 'redis': ensure => $redis_version, }
+
         # The SLES DatabaseServer repository installs a conflicting logrotation configuration
         if $::operatingsystem == 'SLES' {
           file { '/etc/logrotate.d/redis':
@@ -52,30 +53,29 @@
           }
         }
       }
-      'Gentoo': {
-        package { 'dev-db/redis' : ensure => $redis_version, }
+      'Gentoo'           : {
+        package { 'dev-db/redis': ensure => $redis_version, }
       }
-      default: {
+      default            : {
         fail('The module does not support this OS.')
       }
     }
   } else {
-
     # install necessary packages for build.
     case $::operatingsystem {
-      'Debian', 'Ubuntu': {
+      'Debian', 'Ubuntu' : {
         ensure_packages('build-essential')
         Package['build-essential'] -> Anchor['redis::prepare_build']
       }
-      'Fedora', 'RedHat', 'CentOS', 'OEL', 'OracleLinux', 'Amazon', 'Scientific', 'Sles': {
+      'Fedora', 'RedHat', 'CentOS', 'OEL', 'OracleLinux', 'Amazon', 'Scientific', 'Sles' : {
         ensure_packages('make')
         Package['make'] -> Anchor['redis::prepare_build']
         ensure_packages('gcc')
         Package['gcc'] -> Anchor['redis::prepare_build']
         ensure_packages('glibc-devel')
         Package['glibc-devel'] -> Anchor['redis::prepare_build']
       }
-      default: {
+      default            : {
         fail('The module does not support this OS.')
       }
     }
@@ -90,9 +90,7 @@
       before  => File[$redis_build_dir]
     }
 
-    file { $redis_build_dir:
-      ensure => directory,
-    }
+    file { $redis_build_dir: ensure => directory, }
 
     $redis_download_url = "${download_base}/redis-${redis_version}.tar.gz"
 
@@ -107,9 +105,7 @@
       group   => 'root',
     }
 
-    anchor { 'redis::prepare_build':
-      before => Exec['redis::compile'],
-    }
+    anchor { 'redis::prepare_build': before => Exec['redis::compile'], }
 
     # if this fails, then a 'make distclean' can help
     exec { 'redis::compile':
@@ -127,18 +123,29 @@
       require => Exec['redis::compile']
     }
 
-    anchor { 'redis::install':
-      require => File["${redis_build_dir}/redis"],
-    }
+    anchor { 'redis::install': require => File["${redis_build_dir}/redis"], }
 
-    $redis_binaries = [
-      'redis-benchmark',
-      'redis-check-aof',
-      'redis-check-dump',
-      'redis-cli',
-      'redis-sentinel',
-      'redis-server'
-    ]
+    # issue #75 redis-check-dump was renamed to redis-check.rdb since 3.2
+    case $redis_version {
+      /^2\./, /^3\.0/, /^3\.1/ : {
+        $redis_binaries = [
+          'redis-benchmark',
+          'redis-check-aof',
+          'redis-check-dump',
+          'redis-cli',
+          'redis-sentinel',
+          'redis-server']
+      }
+      default             : {
+        $redis_binaries = [
+          'redis-benchmark',
+          'redis-check-aof',
+          'redis-check-rdb',
+          'redis-cli',
+          'redis-sentinel',
+          'redis-server']
+      }
+    }
 
     redis::installbinary { $redis_binaries:
       require           => Anchor['redis::install'],