Merge pull request #302 from yakara-ltd/systemd

Various systemd-related improvements

Author: shortdudey123

README.md

@@ -415,24 +415,6 @@ You may also pass an array of masters to monitor like so:
 
 ## Resources/Providers
 
-### `service`
-
-Actions:
-
-* `start`
-* `stop`
-* `restart`
-* `enable`
-* `disable`
-
-Simply provide redis<server_name> where server name is the port if you haven't given it a name.
-
-```ruby
-service "redis<server_name>" do
-  action [:start,:stop,:restart,:enable,:disable]
-end
-```
-
 ### `install`
 
 Actions:

attributes/default.rb

@@ -67,13 +67,13 @@
 default['redisio']['install_dir'] = nil
 
 # Job control related options (initd, upstart, or systemd)
-if node['platform_family'] == 'rhel' && Gem::Version.new(node['platform_version']) > Gem::Version.new('7.0.0')
-  default['redisio']['job_control'] = 'systemd'
-elsif node['platform_family'] == 'freebsd'
-  default['redisio']['job_control'] = 'rcinit'
-else
-  default['redisio']['job_control'] = 'initd'
-end
+default['redisio']['job_control'] = if node['init_package'] == 'systemd'
+                                      'systemd'
+                                    elsif node['platform_family'] == 'freebsd'
+                                      'rcinit'
+                                    else
+                                      'initd'
+                                    end
 
 # Init.d script related options
 default['redisio']['init.d']['required_start'] = []

providers/configure.rb

@@ -296,61 +296,93 @@ def configure
                    node['redisio']['bin_path']
                  end
 
-      template "/etc/init.d/redis#{server_name}" do
-        source 'redis.init.erb'
-        cookbook 'redisio'
-        owner 'root'
-        group 'root'
-        mode '0755'
-        variables(
-          name: server_name,
-          bin_path: bin_path,
-          port: current['port'],
-          address: current['address'],
-          user: current['user'],
-          configdir: current['configdir'],
-          piddir: piddir,
-          requirepass: current['requirepass'],
-          shutdown_save: current['shutdown_save'],
-          platform: node['platform'],
-          unixsocket: current['unixsocket'],
-          ulimit: descriptors,
-          required_start: node['redisio']['init.d']['required_start'].join(' '),
-          required_stop: node['redisio']['init.d']['required_stop'].join(' ')
-        )
-        only_if { node['redisio']['job_control'] == 'initd' }
-      end
-      template "/etc/init/redis#{server_name}.conf" do
-        source 'redis.upstart.conf.erb'
-        cookbook 'redisio'
-        owner current['user']
-        group current['group']
-        mode '0644'
-        variables(
-          name: server_name,
-          bin_path: bin_path,
-          port: current['port'],
-          user: current['user'],
-          group: current['group'],
-          configdir: current['configdir'],
-          piddir: piddir
-        )
-        only_if { node['redisio']['job_control'] == 'upstart' }
-      end
-      template "/usr/local/etc/rc.d/redis#{server_name}" do
-        source 'redis.rcinit.erb'
-        cookbook 'redisio'
-        owner current['user']
-        group current['group']
-        mode '0755'
-        variables(
-          name: server_name,
-          bin_path: bin_path,
-          user: current['user'],
-          configdir: current['configdir'],
-          piddir: piddir
-        )
-        only_if { node['redisio']['job_control'] == 'rcinit' }
+      case node['redisio']['job_control']
+      when 'initd'
+        template "/etc/init.d/redis#{server_name}" do
+          source 'redis.init.erb'
+          cookbook 'redisio'
+          owner 'root'
+          group 'root'
+          mode '0755'
+          variables(
+            name: server_name,
+            bin_path: bin_path,
+            port: current['port'],
+            address: current['address'],
+            user: current['user'],
+            configdir: current['configdir'],
+            piddir: piddir,
+            requirepass: current['requirepass'],
+            shutdown_save: current['shutdown_save'],
+            platform: node['platform'],
+            unixsocket: current['unixsocket'],
+            ulimit: descriptors,
+            required_start: node['redisio']['init.d']['required_start'].join(' '),
+            required_stop: node['redisio']['init.d']['required_stop'].join(' ')
+          )
+        end
+      when 'upstart'
+        template "/etc/init/redis#{server_name}.conf" do
+          source 'redis.upstart.conf.erb'
+          cookbook 'redisio'
+          owner current['user']
+          group current['group']
+          mode '0644'
+          variables(
+            name: server_name,
+            bin_path: bin_path,
+            port: current['port'],
+            user: current['user'],
+            group: current['group'],
+            configdir: current['configdir'],
+            piddir: piddir
+          )
+        end
+      when 'rcinit'
+        template "/usr/local/etc/rc.d/redis#{server_name}" do
+          source 'redis.rcinit.erb'
+          cookbook 'redisio'
+          owner current['user']
+          group current['group']
+          mode '0755'
+          variables(
+            name: server_name,
+            bin_path: bin_path,
+            user: current['user'],
+            configdir: current['configdir'],
+            piddir: piddir
+          )
+        end
+      when 'systemd'
+        service_name = "redis@#{server_name}"
+        reload_name = "#{service_name} systemd reload"
+
+        file "/etc/tmpfiles.d/#{service_name}.conf" do
+          content "d #{piddir} 0755 #{current['user']} #{current['group']}\n"
+          owner 'root'
+          group 'root'
+          mode '0644'
+        end
+
+        execute reload_name do
+          command 'systemctl daemon-reload'
+          action :nothing
+        end
+
+        template "/lib/systemd/system/#{service_name}.service" do
+          source 'redis@.service.erb'
+          cookbook 'redisio'
+          owner 'root'
+          group 'root'
+          mode '0644'
+          variables(
+            bin_path: bin_path,
+            user: current['user'],
+            group: current['group'],
+            limit_nofile: current['maxclients'] + 32
+          )
+          notifies :run, "execute[#{reload_name}]", :immediately
+        end
       end
     end
   end # servers each loop

