Skip to content
This repository has been archived by the owner on Mar 8, 2023. It is now read-only.

backmerge for release 1.7.0 #57

Merged
merged 16 commits into from
Dec 2, 2015
Merged

backmerge for release 1.7.0 #57

merged 16 commits into from
Dec 2, 2015

Conversation

dwerder
Copy link
Member

@dwerder dwerder commented Dec 2, 2015

No description provided.

Steve Maddison and others added 16 commits June 25, 2015 11:18
Before this change, the redis-sentinel process was writing its pid to
`/var/run/redis.pid`, preventing the init.d scripts for correctly
identifying in stop and status calls. Tested on redis 3.0.4.
Explicitly define sentinel's pidfile
Some packages, at least the redis package for SLES creates by default a
redis system user. When using the redis cluster feature the $redis_dir
is used for synchronizing. Therefor, the $redis_dir has to be owned by
the redis system user, otherwise the redis server cannot start.

This commit sets the $redis_dir ownership according to the given
$redis_user. By default the $redis_user is undef, which results to
'root' as redis system user.
Change ownership of $redis_dir depending on the redis system user
When installing the redis-server with an install package on Ubuntu or
Debian, the redis-server is started automatically. This prevents
the puppet-configured redis-server from a correct start due to a port
conflict.

Stop the redis-server, after you install or upgrade the server with an
installation package.
Prevent default redis-server from automatically start
…chocat-master

Conflicts:
	manifests/server.pp
	templates/etc/redis.conf.erb
Support for extra configuration directives.
dwerder added a commit that referenced this pull request Dec 2, 2015
backmerge for release 1.7.0
@dwerder dwerder merged commit ec430e7 into master Dec 2, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants