From d60056acdbcb742cdd0cff462a0da73e154e3b49 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sat, 3 Sep 2016 18:18:23 +0300
Subject: [PATCH] redis: Style fixes

---
 redis/manifests/init.pp | 109 +++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 56 deletions(-)

diff --git a/redis/manifests/init.pp b/redis/manifests/init.pp
index 591683b..e95768a 100644
--- a/redis/manifests/init.pp
+++ b/redis/manifests/init.pp
@@ -2,71 +2,68 @@
 #
 # === Parameters
 #
-#   $bind:
-#       Address to bind to. Defaults to "127.0.0.1".
+# $bind:
+#   Address to bind to. Defaults to '127.0.0.1'.
 #
-#   $datadir:
-#       Directory for redis database dumps.
-#       Defaults to "/srv/redis".
+# $datadir:
+#   Directory for redis database dumps.
+#   Defaults to '/srv/redis'.
 #
-#   $password:
-#       Optional password for client connections.
+# $password:
+#   Optional password for client connections.
 #
-#   $appendonly:
-#       Enable append only mode. Defaults to false.
+# $appendonly:
+#   Enable append only mode. Defaults to false.
 #
-class redis($bind="127.0.0.1", $datadir="", $password="", $appendonly=false) {
+class redis(
+  $bind='127.0.0.1',
+  $datadir='/srv/redis',
+  $password=undef,
+  $appendonly=false,
+) {
 
-    package { "redis":
-        ensure => installed,
-    }
+  package { 'redis':
+    ensure => installed,
+  }
 
-    if $datadir {
-        file { $datadir:
-            ensure  => directory,
-            mode    => "0700",
-            owner   => "redis",
-            group   => "redis",
-            before  => File["/srv/redis"],
-            require => Package["redis"],
-        }
-        file { "/srv/redis":
-            ensure => link,
-            target => $datadir,
-            before => Service["redis"],
-        }
-    } else {
-        file { "/srv/redis":
-            ensure  => directory,
-            mode    => "0700",
-            owner   => "redis",
-            group   => "redis",
-            before  => Service["redis"],
-            require => Package["redis"],
-        }
+  if $datadir != '/srv/redis' {
+    file { '/srv/redis':
+      ensure => link,
+      target => $datadir,
+      before => Service['redis'],
     }
+  }
 
-    augeas { "set-redis-include":
-        changes => "set include /etc/redis.local.conf",
-        incl    => "/etc/redis.conf",
-        lens    => "Spacevars.simple_lns",
-        notify  => Service["redis"],
-        require => Package["redis"],
-    }
+  file { $datadir:
+    ensure  => directory,
+    mode    => '0700',
+    owner   => 'redis',
+    group   => 'redis',
+    before  => Service['redis'],
+    require => Package['redis'],
+  }
 
-    file { "/etc/redis.local.conf":
-        ensure  => present,
-        mode    => "0600",
-        owner   => "redis",
-        group   => "redis",
-        content => template("redis/local.conf.erb"),
-        require => Package["redis"],
-        notify  => Service["redis"],
-    }
+  augeas { 'set-redis-include':
+    changes => 'set include /etc/redis.local.conf',
+    incl    => '/etc/redis.conf',
+    lens    => 'Spacevars.simple_lns',
+    notify  => Service['redis'],
+    require => Package['redis'],
+  }
 
-    service { "redis":
-        ensure => running,
-        enable => true,
-    }
+  file { '/etc/redis.local.conf':
+    ensure  => present,
+    mode    => '0600',
+    owner   => 'redis',
+    group   => 'redis',
+    content => template('redis/local.conf.erb'),
+    notify  => Service['redis'],
+    require => Package['redis'],
+  }
+
+  service { 'redis':
+    ensure => running,
+    enable => true,
+  }
 
 }