back merge for 1.8.0

* Added the possibility to exclude logrotate
* RH/CentOS 7 systemd support
* Update config without manual actions with force_rewrite
* Add binding ip option to sentinel
* Set correct resources dependencies prevent exec of being run each time
* add Gentoo support
* fix source entry for forge api
* add download_base to specify download url of source tar.gz
* prepare release 1.8.0

Author: dwerder

.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

.travis.yml

@@ -1,24 +1,22 @@
 ---
 sudo: false
 language: ruby
+cache: bundler
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+before_install: rm Gemfile.lock || true
+script: bundle exec rake validate lint spec 
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.6.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION='~> 4.0' COVERAGE=yes STRICT_VARIABLES=yes
+    - rvm: 2.1.6
+      env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#stable
+    - rvm: 2.1.5
+      env: PUPPET_GEM_VERSION='~> 3.0' FUTURE_PARSER=yes
+    - rvm: 2.1.5
+      env: PUPPET_GEM_VERSION='~> 3.0'
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION='~> 3.0'
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2016-04-05 - 1.8.0 (Feature/Bugfix release)
+
+#### Features:
+
+- (e37283e) Add the possibility to exclude logrotate
+- (316f492) RedHat 7: add systemd support
+- (316f492) Sentinel: add parameter `sentinel_ip` for binding address
+- (3fdbca0) Server::install: add parameter `download_base` at install class to specify download url of source tar.gz
+- (e47fc28) Gentoo: add support for Gentoo
+
+#### Bugfixes:
+
+- (6dea873) fix source entry for forge api in metadata.json
+
 ## 2015-12-02 - 1.7.0 (Feature/Bugfix release)
 
 #### Features:

Gemfile