recipes/configure.rb

@@ -38,15 +38,6 @@
   base_piddir redis['base_piddir']
 end
 
-template '/usr/lib/systemd/system/redis@.service' do
-  source 'redis@.service.erb'
-  variables(
-    bin_path: node['redisio']['bin_path'],
-    limit_nofile: redis['default_settings']['maxclients'] + 32
-  )
-  only_if { node['redisio']['job_control'] == 'systemd' }
-end
-
 # Create a service resource for each redis instance, named for the port it runs on.
 redis_instances.each do |current_server|
   server_name = current_server['name'] || current_server['port']

recipes/enable.rb

@@ -20,12 +20,6 @@
 
 redis = node['redisio']
 
-execute 'reload-systemd-enable' do
-  command '/usr/bin/systemctl daemon-reload'
-  only_if { node['redisio']['job_control'] == 'systemd' }
-  action :nothing
-end
-
 redis['servers'].each do |current_server|
   server_name = current_server['name'] || current_server['port']
   resource_name = if node['redisio']['job_control'] == 'systemd'
@@ -35,13 +29,5 @@
                   end
   resource = resources(resource_name)
   resource.action Array(resource.action)
-  resource.action << :start
-  if node['redisio']['job_control'] != 'systemd'
-    resource.action << :enable
-  else
-    link "/etc/systemd/system/multi-user.target.wants/redis@#{server_name}.service" do
-      to '/usr/lib/systemd/system/redis@.service'
-      notifies :run, 'execute[reload-systemd-enable]', :immediately
-    end
-  end
+  resource.action.concat [:start, :enable]
 end

templates/default/redis@.service.erb

@@ -1,12 +1,11 @@
 [Unit]
-Description=Redis persistent key-value database
+Description=Redis (%i) persistent key-value database
 After=network.target
 
 [Service]
 ExecStart=<%= @bin_path %>/redis-server /etc/redis/%i.conf --daemonize no
-ExecStop=/usr/bin/redis-shutdown
-User=redis
-Group=redis
+User=<%= @user %>
+Group=<%= @group %>
 LimitNOFILE=<%= @limit_nofile %>
 
 [Install]