Add systemd support (in 3.0.0-rewrite)

.gitignore

@@ -20,3 +20,4 @@ bin
 coverage/
 doc/
 Gemfile.lock
+vendor/

.kitchen.yml

@@ -11,7 +11,9 @@ platforms:
   # - name: ubuntu-15.04
   # - name: centos-5.11
   # - name: centos-6.6
-  # - name: centos-7
+  - name: centos-7.1
+    run_list:
+      - recipe[nginx_service_test::nginx_repo]
 
 suites:
   - name: example

.rubocop.yml

@@ -1,8 +1,3 @@
-AllCops:
-  Exclude:
-    - Guardfile
-    - 'vendor/**/*'
-
 Metrics/LineLength:
   Max: 160
 

Berksfile

@@ -7,6 +7,8 @@ group :integration do
 
   cookbook 'nginx_service_test', path: 'test/fixtures/cookbooks/nginx_service_test'
 
+  cookbook 'yum-epel'
+
   # Or include an entire directory, once we have more test cookbooks:
   # Dir["test/fixtures/cookbooks/**/metadata.rb"].each do |metadata|
   #   cookbook File.basename(File.dirname(metadata)), path: File.dirname(metadata)

libraries/helpers.rb

@@ -13,5 +13,20 @@ def nginx_instance_name
     def res_name
       new_resource.name
     end
+
+    # @return [String] Name of the user that runs nginx
+    def user_for_platform(node)
+      case node['platform']
+      when 'centos'
+        'nginx'
+      when 'ubuntu', 'debian'
+        'www-data'
+      else
+        raise "Unexpected platform '#{node['platform']}'."
+      end
+    end
   end
 end
+
+Chef::Resource.send(:include, NginxCookbook::Helpers)
+Chef::Provider.send(:include, NginxCookbook::Helpers)

libraries/provider_nginx_service_base.rb

@@ -16,8 +16,6 @@ def whyrun_supported?
         true
       end
 
-      include NginxCookbook::Helpers
-
       action :create do
         # Install nginx using system package resource
         #

libraries/provider_nginx_service_systemd.rb

@@ -0,0 +1,88 @@
+class Chef
+  class Provider
+    class NginxService
+      # Provider actions for platforms using Systemd
+      #
+      # @since 3.0.0
+      # @author Miguel Ferreira <mferreira@schubergphilis.com>
+      class NginxServiceSystemd < Chef::Provider::NginxServiceBase
+        provides :nginx_service, os: 'linux' do
+          Chef::Platform::ServiceHelpers.service_resource_providers.include?(:systemd)
+        end if defined?(provides)
+
+        action :start do
+          template "#{res_name} :create /etc/systemd/system/#{nginx_instance_name}" do
+            path "/etc/systemd/system/#{nginx_instance_name}.service"
+            cookbook 'nginx'
+            source 'systemd/nginx.erb'
+            owner 'root'
+            group 'root'
+            mode 00744
+            variables(nginx_instance_name: nginx_instance_name)
+            action :create
+            notifies :run, 'execute[systemctl daemon-reload]', :immediately
+          end
+
+          execute 'systemctl daemon-reload' do
+            action :nothing
+          end
+
+          service "#{nginx_instance_name} :start" do
+            service_name nginx_instance_name
+            provider Chef::Provider::Service::Systemd
+            supports status: true, restart: true
+            action [:start, :enable]
+          end
+        end
+
+        action :stop do
+          service "#{nginx_instance_name} :stop" do
+            service_name nginx_instance_name
+            provider Chef::Provider::Service::Systemd
+            supports status: true, restart: true
+            action [:stop, :disable]
+          end
+        end
+
+        action :delete do
+          file "#{res_name} :delete /etc/systemd/system/#{nginx_instance_name}" do
+            path "/etc/systemd/system/#{nginx_instance_name}.service"
+            action :delete
+          end
+
+          service "#{res_name} :delete #{nginx_instance_name}" do
+            service_name nginx_instance_name
+            provider Chef::Provider::Service::Systemd
+            supports status: true
+            action [:stop, :disable]
+            notifies :run, 'execute[systemctl daemon-reload]', :immediately
+          end
+
+          execute 'systemctl daemon-reload' do
+            action :nothing
+          end
+        end
+
+        action :restart do
+          # @todo create recipes and tests for this
+          service "#{res_name} :restart #{nginx_instance_name}" do
+            service_name nginx_instance_name
+            supports status: true, restart: true
+            provider Chef::Provider::Service::Systemd
+            action :restart
+          end
+        end
+
+        action :reload do
+          # @todo create recipes and tests for this
+          service "#{res_name} :reload #{nginx_instance_name}" do
+            service_name nginx_instance_name
+            provider Chef::Provider::Service::Systemd
+            supports status: true, reload: true
+            action :reload
+          end
+        end
+      end
+    end
+  end
+end

