Use systemd Puppet module for systemd unit files.

The systemd module makes it a little bit easier to manage systemd
unit files.  Specifying unit options as a hash is easier than e.g.
having to build a string from a list of lines ourselves.  The module
also creates the /etc/systemd/system/<UNIT>.d directory, and tells
systemd to reload its configuration, without us having to do it.

README

@@ -31,6 +31,8 @@ If not, see <http://www.gnu.org/licenses/>.
 - bootloader
   Can be found at https://git.lysator.liu.se/bellman/puppet-bootloader.git.
 
+- systemd
+  Can be found at https://git.lysator.liu.se/bellman/puppet-systemd.git.
 
 
 ===== OFFICIAL SOURCE =====

manifests/screensaver/disable.pp

@@ -24,25 +24,21 @@ class console::screensaver::disable
 	    }
 	}
 	'systemd': {
-	    $lines = [
-		'# This file is under Puppet control',
-		'',
-		'[Unit]',
-		'Description=Disable screensaver on the console',
-		'',
-		'[Service]',
-		'Type=oneshot',
-		"ExecStart=/bin/sh -c '${setterm_cmd}'",
-		'',
-		'[Install]',
-		'WantedBy=basic.target',
-	    ]
-	    file {
-		'/etc/systemd/system/screensaver-disable.service':
-		    ensure => file,
-		    content => inline_template('<%=@lines.join("\n")+"\n" %>'),
-		    owner => 'root', group => 'root', mode => '0444',
-		    before => Service['screensaver-disable'];
+	    systemd::unit {
+		'screensaver-disable.service':
+		    options => {
+			'Unit' => {
+			    'Description'=>'Disable screensaver on the console',
+			},
+			'Service' => {
+			    'Type' => 'oneshot',
+			    'ExecStart' => "/bin/sh -c '${setterm_cmd}'",
+			},
+			'Install' => {
+			    'WantedBy' => 'basic.target',
+			},
+		    },
+		    notify => Service['screensaver-disable'];
 	    }
 	    service {
 		'screensaver-disable':

manifests/serial/login.pp

@@ -97,7 +97,6 @@ define console::serial::login::systemd(
 	$termtype,
 )
 {
-    $svcdir = "/etc/systemd/system/serial-getty@${name}.service.d"
     # Systemd cmdline quoting is not *exactly* like shell, but close enough.
     $agetty_cmdline = shellquote(
 	# agetty(8) doc says tty name should be before speeds, but default
@@ -108,23 +107,17 @@ define console::serial::login::systemd(
 	'%I',
 	$termtype
     )
-    $svc_params_cfg = (
-	"[Service]\nExecStart=\nExecStart=-${agetty_cmdline}\n"
-    )
 
-    file {
-	$svcdir:
+    systemd::unit_options {
+	"serial-getty@${name}.service/param":
 	    ensure => $ensure ? {
-		'enabled' => directory, 'disabled' => undef,
+		'enabled' => 'present', 'disabled' => 'absent',
+	    },
+	    options => {
+		'Service' => {
+		    '-ExecStart' => "-${agetty_cmdline}",
 		},
-	    owner => 'root', group => 'root', mode => '0755';
-
-	"${svcdir}/param.conf":
-	    ensure => $ensure ? {
-		'enabled' => file, 'disabled' => absent,
 	    },
-	    content => $svc_params_cfg,
-	    owner => 'root', group => 'root', mode => '0444',
 	    notify => Service["serial-getty@${name}"];
     }