Merge pull request #339 from traylenator/syslogidentifier

Allow SyslogIdentifier, KillMode and KillSignal to [service] section

Author: traylenator

REFERENCE.md

@@ -2256,6 +2256,9 @@ Struct[{
     Optional['ExecReload']                => Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]],
     Optional['ExecStop']                  => Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]],
     Optional['ExecStopPost']              => Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]],
+    Optional['KillSignal']                => Pattern[/^SIG[A-Z]+$/],
+    Optional['KillMode']                  => Enum['control-group', 'mixed', 'process', 'none'],
+    Optional['SyslogIdentifier']          => String,
     Optional['RestartSec']                => String,
     Optional['TimeoutStartSec']           => String,
     Optional['TimeoutStopSec']            => String,

spec/defines/manage_dropin_spec.rb

@@ -22,13 +22,17 @@
               super().merge(
                 unit_entry: {
                   DefaultDependencies: true
+                },
+                service_entry: {
+                  SyslogIdentifier: 'simple'
                 }
               )
             end
 
             it {
               is_expected.to contain_systemd__dropin_file('foobar.conf').
-                with_content(%r{^DefaultDependencies=true$})
+                with_content(%r{^DefaultDependencies=true$}).
+                with_content(%r{^SyslogIdentifier=simple$})
             }
           end
 

spec/defines/manage_unit_spec.rb

@@ -18,8 +18,9 @@
                 DefaultDependencies: true,
               },
               service_entry: {
-                Type:      'oneshot',
+                Type: 'oneshot',
                 ExecStart: '/usr/bin/doit.sh',
+                SyslogIdentifier: 'doit-backwards.sh',
               },
               install_entry: {
                 WantedBy: 'multi-user.target',
@@ -34,6 +35,7 @@
               with_content(%r{^\[Unit\]$}).
               with_content(%r{^DefaultDependencies=true$}).
               with_content(%r{^\[Service\]$}).
+              with_content(%r{^SyslogIdentifier=doit-backwards\.sh$}).
               with_content(%r{^\[Install\]$}).
               with_content(%r{^Description=My great service$}).
               with_content(%r{^Description=has two lines of description$}).

spec/type_aliases/systemd_unit_service_spec.rb

@@ -5,15 +5,29 @@
 describe 'Systemd::Unit::Service' do
   %w[ExecStart ExecStartPre ExecStartPost ExecCondition ExecReload ExecStop ExecStopPost].each do |depend|
     context "with a key of #{depend} can have values of commands" do
-      it { is_expected.to allow_value({ depend.to_s => '/usr/bin/doit.sh' }) }
-      it { is_expected.to allow_value({ depend.to_s => ['/usr/bin/doit.sh'] }) }
-      it { is_expected.to allow_value({ depend.to_s => ['-/usr/bin/doit.sh', ':/doit.sh', '+/doit.sh', '!/doit.sh', '!!/doit.sh'] }) }
-      it { is_expected.to allow_value({ depend.to_s => '' }) }
-      it { is_expected.to allow_value({ depend.to_s => [''] }) }
-      it { is_expected.to allow_value({ depend.to_s => ['', '/doit.sh'] }) }
+      it { is_expected.to allow_value({ depend => '/usr/bin/doit.sh' }) }
+      it { is_expected.to allow_value({ depend => ['/usr/bin/doit.sh'] }) }
+      it { is_expected.to allow_value({ depend => ['-/usr/bin/doit.sh', ':/doit.sh', '+/doit.sh', '!/doit.sh', '!!/doit.sh'] }) }
+      it { is_expected.to allow_value({ depend => '' }) }
+      it { is_expected.to allow_value({ depend => [''] }) }
+      it { is_expected.to allow_value({ depend => ['', '/doit.sh'] }) }
     end
   end
 
+  %w[SyslogIdentifier].each do |depend|
+    context "with a key of #{depend} can have values of strings" do
+      it { is_expected.to allow_value({ depend => 'simple' }) }
+      it { is_expected.not_to allow_value({ depend => ['', 'simple'] }) }
+    end
+  end
+
+  it { is_expected.to allow_value({ 'KillMode' => 'mixed' }) }
+  it { is_expected.not_to allow_value({ 'KillMode' => 'wrong' }) }
+
+  it { is_expected.to allow_value({ 'KillSignal' => 'SIGTERM' }) }
+  it { is_expected.not_to allow_value({ 'KillSignal' => 'SIGterm' }) }
+  it { is_expected.not_to allow_value({ 'KillSignal' => 9 }) }
+
   it { is_expected.to allow_value({ 'ExecStart' => 'notabsolute.sh' }) }
   it { is_expected.not_to allow_value({ 'ExecStart' => '*/wrongprefix.sh' }) }
 

types/unit/service.pp

@@ -20,6 +20,9 @@
     Optional['ExecReload']                => Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]],
     Optional['ExecStop']                  => Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]],
     Optional['ExecStopPost']              => Variant[Systemd::Unit::Service::Exec,Array[Systemd::Unit::Service::Exec,1]],
+    Optional['KillSignal']                => Pattern[/^SIG[A-Z]+$/],
+    Optional['KillMode']                  => Enum['control-group', 'mixed', 'process', 'none'],
+    Optional['SyslogIdentifier']          => String,
     Optional['RestartSec']                => String,
     Optional['TimeoutStartSec']           => String,
     Optional['TimeoutStopSec']            => String,