Cleanup duplicate code in Solaris port.
This code would prevent a catalog from compiling.
This commit is contained in:
parent
5b8317daa5
commit
ec878abe2b
@ -346,57 +346,6 @@ class ssh (
|
||||
}
|
||||
}
|
||||
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
$default_packages = ['openssh-server',
|
||||
'openssh-clients']
|
||||
$default_sshd_config_subsystem_sftp = '/usr/libexec/openssh/sftp-server'
|
||||
$default_service_name = 'sshd'
|
||||
}
|
||||
'Suse': {
|
||||
$default_packages = 'openssh'
|
||||
$default_service_name = 'sshd'
|
||||
case $::architecture {
|
||||
'x86_64': {
|
||||
$default_sshd_config_subsystem_sftp = '/usr/lib64/ssh/sftp-server'
|
||||
}
|
||||
'i386' : {
|
||||
$default_sshd_config_subsystem_sftp = '/usr/lib/ssh/sftp-server'
|
||||
}
|
||||
default: {
|
||||
fail("ssh supports architectures x86_64 and i386 for Suse. Detected architecture is <${::architecture}>.")
|
||||
}
|
||||
}
|
||||
}
|
||||
'Debian': {
|
||||
$default_packages = [ 'openssh-server',
|
||||
'openssh-client']
|
||||
$default_sshd_config_subsystem_sftp = '/usr/lib/openssh/sftp-server'
|
||||
$default_service_name = 'ssh'
|
||||
}
|
||||
default: {
|
||||
fail("ssh supports osfamilies RedHat, Suse and Debian. Detected osfamily is <${::osfamily}>.")
|
||||
}
|
||||
}
|
||||
|
||||
if $packages == 'USE_DEFAULTS' {
|
||||
$packages_real = $default_packages
|
||||
} else {
|
||||
$packages_real = $packages
|
||||
}
|
||||
|
||||
if $service_name == 'USE_DEFAULTS' {
|
||||
$service_name_real = $default_service_name
|
||||
} else {
|
||||
$service_name_real = $service_name
|
||||
}
|
||||
|
||||
if $sshd_config_subsystem_sftp == 'USE_DEFAULTS' {
|
||||
$sshd_config_subsystem_sftp_real = $default_sshd_config_subsystem_sftp
|
||||
} else {
|
||||
$sshd_config_subsystem_sftp_real = $sshd_config_subsystem_sftp
|
||||
}
|
||||
|
||||
package { $packages_real:
|
||||
ensure => installed,
|
||||
source => $ssh_package_source_real,
|
||||
|
Loading…
x
Reference in New Issue
Block a user