systemd scripts use wrong variables #73

echocat · Apr 8, 2016 · 318d2cb · 318d2cb
1 parent e487127
commit 318d2cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/manifests/sentinel.pp b/manifests/sentinel.pp
@@ -83,7 +83,7 @@
     /(Debian|Ubuntu)/                                          => 'redis/etc/init.d/debian_redis-sentinel.erb',
     /(Fedora|RedHat|CentOS|OEL|OracleLinux|Amazon|Scientific)/ => 'redis/etc/init.d/redhat_redis-sentinel.erb',
     /(Gentoo)/                                                 => 'redis/etc/init.d/gentoo_redis-sentinel.erb',
-    default                                                    => UNDEF,
+    default                                                    => undef,
   }
 
   # redis conf file

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -83,7 +83,7 @@
 #   Since redis automatically rewrite their config since version 2.8 what conflicts with puppet
 #   the config files created by puppet will be copied to this directory and redis will be started from
 #   this copy.
-#   
+#
 # [*manage_logrotate*]
 #   Configure logrotate rules for redis server. Default: true
 define redis::server (
@@ -136,12 +136,13 @@
     /(Fedora|RedHat|CentOS|OEL|OracleLinux|Amazon|Scientific)/ => 'redis/etc/init.d/redhat_redis-server.erb',
     /(SLES)/                                                   => 'redis/etc/init.d/sles_redis-server.erb',
     /(Gentoo)/                                                 => 'redis/etc/init.d/gentoo_redis-server.erb',
-    default                                                    => UNDEF,
+    default                                                    => undef,
   }
   $redis_2_6_or_greater = versioncmp($::redis::install::redis_version,'2.6') >= 0
 
   # redis conf file
-  $conf_file = "/etc/redis_${redis_name}.conf"
+  $conf_file_name = "redis_${redis_name}.conf"
+  $conf_file = "/etc/${conf_file_name}"
   file { $conf_file:
       ensure  => file,
       content => template('redis/etc/redis.conf.erb'),

diff --git a/templates/systemd/redis.service.erb b/templates/systemd/redis.service.erb
@@ -1,13 +1,14 @@
 [Unit]
-Description=Redis persistent key-value database server
+Description=Redis redis_<%= @redis_name %> database server
 After=network.target
 
 [Service]
+ExecStartPre=/bin/mkdir -p <%= @redis_run_dir %>
 ExecStartPre=/bin/cp -u <%= @conf_file %> <%= @redis_run_dir %>/<%= @conf_file_name %>
 ExecStart=/usr/bin/redis-server <%= @redis_run_dir %>/<%= @conf_file_name %> --daemonize no
-ExecStop=/usr/bin/redis-shutdown redis_<%= @redis_name %>
-User=redis
-Group=redis
+ExecStop=/usr/bin/redis-cli -p <%= @redis_port %> shutdown
+User=<%= @redis_user or 'root' %>
+Group=<%= @redis_group or 'root' %>
 
 [Install]
 WantedBy=multi-user.target