Merge pull request #18 from NTTCom-MS/master

Fix ExecStart in dropin

manifests/service/dropin.pp

@@ -74,6 +74,8 @@
     include ::systemd
   }
 
+  $dropin = true
+
   file { "/etc/systemd/system/${servicename}.service.d/${dropin_order}-${dropin_name}.conf":
     ensure  => 'present',
     owner   => 'root',

spec/defines/service_dropin_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'systemd::service::dropin' do
+  let(:pre_condition) do
+    "include '::systemd'"
+  end
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let (:facts) {facts}
+      let(:title) { 'foobar' }
+      context 'with minimum parameters' do
+        it { should compile.with_all_deps }
+        it { should contain_file('/etc/systemd/system/foobar.service.d/99-override.conf') }
+      end
+      context 'with execstart parameter' do
+        let(:params) do
+          {
+            execstart: '/usr/bin/foobar'
+          }
+        end
+        it { should compile.with_all_deps }
+        it do
+          should contain_file('/etc/systemd/system/foobar.service.d/99-override.conf')
+            .with_content(/^ExecStart=$/)
+            .with_content(/^ExecStart=\/usr\/bin\/foobar$/)
+        end
+      end
+    end
+  end
+end

spec/defines/service_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'systemd::service' do
+  let(:pre_condition) do
+    "include '::systemd'"
+  end
+  on_supported_os.each do |os, facts|
+    context "on #{os}" do
+      let (:facts) {facts}
+      let(:title) { 'foobar' }
+      context 'with minimum parameters' do
+        it { should compile.with_all_deps }
+        it { should contain_file('/etc/systemd/system/foobar.service') }
+      end
+      context 'with execstart parameter' do
+        let(:params) do
+          {
+            execstart: '/usr/bin/foobar'
+          }
+        end
+        it { should compile.with_all_deps }
+        it do
+          should contain_file('/etc/systemd/system/foobar.service')
+            .without_content(/^ExecStart=$/)
+            .with_content(/^ExecStart=\/usr\/bin\/foobar$/)
+        end
+      end
+    end
+  end
+end

templates/service.erb

@@ -26,6 +26,9 @@ OnFailure=<%= @on_failure.join(' ') %>
 
 [Service]
 <% if defined?(@execstart) -%>
+  <%- if defined?(@dropin) -%>
+ExecStart=
+  <%- end -%>
   <%- if @execstart.kind_of?(Array) -%>
     <%- @execstart.each do |val| -%>
 ExecStart=<%= val %>