Skip to content

Commit b01984c

Browse files
committed
fix module on gentoo linux
1 parent 8df221d commit b01984c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

manifests/params.pp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
$ssh_config = '/etc/ssh/ssh_config'
99
$ssh_known_hosts = '/etc/ssh/ssh_known_hosts'
1010
$service_name = 'ssh'
11+
$sftp_server_path = '/usr/lib/openssh/sftp-server'
1112
}
1213
redhat: {
1314
$server_package_name = 'openssh-server'
@@ -17,6 +18,7 @@
1718
$ssh_config = '/etc/ssh/ssh_config'
1819
$ssh_known_hosts = '/etc/ssh/ssh_known_hosts'
1920
$service_name = 'sshd'
21+
$sftp_server_path = '/usr/lib/openssh/sftp-server'
2022
}
2123
freebsd: {
2224
$server_package_name = undef
@@ -25,6 +27,7 @@
2527
$ssh_config = '/etc/ssh/ssh_config'
2628
$ssh_known_hosts = '/etc/ssh/ssh_known_hosts'
2729
$service_name = 'sshd'
30+
$sftp_server_path = '/usr/lib/openssh/sftp-server'
2831
}
2932
default: {
3033
case $::operatingsystem {
@@ -36,6 +39,7 @@
3639
$ssh_config = '/etc/ssh/ssh_config'
3740
$ssh_known_hosts = '/etc/ssh/ssh_known_hosts'
3841
$service_name = 'sshd'
42+
$sftp_server_path = '/usr/lib/misc/sftp-server'
3943
}
4044
default: {
4145
fail("Unsupported platform: ${::osfamily}/${::operatingsystem}")
@@ -49,15 +53,14 @@
4953
'X11Forwarding' => 'yes',
5054
'PrintMotd' => 'no',
5155
'AcceptEnv' => 'LANG LC_*',
52-
'Subsystem' => 'sftp /usr/lib/openssh/sftp-server',
56+
'Subsystem' => "sftp ${sftp_server_path}",
5357
'UsePAM' => 'yes',
5458
}
5559

5660
$ssh_default_options = {
5761
'Host *' => {
5862
'SendEnv' => 'LANG LC_*',
5963
'HashKnownHosts' => 'yes',
60-
'GSSAPIAuthentication' => 'yes',
6164
},
6265
}
6366
}

0 commit comments

Comments
 (0)