Fixed typo breaking logstash::config on older puppet. Added centos to…

… operatingsystem checks Signed-off-by: Simon McCartney <simon@mccartney.ie>
simonmcc · Sep 11, 2012 · 6f8898e · 6f8898e
1 parent 4f6ae97
commit 6f8898e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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,
     }