slaprunner: no need to specify port for ssh

software/slaprunner/instance-resilient.cfg.jinja2

@@ -15,7 +15,6 @@
 {% set slaprunner_return = ['init-user', 'init-password', 'url', 'ssh-public-key', 'ssh-url', 'notification-id', 'ip', 'backend-url', 'url', 'ssh-command', 'webdav-url', 'public-url', 'git-public-url', 'git-private-url'] -%}
 {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
 {% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%}
-{% do monitor_parameter.update({'runner-importer-sshd-port': slapparameter_dict.pop('runner-importer-sshd-port')}) -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
 {% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
 

software/slaprunner/instance-runner-import.cfg.in

@@ -38,10 +38,6 @@ parts +=
 proxy_port = 50000
 runner_port = 50005
 
-# Idem for some other services
-[dropbear-runner-server]
-port = $${slap-parameter:runner-importer-sshd-port}
-
 [importer]
 recipe = slapos.recipe.template:jinja2
 template = ${template-runner-import-script:location}/${template-runner-import-script:filename}
@@ -88,6 +84,7 @@ monitor-url = $${publish:monitor-url}
 monitor-user = $${publish:monitor-user}
 monitor-password = $${publish:monitor-password}
 
+
 [monitor-instance-parameter]
 monitor-httpd-port = 8360
 #monitor-title = $${slap-parameter:name}

software/slaprunner/instance-runner.cfg

@@ -214,7 +214,7 @@ keygen-binary = ${dropbear:location}/bin/dropbearkey
 [dropbear-runner-server]
 recipe = slapos.cookbook:dropbear
 host = $${slap-network-information:global-ipv6}
-port = $${slap-parameter:runner-sshd-port}
+port = 22222
 home = $${buildout:directory}
 wrapper = $${directory:bin}/runner_sshd
 shell = ${bash:location}/bin/bash
@@ -559,8 +559,6 @@ monitor-cors-domains =
 monitor-interface-url = 
 # XXX - define a new port for monitor here and use monitor-port for backward compatibility
 monitor-httpd-port = 8386
-runner-sshd-port = 22222
-runner-importer-sshd-port = $${:runner-sshd-port}
 
 [monitor-parameters]
 port = $${slap-parameter:monitor-port}