Showing with 539 additions and 302 deletions.
  1. +1 −0 .fixtures.yml
  2. +1 −1 Modulefile
  3. +10 −14 README.md
  4. +8 −7 manifests/init.pp
  5. +11 −15 manifests/params.pp
  6. +15 −0 manifests/preinstall.pp
  7. +319 −135 spec/classes/{elasticsearch_spec.rb → redis_spec.rb}
  8. +174 −130 templates/redis.conf.erb
1 change: 1 addition & 0 deletions .fixtures.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
fixtures:
repositories:
apt: 'git://github.com/puppetlabs/puppetlabs-apt.git'
stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'

symlinks:
Expand Down
2 changes: 1 addition & 1 deletion Modulefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'arioch-redis'
version '0.0.2'
version '0.0.3'
author 'Tom De Vylder'
license 'Apache License, Version 2.0'
summary 'Redis module'
Expand Down
24 changes: 10 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,31 @@

### Standalone

class {
'redis':;
class { 'redis':;
}

### Master node

class {
'redis':
bind => '10.0.1.1';
#masterauth => 'secret';
class { 'redis':
bind => '10.0.1.1';
#masterauth => 'secret';
}

### Slave node

class {
'redis':
bind => '10.0.1.2',
slaveof => '10.0.1.1 6379';
#masterauth => 'secret';
class { 'redis':
bind => '10.0.1.2',
slaveof => '10.0.1.1 6379';
#masterauth => 'secret';
}

### Manage repositories

Disabled by default but if you really want the module to manage the required
repositories you can use this snippet:

class {
'redis':
manage_repo => true,
class { 'redis':
manage_repo => true,
}

## Unit testing
Expand Down
15 changes: 8 additions & 7 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,19 @@
$daemonize = $::redis::params::daemonize,
$databases = $::redis::params::databases,
$dbfilename = $::redis::params::dbfilename,
$hash_max_zipmap_entries = $::redis::params::hash_max_zipmap_entries,
$hash_max_zipmap_value = $::redis::params::hash_max_zipmap_value,
$hash_max_ziplist_entries = $::redis::params::hash_max_ziplist_entries,
$hash_max_ziplist_value = $::redis::params::hash_max_ziplist_value,
$list_max_ziplist_entries = $::redis::params::list_max_ziplist_entries,
$list_max_ziplist_value = $::redis::params::list_max_ziplist_value,
$log_dir = $::redis::params::log_dir,
$log_file = $::redis::params::log_file,
$log_level = $::redis::params::log_level,
$manage_repo = $::redis::params::manage_repo,
$masterauth = $::redis::params::masterauth,
$maxclients = $::redis::params::maxclients,
$maxmemory = $::redis::params::maxmemory,
$maxmemory_policy = $::redis::params::maxmemory_policy,
$maxmemory_samples = $::redis::params::maxmemory_samples,
$no_appendfsync_on_rewrite = $::redis::params::no_appendfsync_on_rewrite,
$package_ensure = $::redis::params::package_ensure,
$package_name = $::redis::params::package_name,
Expand All @@ -50,6 +54,7 @@
$rdbcompression = $::redis::params::rdbcompression,
$repl_ping_slave_period = $::redis::params::repl_ping_slave_period,
$repl_timeout = $::redis::params::repl_timeout,
$requirepass = $::redis::params::requirepass,
$service_enable = $::redis::params::service_enable,
$service_ensure = $::redis::params::service_ensure,
$service_group = $::redis::params::service_group,
Expand All @@ -58,16 +63,12 @@
$service_name = $::redis::params::service_name,
$service_user = $::redis::params::service_user,
$set_max_intset_entries = $::redis::params::set_max_intset_entries,
$slave_read_only = $::redis::params::slave_read_only,
$slave_serve_stale_data = $::redis::params::slave_serve_stale_data,
$slaveof = $::redis::params::slaveof,
$slowlog_log_slower_than = $::redis::params::slowlog_log_slower_than,
$slowlog_max_len = $::redis::params::slowlog_max_len,
$timeout = $::redis::params::timeout,
$vm_max_memory = $::redis::params::vm_max_memory,
$vm_max_threads = $::redis::params::vm_max_threads,
$vm_page_size = $::redis::params::vm_page_size,
$vm_pages = $::redis::params::vm_pages,
$vm_swap_file = $::redis::params::vm_swap_file,
$workdir = $::redis::params::workdir,
$zset_max_ziplist_entries = $::redis::params::zset_max_ziplist_entries,
$zset_max_ziplist_value = $::redis::params::zset_max_ziplist_value,
Expand Down
26 changes: 11 additions & 15 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,35 @@
$manage_repo = false

# redis.conf.erb
$activerehashing = 'yes'
$activerehashing = true
$appendfsync = 'everysec'
$appendonly = 'no'
$appendonly = false
$auto_aof_rewrite_min_size = '64min'
$auto_aof_rewrite_percentage = '100'
$bind = '127.0.0.1'
$daemonize = 'yes'
$daemonize = true
$databases = '16'
$dbfilename = 'dump.rdb'
$hash_max_zipmap_entries = '512'
$hash_max_zipmap_value = '64'
$hash_max_ziplist_entries = '512'
$hash_max_ziplist_value = '64'
$list_max_ziplist_entries = '512'
$list_max_ziplist_value = '64'
$log_dir = '/var/log/redis'
$log_file = '/var/log/redis/redis.log'
$log_level = 'notice'
$maxclients = '0'
$maxclients = '10000'
$maxmemory = undef
$maxmemory_policy = undef
$maxmemory_samples = undef
$no_appendfsync_on_rewrite = 'no'
$pid_file = '/var/run/redis/redis.pid'
$no_appendfsync_on_rewrite = false
$pid_file = '/var/run/redis/redis-server.pid'
$port = '6379'
$rdbcompression = 'yes'
$rdbcompression = true
$requirepass = undef
$set_max_intset_entries = '512'
$slowlog_log_slower_than = '10000'
$slowlog_max_len = '1024'
$timeout = '0'
$vm_max_memory = '0'
$vm_max_threads = '4'
$vm_page_size = '32'
$vm_pages = '134217728'
$vm_swap_file = '/tmp/redis.swap'
$workdir = '/var/lib/redis/'
$zset_max_ziplist_entries = '128'
$zset_max_ziplist_value = '64'
Expand All @@ -49,8 +44,9 @@
$masterauth = undef
$repl_ping_slave_period = '10'
$repl_timeout = '60'
$slave_serve_stale_data = 'yes'
$slave_serve_stale_data = true
$slaveof = undef
$slave_read_only = true

case $::osfamily {
'Debian': {
Expand Down
15 changes: 15 additions & 0 deletions manifests/preinstall.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@
}
}

'Debian': {
apt::key { 'dotdeb':
key => '89DF5277',
key_source => 'http://www.dotdeb.org/dotdeb.gpg',
}

apt::source { 'dotdeb':
location => 'http://packages.dotdeb.org',
release => $::lsbdistcodename,
repos => 'all',
include_src => true,
require => Apt::Key['dotdeb'],
}
}

default: {
}
}
Expand Down
Loading