slaprunner: some work to allow developping the slaprunner into a slaprunner

Changes include:
  * new parameter "no-ipv4-frontend" to prevent the request of an ipv4 frontend. The webrunner cannot provide one, so let's get rid of failing promises.
  * new paramaters to define the ports of the ssh servers (for runner-importer and runner-exporter). Then no colliding when servers run on the same IP.

software/slaprunner/README.rst

@@ -10,6 +10,18 @@ Slaprunner is an all-in-one IDE used to develop and test profiles and recipes fo
 You can learn how to use it here :
 http://community.slapos.org/wiki/slapos-Wiki.Home/developer-Lecture.Web.Runner.Extended
 
+Development
+-----------
+
+Here is an exemple of parameter XML to develop the slaprunner into another slaprunner :
+
+  <?xml version="1.0" encoding="utf-8"?>
+  <instance>
+    <parameter id="runner-importer-sshd-port">22224</parameter>
+    <parameter id="runner-sshd-port">22223</parameter>
+    <parameter id="no-ipv4-frontend">true</parameter>
+  </instance>
+
 Parameters
 ----------
 

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 5fbdf6f9996d6cb948ba042e9dd6e43e
+md5sum = c98c81336cb8c91376737e20bad6636a
 mode = 0644
 
 [template-runner-import-script]
@@ -70,7 +70,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = a41ff9e12a2304224704f6f31529879b
+md5sum = 8dc4898bd7c3071b8969e6305da8d643
 mode = 0644
 
 [template-runner-export-script]
@@ -86,13 +86,13 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = cab358589975d6f250b6363ecc95aab2
+md5sum = b01ad6fef55fab5405d5cf212832e52f
 mode = 0644
 
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = a902b84ac7d1e29a7fdb06cbc7dec150
+md5sum = 56ea5ab49eca534acd22b2028529b7d9
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -15,6 +15,7 @@
 {% 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-export.cfg.in

@@ -14,9 +14,7 @@ parts +=
   sshkeys-authority
   publish-connection-information
   slaprunner-promise
-  slaprunner-frontend-promise
   apache-httpd-promise
-  httpd-frontend-promise
   slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
@@ -38,7 +36,6 @@ parts +=
   monitor-check-resilient-feed-file
   monitor-check-webrunner-internal-instance
 
-
 [exporter]
 recipe = slapos.recipe.template:jinja2
 template = ${template-runner-export-script:location}/${template-runner-export-script:filename}
@@ -56,7 +53,6 @@ monitor-httpd-port = 8437
 # Pass some parameter to dispay in monitoring interface
 instance-configuration =
   httpdcors cors-domain $${slaprunner-httpd-cors:location} $${httpd-graceful-wrapper:output}
-  raw webrunner-url https://$${request-frontend:connection-domain}
 
 # Extends publish section with resilient parameters
 [publish-connection-information]

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

@@ -38,6 +38,10 @@ 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}
@@ -84,7 +88,6 @@ 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-input-schema.json

@@ -62,6 +62,12 @@
             "description": "Name of the instance, to show in the window title",
             "type": "string"
         },