@@ -1,9 +1,23 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? "#{ENV['PUPPET_GEM_VERSION']}" : ['>= 3.3']
-facterversion = ENV.key?('FACTER_GEM_VERSION') ? "#{ENV['FACTER_GEM_VERSION']}" : ['>= 1.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-lint', '>= 0.3.2'
-gem 'facter', facterversion
-gem 'rspec', '< 3.2.0'
+def location_for(place, version = nil)
+  if place =~ /^((?:git|https?)[:@][^#]*)#(.*)/
+    [version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, version, { :require => false }].compact
+  end
+end
+
+gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'] || '~> 4')
+gem 'facter', '>= 2.0'
+gem 'puppetlabs_spec_helper', '>= 0.1.0', :require => false
+gem 'puppet-lint', '>= 0.3.2',            :require => false
+gem 'rspec-puppet', '>= 2.3.2',           :require => false
+gem 'metadata-json-lint',                 :require => false
+gem 'rake', '< 11.0.0' # rubi <1.9 versus rake 11.0.0 workaround
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end

README.md

@@ -22,8 +22,9 @@ This module installs and makes basic configs for multiple redis instances on
 the same node. It installs redis via REPO or from source. (http://redis.io/)
 It also can configure the monitoring server Sentinel.
 
-Github Master: [![Build Status](https://secure.travis-ci.org/echocat/puppet-redis.png?branch=master)](https://travis-ci.org/echocat/puppet-redis)
-
+[![Puppet Forge](http://img.shields.io/puppetforge/v/dwerder/redis.svg)](https://forge.puppetlabs.com/dwerder/redis)
+[![Build Status](https://secure.travis-ci.org/echocat/puppet-redis.png?branch=master)](https://travis-ci.org/echocat/puppet-redis)
+[![Puppet Forge Downloads](http://img.shields.io/puppetforge/dt/dwerder/redis.svg)](https://forge.puppetlabs.com/dwerder/redis)
 
 ##Setup
 
@@ -232,6 +233,11 @@ the redis install package. Therefor, these values must be adjusted too.
 Redis system group. Default: undef (string)
 Default 'undef' results to 'root' as redis system group
 
+#####`download_base`
+
+Url where to find the source tar.gz. 
+Default value is 'http://download.redis.io/releases'
+
 ####Defined Type: `redis::server`
 
 Used to configure redis instances. You can setup multiple redis servers on the
@@ -366,6 +372,10 @@ Since redis automatically rewrite their config since
 version 2.8 setting this to `true` will trigger a redis restart on each puppet
 run with redis 2.8 or later.
 
+#####`manage_logrotate`
+
+Configure logrotate rules for redis server. Default: true
+
 ##### High Availability Options
 
 #####`slaveof`
@@ -406,9 +416,13 @@ Name of Redis instance. Default: call name of the function.
 The name is used to create the init script(s), which follows the pattern
 `redis-sentinel_${sentinel_name}`
 
+#####`sentinel_ip`
+
+Listen IP of sentinel. Default: 6379
+
 #####`sentinel_port`
 
-Listen port of Redis. Default: 6379
+Listen port of sentinel. Default: 6379
 
 #####`sentinel_log_dir`
 
@@ -420,6 +434,11 @@ Path for log. Full log path is `sentinel_log_dir`/sentinel_`sentinel_name`.log.
 Default is '/var/run' (string).
 Path for pid file. Full pid file path is `sentinel_pid_dir`/sentinel_`sentinel_name`.pid.
 
+#####`sentinel_run_dir`
+
+Default: `/var/run/redis` (string)
+Since sentinels automatically rewrite their config since version 2.8 the puppet managed config will be copied
+to this directory and than sentinel will start with this copy.
 
 #####`monitors`
 
@@ -459,6 +478,10 @@ sentinel restart. Since sentinels automatically rewrite their config since
 version 2.8 setting this to `true` will trigger a sentinel restart on each puppet
 run with redis 2.8 or later.
 
+#####`manage_logrotate`
+
+Configure logrotate rules for redis server. Default: true
+
 ##Requirements
 
 ###Modules needed:

manifests/install.pp

@@ -20,6 +20,9 @@
 # [*redis_group*]
 #   The redis system group. Default value is 'undef', which results to 'root' as system group.
 #
+# [*download_base*]
+#   Url where to find the source tar.gz. Default value is 'http://download.redis.io/releases'
+#
 class redis::install (
   $redis_version     = $::redis::params::redis_version,
   $redis_build_dir   = $::redis::params::redis_build_dir,
@@ -28,6 +31,7 @@
   $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 ) {
     case $::operatingsystem {
@@ -48,6 +52,9 @@
           }
         }
       }
+      'Gentoo': {
+        package { 'dev-db/redis' : ensure => $redis_version, }
+      }
       default: {
         fail('The module does not support this OS.')
       }
@@ -76,7 +83,7 @@
     exec { "Make dir ${redis_build_dir}":
       command => "mkdir -p ${redis_build_dir}",
       creates => $redis_build_dir,
-      path    => $::path,
+      path    => ['/usr/bin', '/usr/sbin', '/bin', '/sbin'],
       cwd     => '/',
       user    => 'root',
       group   => 'root',
@@ -87,18 +94,14 @@
       ensure => directory,
     }
 
-    if $redis_version == $::redis::params::redis_version {
-      $redis_download_url = 'http://download.redis.io/redis-stable.tar.gz'
-    } else {
-      $redis_download_url = "http://download.redis.io/releases/redis-${redis_version}.tar.gz"
-    }
+    $redis_download_url = "${download_base}/redis-${redis_version}.tar.gz"
 
     exec { "Download and untar redis ${redis_version}":
       require => File[$redis_build_dir],
       before  => Anchor['redis::prepare_build'],
       command => "${download_tool} ${redis_download_url} | tar xz",
       creates => "${redis_build_dir}/redis-${::redis::install::redis_version}",
-      path    => $::path,
+      path    => ['/usr/bin', '/usr/sbin', '/bin', '/sbin'],
       cwd     => $redis_build_dir,
       user    => 'root',
       group   => 'root',
@@ -113,7 +116,7 @@
       command => 'make',
       creates => "${redis_build_dir}/redis-${redis_version}/src/redis-server",
       cwd     => "${redis_build_dir}/redis-${::redis::install::redis_version}/",
-      path    => $::path,
+      path    => ['/usr/bin', '/usr/sbin', '/bin', '/sbin'],
       user    => 'root',
       group   => 'root',
     }

manifests/params.pp

@@ -8,4 +8,5 @@
   $download_tool         = 'curl -s -L'
   $redis_user            = undef
   $redis_group           = undef
+  $download_base         = 'http://download.redis.io/releases'
 }

manifests/sentinel.pp

@@ -5,6 +5,8 @@
 #
 # [*sentinel_name*]
 #   Name of Sentinel instance. Default: call name of the function.
+# [*sentinel_ip*]
+#   Listen IP.
 # [*sentinel_port*]
 #   Listen port of Redis. Default: 26379
 # [*sentinel_log_dir*]
@@ -32,21 +34,22 @@
 #   Configure if Sentinel should be running or not. Default: true
 # [*enabled*]
 #   Configure if Sentinel is started at boot. Default: true
-# [*force_rewrite*]
+# [*sentinel_run_dir*]
 #
-#   Boolean. Default: `false`
-#
-#   Configure if the sentinels config is overwritten by puppet followed by a
-#   sentinel restart. Since sentinels automatically rewrite their config since
-#   version 2.8 setting this to `true` will trigger a sentinel restart on each puppet
-#   run with redis 2.8 or later.
+#   Default: `/var/run/redis`
 #
+#   Since sentinels automatically rewrite their config since version 2.8 the puppet managed config will be copied
+#   to this directory and than sentinel will start with this copy.
+# [*manage_logrotate*]
+#   Configure logrotate rules for redis sentinel. Default: true
 define redis::sentinel (
   $ensure           = 'present',
   $sentinel_name    = $name,
+  $sentinel_ip      = undef,
   $sentinel_port    = 26379,
   $sentinel_log_dir = '/var/log',
   $sentinel_pid_dir = '/var/run',
+  $sentinel_run_dir = '/var/run/redis',
   $monitors         = {
     'mymaster' => {
       master_host             => '127.0.0.1',
@@ -63,56 +66,84 @@
   },
   $running          = true,
   $enabled          = true,
-  $force_rewrite    = false,
+  $manage_logrotate = true,
 ) {
 
   # validate parameters
-  validate_bool($force_rewrite)
-  
+  validate_absolute_path($sentinel_log_dir)
+  validate_absolute_path($sentinel_pid_dir)
+  validate_absolute_path($sentinel_run_dir)
+  validate_hash($monitors)
+  validate_bool($running)
+  validate_bool($enabled)
+  validate_bool($manage_logrotate)
+
   $redis_install_dir = $::redis::install::redis_install_dir
   $sentinel_init_script = $::operatingsystem ? {
     /(Debian|Ubuntu)/                                          => 'redis/etc/init.d/debian_redis-sentinel.erb',
     /(Fedora|RedHat|CentOS|OEL|OracleLinux|Amazon|Scientific)/ => 'redis/etc/init.d/redhat_redis-sentinel.erb',
+    /(Gentoo)/                                                 => 'redis/etc/init.d/gentoo_redis-sentinel.erb',
     default                                                    => UNDEF,
   }
 
   # redis conf file
-  file {
-    "/etc/redis-sentinel_${sentinel_name}.conf":
+  $conf_file_name = "redis-sentinel_${sentinel_name}.conf"
+  $conf_file = "/etc/${conf_file_name}"
+  file { $conf_file:
       ensure  => file,
       content => template('redis/etc/sentinel.conf.erb'),
-      replace => $force_rewrite,
       require => Class['redis::install'];
-      
-  }->
+  }
 
   # startup script
-  file { "/etc/init.d/redis-sentinel_${sentinel_name}":
-    ensure  => file,
-    mode    => '0755',
-    content => template($sentinel_init_script),
-  }~>
+  if ($::osfamily == 'RedHat' and versioncmp($::operatingsystemmajrelease, '7') >=0) {
+    $service_file = "/usr/lib/systemd/system/redis-sentinel_${sentinel_name}.service"
+    exec { "systemd_service_${sentinel_name}_preset":
+      command     => "/bin/systemctl preset redis-sentinel_${sentinel_name}.service",
+      notify      => Service["redis-sentinel_${sentinel_name}"],
+      refreshonly => true,
+    }
+
+    file { $service_file:
+      ensure  => file,
+      mode    => '0755',
+      content => template('redis/systemd/sentinel.service.erb'),
+      require => File[$conf_file],
+      notify  => Exec["systemd_service_${sentinel_name}_preset"],
+    }
+  } else {
+    $service_file = "/etc/init.d/redis-sentinel_${sentinel_name}"
+    file { $service_file:
+      ensure  => file,
+      mode    => '0755',
+      content => template($sentinel_init_script),
+      require => File[$conf_file],
+      notify  => Service["redis-sentinel_${sentinel_name}"],
+    }
+  }
 
   # manage sentinel service
   service { "redis-sentinel_${sentinel_name}":
     ensure     => $running,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
+    subscribe  => File[$conf_file],
   }
 
-  # install and configure logrotate
-  if ! defined(Package['logrotate']) {
-    package { 'logrotate': ensure => installed; }
-  }
+  if ($manage_logrotate == true){
+    # install and configure logrotate
+    if ! defined(Package['logrotate']) {
+      package { 'logrotate': ensure => installed; }
+    }
 
-  file { "/etc/logrotate.d/redis-sentinel_${sentinel_name}":
-    ensure  => file,
-    content => template('redis/sentinel_logrotate.conf.erb'),
-    require => [
-      Package['logrotate'],
-      File["/etc/redis-sentinel_${sentinel_name}.conf"],
-    ]
+    file { "/etc/logrotate.d/redis-sentinel_${sentinel_name}":
+      ensure  => file,
+      content => template('redis/sentinel_logrotate.conf.erb'),
+      require => [
+        Package['logrotate'],
+        File["/etc/redis-sentinel_${sentinel_name}.conf"],
+      ]
+    }
   }
-
 }