aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-12 14:35:07 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-12 14:35:07 -0300
commited828e73209ac44cdd50a6f00d605b047ab64be4 (patch)
tree09f7140a14529d8e68a1ba846cc03694417479ef /manifests
parent3ab9ca9a2ea8ce995286e43887e6e23cba2be816 (diff)
downloadpuppet-nodo-ed828e73209ac44cdd50a6f00d605b047ab64be4.tar.gz
puppet-nodo-ed828e73209ac44cdd50a6f00d605b047ab64be4.tar.bz2
Switch to file_line
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystem/ssh/config.pp4
-rw-r--r--manifests/subsystem/ssh/known_hosts.pp12
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/subsystem/ssh/config.pp b/manifests/subsystem/ssh/config.pp
index 6c9fbc3..d790562 100644
--- 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 c20b973..d49dc7d 100644
--- 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,