+        "no-ipv4-frontend": {
+            "title": "No IPv4 frontend",
+            "description": "Prevent the slaprunner to order an IPv4 frontend for itself",
+            "enum": ["true", "false"],
+            "default": "false"
+        },
         "custom-frontend-backend-url": {
             "title": "Custom Frontend Backend URL",
             "description": "return an ipv4 frontend of the given ipv6(+optional port)",

software/slaprunner/instance-runner.cfg

@@ -11,9 +11,7 @@ parts =
   sshkeys-authority
   publish-connection-information
   slaprunner-promise
-  slaprunner-frontend-promise
   apache-httpd-promise
-  httpd-frontend-promise
   slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
@@ -29,6 +27,10 @@ parts =
   supervisord-wrapper
   supervisord-promise
   httpd-graceful-wrapper
+{% if slapparameter_dict.get('no-ipv4-frontend', 'false') == 'false' %}
+  slaprunner-frontend-promise
+  httpd-frontend-promise
+{% endif %}
 {% if slapparameter_dict.get('custom-frontend-backend-url') and slapparameter_dict.get('check-custom-frontend-promise', 'false') == 'true' %}
   custom-frontend-promise
 {% endif %}
@@ -212,7 +214,7 @@ keygen-binary = ${dropbear:location}/bin/dropbearkey
 [dropbear-runner-server]
 recipe = slapos.cookbook:dropbear
 host = $${slap-network-information:global-ipv6}
-port = 22222
+port = $${slap-parameter:runner-sshd-port}
 home = $${buildout:directory}
 wrapper = $${directory:bin}/runner_sshd
 shell = ${bash:location}/bin/bash
@@ -422,6 +424,7 @@ name = example.com
 #--
 #-- Request frontend
 
+{% if slapparameter_dict.get('no-ipv4-frontend', 'false') == 'false' -%}
 [request-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
@@ -433,6 +436,14 @@ config-url = $${slaprunner:access-url}
 config-domain = $${slap-parameter:frontend-domain}
 return = site_url domain
 
+[slaprunner-frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${directory:promises}/slaprunner_frontend
+url = https://$${request-frontend:connection-domain}/login
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+check-secure = 1
+
 [request-httpd-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
@@ -454,6 +465,7 @@ dash_path = {{ dash_executable_location }}
 curl_path = {{ curl_executable_location }}
 check-secure = 1
 
+{% endif %}
 
 [htpasswd]
 recipe = slapos.cookbook:generate.password
@@ -480,15 +492,22 @@ password = $${htpasswd:passwd}
 [publish-connection-information]
 recipe = slapos.cookbook:publish
 backend-url = $${slaprunner:access-url}
-url =  https://$${request-frontend:connection-domain}
 init-user = $${runner-htpasswd:user}
 init-password = $${runner-htpasswd:password}
 ssh-command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
-webdav-url = $${request-httpd-frontend:connection-secure_access}/share/
-public-url =  $${request-httpd-frontend:connection-secure_access}/public/
 git-public-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
 git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
 monitor-base-url = $${publish:monitor-base-url}
+{% if slapparameter_dict.get('no-ipv4-frontend', 'false') == 'false' -%}
+url =  https://$${request-frontend:connection-domain}
+webdav-url = $${request-httpd-frontend:connection-secure_access}/share/
+public-url =  $${request-httpd-frontend:connection-secure_access}/public/
+{% else %}
+url =  $${apache-httpd:access-url}
+webdav-url = $${apache-httpd:access-url}/share/
+public-url =  $${apache-httpd:access-url}/public/
+{% endif %}
+
 {% if slapparameter_dict.get('instance-type', '') != 'resilient' -%}
 {% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url}&username=$${publish:monitor-user}&password=$${publish:monitor-password}
@@ -507,14 +526,6 @@ path = $${directory:promises}/slaprunner
 hostname = $${slaprunner:ipv6}
 port = $${slaprunner:runner_port}
 
-[slaprunner-frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promises}/slaprunner_frontend
-url = https://$${request-frontend:connection-domain}/login
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-check-secure = 1
-
 [dropbear-promise]
 recipe = slapos.cookbook:check_port_listening
 path = $${directory:promises}/dropbear
@@ -548,6 +559,8 @@ 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}
@@ -747,7 +760,6 @@ monitor-url-list = {{ slapparameter_dict['monitor-url-list'] }}
 # Pass some parameter to dispay in monitoring interface
 instance-configuration =
   httpdcors cors-domain $${slaprunner-httpd-cors:location} $${httpd-graceful-wrapper:output}
-  raw webrunner-url https://$${request-frontend:connection-domain}
 {% endif -%}
 configuration-file-path = $${buildout:directory}/knowledge0.cfg