fix sentinel pid and log locations in init script

echocat · May 7, 2015 · 7799819 · 7799819
1 parent 2ba0f27
commit 7799819
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/manifests/sentinel.pp b/manifests/sentinel.pp
@@ -36,6 +36,7 @@
   $sentinel_name    = $name,
   $sentinel_port    = 26379,
   $sentinel_log_dir = '/var/log',
+  $sentinel_pid_dir = '/var/run',
   $monitors         = {
     'mymaster' => {
       master_host             => '127.0.0.1',

diff --git a/templates/etc/init.d/debian_redis-sentinel.erb b/templates/etc/init.d/debian_redis-sentinel.erb
@@ -6,14 +6,14 @@
 # description:  Redis Sentinel is a monitor for redis servers
 # processname: redis-sentinel
 # config:      /etc/redis-sentinel_<%= @sentinel_name %>.conf
-# pidfile:     <%= @redis_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid
+# pidfile:     <%= @sentinel_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid
 
 # Source function library.
 . /lib/lsb/init-functions
 
 REDIS_EXEC="<%= @redis_install_dir %>/redis-sentinel"
 REDIS_NAME="redis-sentinel_<%= @sentinel_name %>"
-REDIS_PID="<%= @redis_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid"
+REDIS_PID="<%= @sentinel_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid"
 REDIS_LOCKFILE="/var/lock/redis-sentinel_<%= @sentinel_name %>"
 REDIS_CONF_FILE="/etc/redis-sentinel_<%= @sentinel_name %>.conf"
 

diff --git a/templates/etc/init.d/redhat_redis-sentinel.erb b/templates/etc/init.d/redhat_redis-sentinel.erb
@@ -7,7 +7,7 @@
 # processname: redis-server
 # config:      /etc/redis-sentinel_<%= @sentinel_name %>.conf
 # config:      /etc/sysconfig/redis
-# pidfile:     <%= @redis_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid
+# pidfile:     <%= @sentinel_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -20,8 +20,8 @@
 
 sentinel="<%= @redis_install_dir %>/redis-sentinel"
 prog="redis-sentinel_<%= @sentinel_name %>"
-pidfile="<%= @redis_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid"
-logfile="<%= @log_dir -%>/redis-sentinel_<%= @sentinel_name %>.log"
+pidfile="<%= @sentinel_pid_dir %>/redis-sentinel_<%= @sentinel_name %>.pid"
+logfile="<%= @sentinel_log_dir -%>/redis-sentinel_<%= @sentinel_name %>.log"
 
 SENTINEL_CONF_FILE="/etc/redis-sentinel_<%= @sentinel_name %>.conf"