slaprunner : shellinabox is now deployed using the recipe,

and also with auto-auth

software/slaprunner/common.cfg

@@ -9,7 +9,9 @@ extends =
   ../../component/lxml-python/buildout.cfg
   ../../component/nginx/buildout.cfg
   ../../component/rsync/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
   ../../component/shellinabox/buildout.cfg
+  ../../component/busybox/buildout.cfg
   ../../stack/flask.cfg
   ../../stack/shacache-client.cfg
   ../../stack/resilient/buildout.cfg
@@ -27,7 +29,7 @@ parts =
   instance-runner-export
   slapos-cookbook
   slapos-cfg-template 
-  shellinabox
+#  shellinabox
 
 develop =
   /opt/slapos.toolbox/

software/slaprunner/instance-runner.cfg

@@ -6,6 +6,7 @@ parts =
   certificate-authority
   ca-nginx
   ca-node-frontend
+  ca-shellinabox
   test-runner
   sshkeys-dropbear-runner
   dropbear-server-add-authorized-key
@@ -20,7 +21,8 @@ parts =
   request-cloud9-frontend
   node-frontend-promise
   nginx-promise
-  shellinabox-launcher
+  shell
+  shellinabox
   environ
   slapos-cfg
   slaprunner-wrapper
@@ -50,6 +52,7 @@ promises = $${:etc}/promise/
 test = $${:etc}/test/
 nginx-data = $${directory:srv}/nginx
 ca-dir = $${:srv}/ssl
+shellinabox = $${:var}/shellinabox
 
 
 [runnerdirectory]
@@ -297,6 +300,14 @@ wrapper = $${directory:services}/node-frontend
 # Put domain name
 name = example.com
 
+[ca-shellinabox]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${shellinabox:wrapper}
+wrapper = $${directory:services}/shellinaboxd
+key-file = $${shellinabox:key-file}
+cert-file = $${shellinabox:cert-file}
+
 #--------------------
 #--
 #-- Request frontend
@@ -438,15 +449,34 @@ context =
   key default_sr slaprunner:default_sr
   key auto_deploy slaprunner:auto_deploy
 
-[shellinabox-frontend]
-bin = ${shellinabox:location}/bin/shellinaboxd
-launcher = $${directory:services}/shellinaboxd
-path-pid = $${directory:run}/shellinaboxd.pid
-
-[shellinabox-launcher]
-recipe = slapos.cookbook:wrapper
-command-line = $${shellinabox-frontend:bin} --cgi
-wrapper-path = $${shellinabox-frontend:launcher}
+[shellinabox]
+recipe = slapos.cookbook:shellinabox
+ipv6 = $${slap-network-information:global-ipv6}
+port = 8080
+shell = $${shell:wrapper}
+wrapper = $${buildout:directory}/bin/shellinaboxd
+shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd 
+password =  
+directory = $${buildout:directory}/
+login-shell = $${buildout:directory}/bin/login
+certificate-directory = $${directory:shellinabox}
+cert-file = $${directory:shellinabox}/public.crt
+key-file = $${directory:shellinabox}/private.key
+
+[shell]
+recipe = slapos.cookbook:shell
+wrapper = $${buildout:directory}/bin/sh
+shell = ${busybox:location}/bin/sh
+home = $${buildout:directory}
+ps1 = "\\w> "
+path =
+    ${busybox:location}/bin/
+    ${busybox:location}/usr/bin/
+    ${git:location}/bin/
+    ${python2.7:location}/bin/
+    ${buildout:bin-directory}/
+    ${busybox:location}/sbin/
+    ${busybox:location}/usr/sbin/
 
 [environ]
 recipe = collective.recipe.environment

software/slaprunner/nginx_conf.in

@@ -67,21 +67,4 @@ http {
             proxy_set_header        X-Forwarded-Host  $http_host;
         }
     }
-    server {
-    	listen [{{ param_nginx_frontend['global-ip'] }}]:4200 ssl;
-	server_name _;
-        ssl_certificate     {{ param_nginx_frontend['ssl-certificate'] }};
-        ssl_certificate_key {{ param_nginx_frontend['ssl-key'] }};
-        ssl_protocols       SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers         HIGH:!aNULL:!MD5;
-	keepalive_timeout 90s;
-        client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
-        proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};
-        fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
-        uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
-        scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
-	location / {
-	    proxy_pass http://localhost:4200;
-	}
-    }
 }