Add dropbear server in slaprunner

software/slaprunner/instance-runner.cfg

+[buildout]
+parts =
+  instance
+  sshkeys-dropbear
+  dropbear-server-add-authorized-key
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+slaprunner = ${buildout:directory}/bin/slaprunner
+slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
+slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
+slapproxy = ${buildout:directory}/bin/slapproxy
+supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
+git = ${git:location}/bin/git
+node-bin = ${nodejs:location}/bin/node
+cloud9 = ${cloud9:location}/bin/cloud9.js
+ssh_client = $${sshkeys-dropbear:wrapper}
+public_key = $${sshkeys-dropbear:public-key}
+private_key = $${sshkeys-dropbear:private-key}
+
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+# Deploy dropbear (minimalist SSH server)
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+[sshkeys-authority]
+recipe = slapos.cookbook:sshkeys_authority
+request-directory = $${sshkeys-directory:requests}
+keys-directory = $${sshkeys-directory:keys}
+wrapper = $${basedirectory:services}/sshkeys_authority
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${directory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = /bin/bash
+rsa-keyfile = $${directory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = dropbear
+type = rsa
+executable = $${dropbear-server:wrapper}
+public-key = $${dropbear-server:rsa-keyfile}.pub
+private-key = $${dropbear-server:rsa-keyfile}
+wrapper = $${basedirectory:services}/sshd
+
+[dropbear-server-add-authorized-key]
+<= dropbear-server
+recipe = slapos.cookbook:dropbear.add_authorized_key
+key = $${slap-parameter:authorized-key}
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sshkeys = $${rootdirectory:srv}/sshkeys
+services = $${rootdirectory:etc}/run/
+ssh = $${rootdirectory:etc}/ssh/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
+
+[slap-parameter]
+# Default value if no ssh key is specified
+authorized-key =

software/slaprunner/instance.cfg

 [buildout]
 parts =
-  instance
-  sshkeys-authority
-  sshkeys-dropbear
-  dropbear-client
+  switch_softwaretype
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-slaprunner = ${buildout:directory}/bin/slaprunner
-slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
-slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
-slapproxy = ${buildout:directory}/bin/slapproxy
-supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
-git = ${git:location}/bin/git
-node-bin = ${nodejs:location}/bin/node
-cloud9 = ${cloud9:location}/bin/cloud9.js
-ssh_client = $${sshkeys-dropbear:wrapper}
-public_key = $${sshkeys-dropbear:public-key}
-private_key = $${sshkeys-dropbear:private-key}
-
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests/
-keys = $${directory:sshkeys}/keys/
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${directory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-client:wrapper}
-public-key = $${dropbear-client:identity-file}.pub
-private-key = $${dropbear-client:identity-file}
-wrapper = $${rootdirectory:bin}/dbclient
-
-[dropbear-client]
-recipe = slapos.cookbook:dropbear.client
-dbclient-binary = ${dropbear:location}/bin/dbclient
-identity-file = $${directory:ssh}/id_rsa
-wrapper = $${rootdirectory:bin}/dbclient_raw
-home = $${rootdirectory:etc}/ssh/
-force-host-key = True
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sshkeys = $${rootdirectory:srv}/sshkeys
-services = $${rootdirectory:etc}/run/
-ssh = $${rootdirectory:etc}/ssh/
\ No newline at end of file
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-runner:output}
\ No newline at end of file

software/slaprunner/software.cfg

@@ -28,7 +28,14 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = a618c3d13adbbb71184a565f57f6d8b8
+md5sum = 5307e4200f044ae57b504ad68444491c
+
+[template-runner]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-runner.cfg
+output = ${buildout:directory}/template-runner.cfg
+md5sum = c24f4a76c9e8be5f5b83af28daf0fca1
+mode = 0644
 
 [eggs]
 eggs +=