Rename sshd disable cfg to rancher.ssh.disable

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

cmd/control/console_init.go

@@ -81,7 +81,7 @@ func consoleInitFunc() error {
 		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)
 	}
 

config/schema.go

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

config/types.go

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

os-config.tpl.yml

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

scripts/schema.json

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