rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-19 07:19:05 +00:00
Code Issues Releases Wiki Activity

Rename sshd disable cfg to rancher.ssh.disable

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-07-17 11:15:54 +10:00
parent 6f33622a12
commit 7fb9afe39c
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/control/console_init.go
View File

@ -81,7 +81,7 @@ func consoleInitFunc() error {
log.Error(err) log.Error(err)
} }
if err := writeRespawn("rancher", true, false); err != nil { if err := writeRespawn("rancher", cfg.Rancher.SSH.Daemon, false); err != nil {
log.Error(err) log.Error(err)
} }

2
config/schema.go
View File

@ -146,7 +146,7 @@ var schema = `{
"properties": { "properties": {
"keys": {"type": "object"}, "keys": {"type": "object"},
"disable": {"type": "boolean"} "daemon": {"type": "boolean"}
} }
}, },

2
config/types.go
View File

@ -176,7 +176,7 @@ type DockerConfig struct {
type SSHConfig struct { type SSHConfig struct {
Keys map[string]string `yaml:"keys,omitempty"` Keys map[string]string `yaml:"keys,omitempty"`
Disable bool `yaml:"disable,omitempty"` Daemon bool `yaml:"daemon,omitempty"`
} }
type StateConfig struct { type StateConfig struct {

2
os-config.tpl.yml
View File

@ -14,6 +14,8 @@ rancher:
network: network:
dns: dns:
nameservers: [8.8.8.8, 8.8.4.4] nameservers: [8.8.8.8, 8.8.4.4]
ssh:
daemon: true
bootstrap: bootstrap:
bootstrap: bootstrap:
image: {{.OS_REPO}}/os-bootstrap:{{.VERSION}}{{.SUFFIX}} image: {{.OS_REPO}}/os-bootstrap:{{.VERSION}}{{.SUFFIX}}

2
scripts/schema.json
View File

@ -144,7 +144,7 @@
"properties": { "properties": {
"keys": {"type": "object"}, "keys": {"type": "object"},
"disable": {"type": "boolean"} "daemon": {"type": "boolean"}
} }
}, },