Skip to content

Commit

Permalink
Merge pull request dev-sec#19 from bkw/fixSslTypo
Browse files Browse the repository at this point in the history
rename package name attribute from ssl* to ssh*
  • Loading branch information
Patrick Meier committed Jun 16, 2014
2 parents 5ec76f4 + 9d9e251 commit 3d2ef75
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
# Define the client package name
case platform
when 'redhat', 'centos', 'fedora', 'amazon', 'oracle', 'scientific'
default['sslclient']['package'] = 'openssh-clients'
default['sshclient']['package'] = 'openssh-clients'
when 'debian', 'ubuntu'
default['sslclient']['package'] = 'openssh-client'
default['sshclient']['package'] = 'openssh-client'
when 'arch'
default['sslclient']['package'] = 'openssh'
default['sshclient']['package'] = 'openssh'
else
default['sslclient']['package'] = 'openssh-client'
default['sshclient']['package'] = 'openssh-client'
end

# Define the server package name
default['sslserver']['package'] = 'openssh-server'
default['sshserver']['package'] = 'openssh-server'

default['config_disclaimer'] = '**Note:** This file was automatically created by Pinerolo configuration. If you use its automated setup, do not edit this file directly, but adjust the automation instead.'
default['network']['ipv6']['enable'] = false # sshd + ssh
Expand Down
2 changes: 1 addition & 1 deletion recipes/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#

package 'openssh-client' do
package_name node['sslclient']['package']
package_name node['sshclient']['package']
end

directory '/etc/ssh' do
Expand Down
2 changes: 1 addition & 1 deletion recipes/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#

package 'openssh-server' do
package_name node['sslserver']['package']
package_name node['sshserver']['package']
end

directory '/etc/ssh' do
Expand Down

0 comments on commit 3d2ef75

Please sign in to comment.