Skip to content

Commit

Permalink
fixing $package_name is_string check #35
Browse files Browse the repository at this point in the history
  • Loading branch information
fsalum committed Jul 18, 2014
1 parent 0c835be commit f6717e1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 0 additions & 2 deletions Modulefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ project_page 'https://github.com/fsalum/puppet-redis'

# https://forge.puppetlabs.com/thias/sysctl
dependency 'thias/sysctl', '>= 0.3.0'
# https://forge.puppetlabs.com/puppetlabs/stdlib/
dependency 'puppetlabs/stdlib', '>= 3.2.1'
4 changes: 2 additions & 2 deletions lib/facter/redis_version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'facter'

Facter.add("redis_version", :timeout => 20) do
Facter.add("redis_version", :timeout => 120) do
confine :osfamily => "Debian"

setcode do
Expand Down Expand Up @@ -35,7 +35,7 @@
end
end

Facter.add("redis_version", :timeout => 20) do
Facter.add("redis_version", :timeout => 120) do
confine :osfamily => "RedHat"

setcode do
Expand Down
8 changes: 4 additions & 4 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@

$conf_redis = $redis::params::conf
$conf_logrotate = $redis::params::conf_logrotate
if is_string($package_name) {
$service = $redis::params::service

if $package_name {
$package = $package_name
}
else {
}else{
$package = $redis::params::package
}
$service = $redis::params::service

if $conf_pidfile {
$conf_pidfile_real = $conf_pidfile
Expand Down

0 comments on commit f6717e1

Please sign in to comment.