rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-24 09:28:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2070 from vincent99/master

Browse Source 
Only add SSH configuration lines that are not set
(cherry picked from commit 86574b8b61)
This commit is contained in:
Sven Dowideit 2017-09-12 11:12:34 +10:00
parent 98cb81f536
commit bc0b0132c2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/control/console_init.go
View File

@ -218,12 +218,12 @@ func modifySshdConfig() error {
sshdConfigString := string(sshdConfig) sshdConfigString := string(sshdConfig)
for _, item := range []string{ for _, item := range []string{
"UseDNS no", "UseDNS ",
"PermitRootLogin no", "PermitRootLogin ",
"ServerKeyBits 2048", "ServerKeyBits ",
"AllowGroups docker", "AllowGroups ",
} { } {
match, err := regexp.Match("^"+item, sshdConfig) match, err := regexp.Match("(?m)^"+item, sshdConfig)
if err != nil { if err != nil {
return err return err
} }