1
0
mirror of https://github.com/rancher/os.git synced 2025-07-13 22:54:03 +00:00

Merge pull request #2070 from vincent99/master

Only add SSH configuration lines that are not set
This commit is contained in:
Sven Dowideit 2017-09-12 11:12:34 +10:00 committed by GitHub
commit 86574b8b61

View File

@ -216,12 +216,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
} }