diff --git a/Modulefile b/Modulefile index a27b5e5..846282e 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'simonmcc-logstash' -version '0.0.2' +version '0.0.4' author 'Simon McCartney' license 'UNKNOWN' summary 'install & configure logstash, including dependencies & init scripts' diff --git a/manifests/config.pp b/manifests/config.pp index 457a347..d230eb2 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -35,8 +35,8 @@ $redis_port = '6379', $redis_key = 'logstash', $java_provider = 'package', - $java_package = 'openjdk', - $java_home = '/usr/lib/jvm/jre-1.6.0-openjdk.x86_64', + $java_package = 'java-1.6.0-openjdk', + $java_home = '/usr/lib/jvm/jre-1.6.0-openjdk.x86_64' ) { # just trying to make the fq variable a little less rediculous diff --git a/manifests/redis.pp b/manifests/redis.pp index 6a210bb..edd9c79 100644 --- a/manifests/redis.pp +++ b/manifests/redis.pp @@ -42,6 +42,7 @@ # where is the redis config file? $redis_conf = $operatingsystem ? { ubuntu => '/etc/redis/redis.conf', + centos => '/etc/redis.conf', redhat => '/etc/redis.conf', default => undef, } @@ -56,6 +57,7 @@ # What's the service name on this platform? $redis_service = $operatingsystem ? { ubuntu => 'redis-server', + centos => 'redis', redhat => 'redis', default => undef, }