Merge pull request #475 from vchepkov/seconds

allow service time settings to accept Integer values

Author: bastelfreak

REFERENCE.md

@@ -2903,16 +2903,16 @@ Struct[{
     Optional['DevicePolicy']              => Enum['auto','closed','strict'],
     Optional['Slice']                     => String[1],
     Optional['Delegate']                  => Boolean,
-    Optional['RestartSec']                => String,
-    Optional['TimeoutStartSec']           => String,
-    Optional['TimeoutStopSec']            => String,
-    Optional['TimeoutAbortSec']           => String,
-    Optional['TimeoutSec']                => String,
+    Optional['RestartSec']                => Variant[Integer[0],String],
+    Optional['TimeoutStartSec']           => Variant[Integer[0],String],
+    Optional['TimeoutStopSec']            => Variant[Integer[0],String],
+    Optional['TimeoutAbortSec']           => Variant[Integer[0],String],
+    Optional['TimeoutSec']                => Variant[Integer[0],String],
     Optional['TimeoutStartFailureMode']   => Enum['terminate', 'abort', 'kill'],
     Optional['TimeoutStopFailureMode']    => Enum['terminate', 'abort', 'kill'],
-    Optional['RuntimeMaxSec']             => String,
-    Optional['RuntimeRandomizedExtraSec'] => String,
-    Optional['WatchdogSec']               => String,
+    Optional['RuntimeMaxSec']             => Variant[Integer[0],String],
+    Optional['RuntimeRandomizedExtraSec'] => Variant[Integer[0],String],
+    Optional['WatchdogSec']               => Variant[Integer[0],String],
     Optional['Restart']                   => Enum['no', 'on-success', 'on-failure', 'on-abnormal', 'on-watchdog', 'on-abort', 'always'],
     Optional['SuccessExitStatus']         => String,
     Optional['RestartPreventExitStatus']  => String,

types/unit/service.pp

@@ -72,16 +72,16 @@
     Optional['DevicePolicy']              => Enum['auto','closed','strict'],
     Optional['Slice']                     => String[1],
     Optional['Delegate']                  => Boolean,
-    Optional['RestartSec']                => String,
-    Optional['TimeoutStartSec']           => String,
-    Optional['TimeoutStopSec']            => String,
-    Optional['TimeoutAbortSec']           => String,
-    Optional['TimeoutSec']                => String,
+    Optional['RestartSec']                => Variant[Integer[0],String],
+    Optional['TimeoutStartSec']           => Variant[Integer[0],String],
+    Optional['TimeoutStopSec']            => Variant[Integer[0],String],
+    Optional['TimeoutAbortSec']           => Variant[Integer[0],String],
+    Optional['TimeoutSec']                => Variant[Integer[0],String],
     Optional['TimeoutStartFailureMode']   => Enum['terminate', 'abort', 'kill'],
     Optional['TimeoutStopFailureMode']    => Enum['terminate', 'abort', 'kill'],
-    Optional['RuntimeMaxSec']             => String,
-    Optional['RuntimeRandomizedExtraSec'] => String,
-    Optional['WatchdogSec']               => String,
+    Optional['RuntimeMaxSec']             => Variant[Integer[0],String],
+    Optional['RuntimeRandomizedExtraSec'] => Variant[Integer[0],String],
+    Optional['WatchdogSec']               => Variant[Integer[0],String],
     Optional['Restart']                   => Enum['no', 'on-success', 'on-failure', 'on-abnormal', 'on-watchdog', 'on-abort', 'always'],
     Optional['SuccessExitStatus']         => String,
     Optional['RestartPreventExitStatus']  => String,