libraries/resource_nginx_service.rb

@@ -14,7 +14,7 @@ class NginxService < Chef::Resource::LWRPBase
       attribute :error_log_level, kind_of: String, default: 'warn'
       attribute :run_group, kind_of: String, default: nil
       # @todo Determine what user is correct per-platform
-      attribute :run_user, kind_of: String, default: 'www-data'
+      attribute :run_user, kind_of: String, default: lazy { user_for_platform(node) }
       attribute :worker_connections, kind_of: Integer, default: 1024
       attribute :worker_processes, kind_of: Integer, default: 1
 

spec/libraries_specs/helpers_spec.rb

@@ -1,15 +1,38 @@
-# require_relative '../../libraries/helpers'
-# require_relative '../../libraries/resource_nginx_service'
-#
-# describe NginxCookbook::Helpers do
-#   class DummyClass
-#   end
-#
-#   before(:all) do
-#     @dummy = DummyClass.new
-#     @dummy.extend NginxCookbook::Helpers
-#   end
-#
+require_relative '../../libraries/helpers'
+require_relative '../../libraries/resource_nginx_service'
+
+describe NginxCookbook::Helpers do
+  class DummyClass
+    attr_accessor :node
+
+    def initialize
+      @node = {}
+    end
+  end
+
+  before(:all) do
+    @dummy = DummyClass.new
+    @dummy.extend NginxCookbook::Helpers
+  end
+
+  it 'returns www-data for debian platform' do
+    @dummy.node['platform'] = 'debian'
+
+    expect(@dummy.user_for_platform(@dummy.node)).to be == 'www-data'
+  end
+
+  it 'returns www-data for ubuntu platform' do
+    @dummy.node['platform'] = 'ubuntu'
+
+    expect(@dummy.user_for_platform(@dummy.node)).to be == 'www-data'
+  end
+
+  it 'returns nginx for centos platform' do
+    @dummy.node['platform'] = 'centos'
+
+    expect(@dummy.user_for_platform(@dummy.node)).to be == 'nginx'
+  end
+
 #   # let(:klass) { Class.new { extend NginxCookbook::Helpers } }
 #
 #   # let(:klass) do
@@ -103,4 +126,4 @@
 #       end
 #     end
 #   end
-# end
+end

spec/libraries_specs/resource/nginx_service/create/centos_7_spec.rb

@@ -0,0 +1,21 @@
+describe 'resource_nginx_service :create on centos 7' do
+  before do
+    allow(Chef::Platform::ServiceHelpers).to receive(:service_resource_providers).and_return([:systemd])
+  end
+
+  cached(:chef_run) do
+    ChefSpec::SoloRunner.new(
+      step_into: 'nginx_service',
+      platform: 'centos',
+      version: '7.0'
+    ).converge('nginx::example')
+  end
+
+  it_behaves_like 'create a named nginx_service', 'example'
+
+  it_behaves_like 'nginx_service :create', 'example', 'platform' => 'centos'
+  it_behaves_like 'nginx_service :start', 'example'
+  it_behaves_like 'nginx_service #systemd', 'example'
+
+  it_behaves_like 'nginx_config :create', 'example'
+end

spec/libraries_specs/resource/nginx_service/create/debian_7_spec.rb

@@ -13,7 +13,7 @@
 
   it_behaves_like 'create a named nginx_service', 'example'
 
-  it_behaves_like 'nginx_service :create', 'example'
+  it_behaves_like 'nginx_service :create', 'example', 'platform' => 'debian'
   it_behaves_like 'nginx_service :start', 'example'
   it_behaves_like 'nginx_service #upstart', 'example'
 

spec/libraries_specs/resource/nginx_service/create/ubuntu_1004_spec.rb

@@ -13,7 +13,7 @@
 
   it_behaves_like 'create a named nginx_service', 'example'
 
-  it_behaves_like 'nginx_service :create', 'example'
+  it_behaves_like 'nginx_service :create', 'example', 'platform' => 'ubuntu'
   it_behaves_like 'nginx_service :start', 'example'
   it_behaves_like 'nginx_service #sysvinit', 'example'
 

spec/libraries_specs/resource/nginx_service/create/ubuntu_1404_spec.rb

@@ -13,7 +13,7 @@
 
   it_behaves_like 'create a named nginx_service', 'example'
 
-  it_behaves_like 'nginx_service :create', 'example'
+  it_behaves_like 'nginx_service :create', 'example', 'platform' => 'ubuntu'
   it_behaves_like 'nginx_service :start', 'example'
   it_behaves_like 'nginx_service #upstart', 'example'
 

spec/libraries_specs/resource/nginx_service/delete/centos_7_spec.rb

