s/redis-server/redis/g && s/redis_server/redis/g

Author: thomasvandoren

Modulefile

@@ -1,5 +1,5 @@
-name         'thomasvandoren-redis-server'
+name         'thomasvandoren-redis'
 version      '0.0.1'
 author       'Thomas Van Doren'
 license      'The license the module is release under - generally GPLv2 or Apache'
-project_page 'https://github.com/thomasvandoren/puppet-redis-server'
+project_page 'https://github.com/thomasvandoren/puppet-redis'

README.md

@@ -1,9 +1,9 @@
-redis-server puppet module
+redis puppet module
 ==========================
 
-[![Build Status](https://secure.travis-ci.org/thomasvandoren/puppet-redis-server.png)](http://travis-ci.org/thomasvandoren/puppet-redis-server)
+[![Build Status](https://secure.travis-ci.org/thomasvandoren/puppet-redis.png)](http://travis-ci.org/thomasvandoren/puppet-redis)
 
-Install and configure redis-server.
+Install and configure redis.
 
 Authors
 -------

files/redis.conf

@@ -154,7 +154,7 @@ slave-serve-stale-data yes
 
 # Require clients to issue AUTH <PASSWORD> before processing any other
 # commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
+# others with access to the host running redis.
 #
 # This should stay commented out for backward compatibility and because most
 # people do not need auth (e.g. they run their own servers).

files/redis.init

@@ -1,8 +1,8 @@
 #/bin/sh
 #Configurations injected by install_server below....
 
-EXEC=/opt/redis-server/bin/redis-server
-CLIEXEC=/opt/redis-server/bin/redis-cli
+EXEC=/opt/redis/bin/redis
+CLIEXEC=/opt/redis/bin/redis-cli
 PIDFILE=/var/run/redis_6379.pid
 CONF="/etc/redis/6379.conf"
 
@@ -64,14 +64,14 @@ status()
 {
     if [ ! -f $PIDFILE ]
     then
-	echo "$PIDFILE does not exist, redis-server is not running"
+	echo "$PIDFILE does not exist, redis is not running"
 	exit 3
     elif [ ! -x /proc/$(cat $PIDFILE) ]
     then
 	echo "$PIDFILE exists, process is not running though"
 	exit 1
     else
-	echo "redis-server is running with PID $(cat $PIDFILE)"
+	echo "redis is running with PID $(cat $PIDFILE)"
 	exit 0
     fi
 }

manifests/init.pp

@@ -1,6 +1,6 @@
-# == Class: redis-server
+# == Class: redis
 #
-# Install and configure redis-server.
+# Install and configure redis.
 #
 # === Parameters
 #
@@ -9,8 +9,8 @@
 #   Default: /opt/redis-src
 #
 # [*redis_bin_dir*]
-#   Location to install redis-server binaries.
-#   Default: /opt/redis-server
+#   Location to install redis binaries.
+#   Default: /opt/redis
 #
 # [*redis_max_memory*]
 #   Set the redis config value maxmemory (bytes).
@@ -43,7 +43,7 @@
 #
 # === Examples
 #
-# include redis-server
+# include redis
 #
 # === Authors
 #
@@ -53,9 +53,9 @@
 #
 # Copyright 2012 Thomas Van Doren, unless otherwise noted.
 #
-class redis-server (
+class redis (
   $redis_src_dir = '/opt/redis-src',
-  $redis_bin_dir = '/opt/redis-server',
+  $redis_bin_dir = '/opt/redis',
   $redis_max_memory = '4gb',
   $redis_max_clients = 0,           # 0 = unlimited
   $redis_timeout = 300,         # 0 = disabled
@@ -88,25 +88,25 @@
     ensure => present,
     path   => $redis_pkg,
     mode   => '0644',
-    source => 'puppet:///modules/redis-server/redis-2.4.13.tar.gz',
+    source => 'puppet:///modules/redis/redis-2.4.13.tar.gz',
   }
   file { 'redis-init':
     ensure => present,
     path   => '/etc/init.d/redis_6379',
     mode   => '0755',
-    source => 'puppet:///modules/redis-server/redis.init',
+    source => 'puppet:///modules/redis/redis.init',
   }
   file { '6379.conf':
     ensure  => present,
     path    => '/etc/redis/6379.conf',
     mode    => '0644',
-    content => template('redis-server/6379.conf.erb'),
+    content => template('redis/6379.conf.erb'),
   }
   file { 'redis.conf':
     ensure => present,
     path   => '/etc/redis/redis.conf',
     mode   => '0644',
-    source => 'puppet:///modules/redis-server/redis.conf',
+    source => 'puppet:///modules/redis/redis.conf',
   }
   file { 'redis-cli-link':
     ensure => link,
@@ -132,7 +132,7 @@
                  Package['build-essential'],
                  ],
   }
-  service { 'redis-server':
+  service { 'redis':
     ensure    => running,
     name      => 'redis_6379',
     enable    => true,

templates/6379.conf.erb

@@ -136,7 +136,7 @@ slave-serve-stale-data yes
 
 # Require clients to issue AUTH <PASSWORD> before processing any other
 # commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
+# others with access to the host running redis.
 #
 # This should stay commented out for backward compatibility and because most
 # people do not need auth (e.g. they run their own servers).

tests/init.pp

@@ -1,4 +1,4 @@
 #
 # Smoke test.
 #
-include redis-server
+include redis