Switch to file_line

diff --git a/manifests/subsystem/ssh/config.pp b/manifests/subsystem/ssh/config.pp
index 6c9fbc31bbd0cef12a5162e495891353dda384fc..d79056231a5bd7d25a7597c50fad0b7d4a230ba5 100644 (file)
--- a/manifests/subsystem/ssh/config.pp
+++ b/manifests/subsystem/ssh/config.pp
@@ -23,8 +23,8 @@ define nodo::subsystem::ssh::config(
   # for automated deployment environments so your ikiwiki user doesn't
   # get stuck with the fingerprint confirmation prompt when pushing
   # content via ssh in the first time it runs.
-  line { 'NoHostAuthenticationForLocalhost-${owner}':
-    file   => "${home}/.ssh/config",
+  file_line { 'NoHostAuthenticationForLocalhost-${owner}':
+    path   => "${home}/.ssh/config",
     line   => "NoHostAuthenticationForLocalhost yes",
     ensure => $ssh_localhost_auth ? {
       'auto'        => present,

diff --git a/manifests/subsystem/ssh/known_hosts.pp b/manifests/subsystem/ssh/known_hosts.pp
index c20b9730b38897b1a943793b65b584aebeb65b42..d49dc7dadb2d6626e126998f526dc3274e776c33 100644 (file)
--- a/manifests/subsystem/ssh/known_hosts.pp
+++ b/manifests/subsystem/ssh/known_hosts.pp
@@ -21,8 +21,8 @@ define nodo::subsystem::ssh::known_host(
   # You can choose to include the host's fingeprints
   # directly into the known_hosts file.
   if $::sshrsakey != '' {
-    line { 'known_hosts-localhost-rsa-${owner}':
-      file   => "${home}/.ssh/known_hosts",
+    file_line { 'known_hosts-localhost-rsa-${owner}':
+      path   => "${home}/.ssh/known_hosts",
       line   => "localhost ssh-rsa ${::sshrsakey}",
       ensure => $ssh_localhost_auth ? {
         'fingerprint' => present,
@@ -33,8 +33,8 @@ define nodo::subsystem::ssh::known_host(
   }
 
   if $::sshdsakey != '' {
-    line { 'known_hosts-localhost-dsa-${owner}':
-      file   => "${home}/.ssh/known_hosts",
+    file_line { 'known_hosts-localhost-dsa-${owner}':
+      path   => "${home}/.ssh/known_hosts",
       line   => "localhost ssh-dss ${::sshdsakey}",
       ensure => $ssh_localhost_auth ? {
         'fingerprint' => present,
@@ -45,8 +45,8 @@ define nodo::subsystem::ssh::known_host(
   }
 
   if $::sshecdsakey != '' {
-    line { 'known_hosts-localhost-ecdsa-${owner}':
-      file   => "${home}/.ssh/known_hosts",
+    file_line { 'known_hosts-localhost-ecdsa-${owner}':
+      path   => "${home}/.ssh/known_hosts",
       line   => "localhost ecdsa-sha2-nistp256 ${::sshedsakey}",
       ensure => $ssh_localhost_auth ? {
         'fingerprint' => present,