Skip to content

Commit

Permalink
Merge pull request #290 from FSchumacher/fix-typos
Browse files Browse the repository at this point in the history
Fix some typos
  • Loading branch information
sheenaajay authored Sep 18, 2019
2 parents 9119c5d + 8bae627 commit 5a9b721
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions lib/puppet/provider/java_ks/keytool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def command_keytool
end

# Keytool can only import a keystore if the format is pkcs12. Generating and
# importing a keystore is used to add private_key and certifcate pairs.
# importing a keystore is used to add private_key and certificate pairs.
def to_pkcs12(path)
case private_key_type
when :rsa
Expand All @@ -33,7 +33,7 @@ def to_pkcs12(path)
end

# Keytool can only import a jceks keystore if the format is der. Generating and
# importing a keystore is used to add private_key and certifcate pairs.
# importing a keystore is used to add private_key and certificate pairs.
def to_der(path)
x509_cert = OpenSSL::X509::Certificate.new File.read certificate
File.open(path, 'wb') { |f| f.print x509_cert.to_der }
Expand Down Expand Up @@ -229,7 +229,7 @@ def create
if !certificate.nil? && !private_key.nil?
import_ks
elsif certificate.nil? && !private_key.nil?
raise Puppet::Error, 'Keytool is not capable of importing a private key without an accomapaning certificate.'
raise Puppet::Error, 'Keytool is not capable of importing a private key without an accompanying certificate.'
elsif storetype == :jceks
import_jceks
elsif storetype == :pkcs12
Expand Down Expand Up @@ -294,7 +294,7 @@ def storetype
def run_command(cmd, target = false, stdinfile = false, env = {})
env[:PATH] = @resource[:path].join(File::PATH_SEPARATOR) if resource[:path]

# The Puppet::Util::Execution.execute method is deparcated in Puppet 3.x
# The Puppet::Util::Execution.execute method is deprecated in Puppet 3.x
# but we need this to work on 2.7.x too.
exec_method = if Puppet::Util::Execution.respond_to?(:execute)
Puppet::Util::Execution.method(:execute)
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/type/java_ks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
desc 'Has three states: present, absent, and latest. Latest
will compare the on disk SHA1 fingerprint of the certificate to that
in keytool to determine if insync? returns true or false. We redefine
insync? for this paramerter to accomplish this.'
insync? for this parameter to accomplish this.'

newvalue(:present) do
provider.create
Expand Down

0 comments on commit 5a9b721

Please sign in to comment.