Merge pull request #580 from voxpupuli/allow-system-dropins

Add support for system-wide drop-ins

Author: kenyon

REFERENCE.md

@@ -64,6 +64,7 @@
 * [`Systemd::Capabilities`](#Systemd--Capabilities): Defines allowed capabilities
 * [`Systemd::CoredumpSettings`](#Systemd--CoredumpSettings): Configurations for coredump.conf
 * [`Systemd::Dropin`](#Systemd--Dropin): custom datatype that validates filenames/paths for valid systemd dropin files
+* [`Systemd::Dropin_unit`](#Systemd--Dropin_unit): Validates a drop-in unit name
 * [`Systemd::Interface`](#Systemd--Interface): network interface definition
 * [`Systemd::Interface::Link`](#Systemd--Interface--Link): Network device configuration(Link)
 * [`Systemd::Interface::Link::Link`](#Systemd--Interface--Link--Link): Network device configuration(Link) Link section definition
@@ -181,6 +182,7 @@
 * [`Systemd::Unit::Timer`](#Systemd--Unit--Timer): Possible keys for the [Timer] section of a unit file
 * [`Systemd::Unit::Timespan`](#Systemd--Unit--Timespan): Timer specification for systemd time spans, e.g. timers.
 * [`Systemd::Unit::Unit`](#Systemd--Unit--Unit): Possible keys for the [Unit] section of a unit file
+* [`Systemd::Unit_type`](#Systemd--Unit_type): Validates a unit types
 
 ### Tasks
 
@@ -1016,7 +1018,7 @@ The following parameters are available in the `systemd::dropin_file` defined typ
 
 ##### <a name="-systemd--dropin_file--unit"></a>`unit`
 
-Data type: `Systemd::Unit`
+Data type: `Systemd::Dropin_unit`
 
 The target unit file to create
 
@@ -3107,6 +3109,15 @@ custom datatype that validates filenames/paths for valid systemd dropin files
 
 Alias of `Pattern['^[^/]+\.conf$']`
 
+### <a name="Systemd--Dropin_unit"></a>`Systemd::Dropin_unit`
+
+Validates a drop-in unit name
+
+* **See also**
+  * https://www.freedesktop.org/software/systemd/man/systemd.unit.html
+
+Alias of `Variant[Systemd::Unit, Systemd::Unit_type]`
+
 ### <a name="Systemd--Interface"></a>`Systemd::Interface`
 
 network interface definition
@@ -6166,6 +6177,15 @@ Struct[{
   }]
 ```
 
+### <a name="Systemd--Unit_type"></a>`Systemd::Unit_type`
+
+Validates a unit types
+
+* **See also**
+  * https://www.freedesktop.org/software/systemd/man/systemd.unit.html
+
+Alias of `Enum['automount', 'device', 'mount', 'path', 'scope', 'service', 'slice', 'socket', 'swap', 'target', 'timer']`
+
 ## Tasks
 
 ### <a name="systemctl_show"></a>`systemctl_show`

manifests/dropin_file.pp

@@ -20,7 +20,7 @@
 # @param daemon_reload Call systemd::daemon_reload
 #
 define systemd::dropin_file (
-  Systemd::Unit                               $unit,
+  Systemd::Dropin_unit                        $unit,
   Systemd::Dropin                             $filename                = $name,
   Enum['present', 'absent', 'file']           $ensure                  = 'present',
   Stdlib::Absolutepath                        $path                    = '/etc/systemd/system',

spec/defines/dropin_file_spec.rb

@@ -183,6 +183,16 @@
             expect(subject).not_to create_systemd__daemon_reload(params[:unit])
           }
         end
+
+        context 'with system dropins' do
+          let(:params) do
+            super().merge(unit: 'service')
+          end
+
+          it { is_expected.to compile.with_all_deps }
+
+          it { is_expected.to contain_file("/etc/systemd/system/#{params[:unit]}.d/#{title}") }
+        end
       end
     end
   end

types/dropin_unit.pp

@@ -0,0 +1,6 @@
+# @summary Validates a drop-in unit name
+# @see https://www.freedesktop.org/software/systemd/man/systemd.unit.html
+type Systemd::Dropin_unit = Variant[
+  Systemd::Unit,
+  Systemd::Unit_type,
+]

types/unit_type.pp

@@ -0,0 +1,15 @@
+# @summary Validates a unit types
+# @see https://www.freedesktop.org/software/systemd/man/systemd.unit.html
+type Systemd::Unit_type = Enum[
+  'automount',
+  'device',
+  'mount',
+  'path',
+  'scope',
+  'service',
+  'slice',
+  'socket',
+  'swap',
+  'target',
+  'timer',
+]