Skip to content

Commit

Permalink
Automatic update
Browse files Browse the repository at this point in the history
This module update commit was generated by Bade.
For more info please check https://github.com/paramite/bade

This commit is setting modules to following state:
redis
 - old commit: f4ffa1b
 - new commit: 0e5bd1e
  • Loading branch information
Eoghan Glynn committed Jan 8, 2015
1 parent a10d3ee commit 58c8f1b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ mod 'rabbitmq',
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'

mod 'redis',
:commit => 'f4ffa1b907281472c8572c7dbcee8d2f454f3e27',
:commit => '0e5bd1e5f0000fd2d1fa63936e2e013021dbadc4',
:git => 'https://github.com/arioch/puppet-redis.git'

mod 'rsync',
Expand Down
12 changes: 7 additions & 5 deletions redis/manifests/sentinel.pp
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,24 @@
file {
$config_file_orig:
ensure => present,
content => template($conf_template);

$config_file:
owner => $service_user,
group => $service_group,
mode => $config_file_mode;
mode => $config_file_mode,
content => template($conf_template);
}

exec {
"cp ${config_file_orig} ${config_file}":
"cp -p ${config_file_orig} ${config_file}":
path => '/usr/bin:/bin',
subscribe => File[$config_file_orig],
notify => Service[$service_name],
refreshonly => true;
}

package { $::redis::params::package_name:
ensure => $::redis::params::package_ensure,
}

service { $service_name:
ensure => $::redis::params::service_ensure,
enable => $::redis::params::service_enable,
Expand Down
13 changes: 11 additions & 2 deletions redis/metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arioch-redis",
"version": "1.0.2",
"version": "1.0.3",
"author": "Tom De Vylder",
"summary": "Redis module",
"license": "Apache License, Version 2.0",
Expand Down Expand Up @@ -37,6 +37,13 @@
"7.5"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"14.10"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
Expand All @@ -61,6 +68,8 @@
}
],
"dependencies": [

{
"name": "puppetlabs/apt"
}
]
}
7 changes: 2 additions & 5 deletions redis/spec/classes/redis_sentinel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,12 @@

it { should contain_file('/etc/redis/redis-sentinel.conf.puppet').with(
'ensure' => 'present',
'mode' => '0644',
'owner' => 'redis',
'content' => $expected_noparams_content
)
}

it { should contain_file('/etc/redis/redis-sentinel.conf').with(
'mode' => '0644'
)
}

it { should contain_service('redis-sentinel').with(
'ensure' => 'running',
'enable' => 'true',
Expand Down

0 comments on commit 58c8f1b

Please sign in to comment.