@@ -0,0 +1,18 @@
+describe 'resource_nginx_service :delete on centos 7' do
+  cached(:chef_run) do
+    ChefSpec::SoloRunner.new(
+      step_into: 'nginx_service',
+      platform: 'centos',
+      version: '7.0'
+    ).converge('nginx_service_test::single', 'nginx_service_test::delete')
+  end
+
+  it_behaves_like 'create a named nginx_service', 'single'
+
+  it_behaves_like 'nginx_service :create', 'single', 'platform' => 'centos'
+  it_behaves_like 'nginx_service :start', 'single'
+
+  xit 'stops the service' do
+    expect(chef_run).to stop_service('nginx-single')
+  end
+end

spec/libraries_specs/resource/nginx_service/delete/debian_7_spec.rb

@@ -9,7 +9,7 @@
 
   it_behaves_like 'create a named nginx_service', 'single'
 
-  it_behaves_like 'nginx_service :create', 'single'
+  it_behaves_like 'nginx_service :create', 'single', 'platform' => 'debian'
   it_behaves_like 'nginx_service :start', 'single'
 
   xit 'stops the service' do

spec/shared_examples/service.rb

@@ -1,11 +1,14 @@
+require_relative '../../libraries/helpers.rb'
+include NginxCookbook::Helpers
+
 RSpec.configure do
   shared_examples_for 'create a named nginx_service' do |servicename|
     it "creates nginx_service[#{servicename}]" do
       expect(chef_run).to create_nginx_service(servicename)
     end
   end
 
-  shared_examples_for 'nginx_service :create' do |servicename|
+  shared_examples_for 'nginx_service :create' do |servicename, node|
     it 'installs the nginx package' do
       expect(chef_run).to install_package("#{servicename} :create nginx")
         .with(package_name: 'nginx')
@@ -18,7 +21,7 @@
 
     it 'creates new directories for the named instance' do
       expect(chef_run).to create_directory("/var/log/nginx-#{servicename}")
-        .with(user: 'www-data', group: 'adm', mode: 00755)
+        .with(user: user_for_platform(node), group: 'adm', mode: 00755)
 
       %W(
         /etc/nginx-#{servicename}
@@ -60,4 +63,11 @@
         .with(user: 'root', group: 'root', mode: 00744)
     end
   end
+
+  shared_examples_for 'nginx_service #systemd' do |servicename|
+    it 'templates instance-specific files' do
+      expect(chef_run).to create_template("/etc/nginx-#{servicename}/nginx.conf")
+        .with(user: 'root', group: 'root', mode: 00644)
+    end
+  end
 end

templates/default/systemd/nginx.erb

@@ -0,0 +1,19 @@
+# Dynamically generated by Chef - local modifications will be overwritten
+
+[Unit]
+Description=The nginx HTTP and reverse proxy server for <%= @nginx_instance_name %>
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/<%= @nginx_instance_name %>.pid
+ExecStartPre=/usr/sbin/nginx -t -c /etc/<%= @nginx_instance_name %>/nginx.conf
+ExecStart=/usr/sbin/nginx -c /etc/<%= @nginx_instance_name %>/nginx.conf
+ExecReload=/bin/kill -s HUP $MAINPID
+KillMode=process
+KillSignal=SIGQUIT
+TimeoutStopSec=5
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

test/fixtures/cookbooks/nginx_service_test/metadata.rb

@@ -7,4 +7,5 @@
 version          '0.1.0'
 
 depends 'apt'
+depends 'yum-epel'
 depends 'nginx'

test/fixtures/cookbooks/nginx_service_test/recipes/nginx_repo.rb

@@ -3,10 +3,21 @@
 #   distribution node['lsb']['codename']
 # end
 
-apt_repository 'nginx.org' do
-  uri          "http://nginx.org/packages/#{node['platform']}"
-  distribution node['lsb']['codename']
-  components   ['nginx']
-  key          'http://nginx.org/keys/nginx_signing.key'
-  only_if      { node['platform_family'] == 'debian' }
+case node['platform']
+when 'ubuntu', 'debian'
+  apt_repository 'nginx.org' do
+    uri          "http://nginx.org/packages/#{node['platform']}"
+    distribution node['lsb']['codename']
+    components   ['nginx']
+    key          'http://nginx.org/keys/nginx_signing.key'
+    only_if      { node['platform_family'] == 'debian' }
+  end
+when 'centos'
+  yum_repository 'nginx repo' do
+    description 'Official Red Hat/CentOS packages'
+    mirrorlist 'http://nginx.org/packages/centos/$releasever/$basearch/'
+    gpgcheck false
+    enabled true
+    action :create
+  end
 end

test/integration/example/serverspec/example_spec.rb

@@ -16,7 +16,7 @@
     nginx_example_conf = file '/etc/nginx-example/nginx.conf'
 
     expect(nginx_example_conf).to be_a_file
-    expect(nginx_example_conf.content).to match(/user www-data;/)
+    expect(nginx_example_conf.content).to match(/user (www-data|nginx);/)
   end
 
   it 'starts & enables the example nginx service' do