diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-14 10:49:11 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-14 10:49:11 -0500 |
| commit | e972a3bcf0c95eaf7797d15734257d189ff8c3bf (patch) | |
| tree | fa9bab17b0865caa5edf252274d6dfd5f1057bbb /lib/puppet | |
| parent | b5006897fbf1c52c5a53820d6d1175213027c019 (diff) | |
| parent | 88ec3d808b93058f39bf0c5ac20ed1fcb9477c2b (diff) | |
| download | puppet-e972a3bcf0c95eaf7797d15734257d189ff8c3bf.tar.gz puppet-e972a3bcf0c95eaf7797d15734257d189ff8c3bf.tar.xz puppet-e972a3bcf0c95eaf7797d15734257d189ff8c3bf.zip | |
Merge commit 'ctrlaltdel/ssh-authorized-key' into 0.24.x
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/provider/ssh_authorized_key/parsed.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/type/ssh_authorized_key.rb | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/provider/ssh_authorized_key/parsed.rb b/lib/puppet/provider/ssh_authorized_key/parsed.rb index 228bbc6fc..7cb6626de 100644 --- a/lib/puppet/provider/ssh_authorized_key/parsed.rb +++ b/lib/puppet/provider/ssh_authorized_key/parsed.rb @@ -3,8 +3,7 @@ require 'puppet/provider/parsedfile' Puppet::Type.type(:ssh_authorized_key).provide(:parsed, :parent => Puppet::Provider::ParsedFile, :filetype => :flat, - # Ugly but the parameter is required - :default_target => '/proc/NONEXISTANT' + :default_target => '' ) do desc "Parse and generate authorized_keys files for SSH." diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb index 97521ccab..e28fb7cda 100644 --- a/lib/puppet/type/ssh_authorized_key.rb +++ b/lib/puppet/type/ssh_authorized_key.rb @@ -16,12 +16,9 @@ module Puppet newvalue("ssh-dss") newvalue("ssh-rsa") - newvalue("none") aliasvalue(:dsa, "ssh-dss") aliasvalue(:rsa, "ssh-rsa") - - defaultto "none" end newproperty(:key) do |