Skip to content

Commit 638011f

Browse files
committed
Merge pull request #29 from TelekomLabs/restart
fixes #24
2 parents edeb510 + 09f8f75 commit 638011f

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

attributes/default.rb

+8
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
# Define the server package name
3434
default['sshserver']['package'] = 'openssh-server'
3535

36+
# Define the service name for sshd
37+
case node['platform_family']
38+
when 'rhel', 'fedora', 'suse', 'freebsd', 'gentoo'
39+
default['sshserver']['service_name'] = 'sshd'
40+
else
41+
default['sshserver']['service_name'] = 'ssh'
42+
end
43+
3644
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.'
3745
default['network']['ipv6']['enable'] = false # sshd + ssh
3846
default['ssh']['cbc_required'] = false # sshd + ssh

recipes/server.rb

+29
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,38 @@
1919
# limitations under the License.
2020
#
2121

22+
# installs package name
2223
package 'openssh-server' do
2324
package_name node['sshserver']['package']
2425
end
2526

27+
# defines the sshd service
28+
service 'sshd' do
29+
# use upstart for ubuntu, otherwise chef uses init
30+
# @see http://docs.opscode.com/resource_service.html#providers
31+
case node['platform']
32+
when 'ubuntu'
33+
if node['platform_version'].to_f >= 12.04
34+
provider Chef::Provider::Service::Upstart
35+
end
36+
end
37+
service_name node['sshserver']['service_name']
38+
supports value_for_platform(
39+
'centos' => { 'default' => [:restart, :reload, :status] },
40+
'redhat' => { 'default' => [:restart, :reload, :status] },
41+
'fedora' => { 'default' => [:restart, :reload, :status] },
42+
'scientific' => { 'default' => [:restart, :reload, :status] },
43+
'arch' => { 'default' => [:restart] },
44+
'debian' => { 'default' => [:restart, :reload, :status] },
45+
'ubuntu' => {
46+
'8.04' => [:restart, :reload],
47+
'default' => [:restart, :reload, :status]
48+
},
49+
'default' => { 'default' => [:restart, :reload] }
50+
)
51+
action [:enable, :start]
52+
end
53+
2654
directory '/etc/ssh' do
2755
mode 0755
2856
owner 'root'
@@ -40,6 +68,7 @@
4068
kex: SshKex.get_kexs(node, node['ssh']['weak_kex']),
4169
cipher: SshCipher.get_ciphers(node, node['ssh']['cbc_required'])
4270
)
71+
notifies :restart, 'service[sshd]'
4372
end
4473

4574
def get_key_from(field)

0 commit comments

Comments
 (0)