Merge pull request #1 from Galitskiy/fix_issues_with_config_and_owner…

…ship fix issues 111 and 150
tubemogul · Apr 13, 2017 · d73104b · d73104b
2 parents b31cb6b + c103a06
commit d73104b
Show file tree

Hide file tree

Showing 4 changed files with 574 additions and 10 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -88,8 +88,9 @@
       mode   => $::redis::config_dir_mode;
 
     $::redis::config_file_orig:
-      ensure  => present,
-      content => template($::redis::conf_template);
+      ensure  => file,
+      owner  => $::redis::config_owner,
+      group  => $::redis::config_group;
 
     $::redis::log_dir:
       ensure => directory,
@@ -104,18 +105,23 @@
       owner  => $::redis::service_user;
   }
 
-  exec {
-    "cp -p ${::redis::config_file_orig} ${::redis::config_file}":
-      path        => '/usr/bin:/bin',
-      subscribe   => File[$::redis::config_file_orig],
-      refreshonly => true;
-  } ~> Service <| title == $::redis::service_name |>
+  if (($::redis::redis_version_real) and (versioncmp('2.8.24', $::redis::redis_version_real) < 0)) {
+    File[$::redis::config_file_orig] { content => template($::redis::conf_template) }
+  } else {
+    File[$::redis::config_file_orig] { content => template('redis/redis.conf.2.x.erb') }
+  }
+
+  exec { "cp -p ${::redis::config_file_orig} ${::redis::config_file}":
+    path        => '/usr/bin:/bin',
+    subscribe   => File[$::redis::config_file_orig],
+    refreshonly => true;
+  }
 
   # Adjust /etc/default/redis-server on Debian systems
   case $::osfamily {
     'Debian': {
       file { '/etc/default/redis-server':
-        ensure => present,
+        ensure => file,
         group  => $::redis::config_group,
         mode   => $::redis::config_file_mode,
         owner  => $::redis::config_owner,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -226,6 +226,11 @@
 #
 #   Default: 0
 #
+# [*minimum_version*]
+#   Minimum version which will be installed from repo for current OS
+#
+#   Default: OS dependant
+#
 # [*no_appendfsync_on_rewrite*]
 #   If you have latency problems turn this to 'true'. Otherwise leave it as
 #   'false' that is the safest pick from the point of view of durability.
@@ -566,6 +571,7 @@
   $maxmemory_samples             = $::redis::params::maxmemory_samples,
   $min_slaves_max_lag            = $::redis::params::min_slaves_max_lag,
   $min_slaves_to_write           = $::redis::params::min_slaves_to_write,
+  $minimum_version               = $::redis::params::minimum_version,
   $no_appendfsync_on_rewrite     = $::redis::params::no_appendfsync_on_rewrite,
   $notify_keyspace_events        = $::redis::params::notify_keyspace_events,
   $notify_service                = $::redis::params::notify_service,
@@ -619,6 +625,8 @@
   anchor { 'redis::begin': }
   anchor { 'redis::end': }
 
+  $redis_version_real = pick($::redis_server_version, $minimum_version)
+
   include ::redis::preinstall
   include ::redis::install
   include ::redis::config

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -103,7 +103,6 @@
       $config_file               = '/etc/redis/redis.conf'
       $config_file_mode          = '0644'
       $config_file_orig          = '/etc/redis/redis.conf.puppet'
-      $config_group              = 'root'
       $config_owner              = 'redis'
       $daemonize                 = true
       $log_dir_mode              = '0755'
@@ -130,10 +129,12 @@
 
       case $::operatingsystem {
         'Ubuntu': {
+          $config_group              = 'redis'
           # Latest from PPA is 3.0.7
           $minimum_version           = '3.0.7'
         }
         default: {
+          $config_group              = 'root'
           # Debian standard package is 2.4.14
           # But we have dotdeb repo which is 3.2.5
           $minimum_version           = '3.2.5'