Skip to content
This repository has been archived by the owner on Mar 8, 2023. It is now read-only.

Commit

Permalink
Merge pull request #33 from joshbeard/sl_fix
Browse files Browse the repository at this point in the history
Support Scientific Linux
  • Loading branch information
dwerder committed Jun 26, 2015
2 parents edf870b + 29bdde7 commit 3236f41
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions manifests/sentinel.pp
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@

$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)/ => 'redis/etc/init.d/redhat_redis-sentinel.erb',
default => UNDEF,
/(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',
default => UNDEF,
}

# redis conf file
Expand Down
8 changes: 4 additions & 4 deletions manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@

$redis_install_dir = $::redis::install::redis_install_dir
$redis_init_script = $::operatingsystem ? {
/(Debian|Ubuntu)/ => 'redis/etc/init.d/debian_redis-server.erb',
/(Fedora|RedHat|CentOS|OEL|OracleLinux|Amazon)/ => 'redis/etc/init.d/redhat_redis-server.erb',
/(SLES)/ => 'redis/etc/init.d/sles_redis-server.erb',
default => UNDEF,
/(Debian|Ubuntu)/ => 'redis/etc/init.d/debian_redis-server.erb',
/(Fedora|RedHat|CentOS|OEL|OracleLinux|Amazon|Scientific)/ => 'redis/etc/init.d/redhat_redis-server.erb',
/(SLES)/ => 'redis/etc/init.d/sles_redis-server.erb',
default => UNDEF,
}
$redis_2_6_or_greater = versioncmp($::redis::install::redis_version,'2.6') >= 0

Expand Down

0 comments on commit 3236f41

Please sign in to comment.