Merge branch 'slaprunner'

slapos/recipe/slaprunner/__init__.py

@@ -58,6 +58,7 @@ class Recipe(GenericBaseRecipe):
         supervisord_config=os.path.join(self.instance_directory, 'etc',
           'supervisord.conf'),
         runner_workdir=self.workdir,
+        etc=self.etc,
         runner_host=self.ipv6,
         runner_port=self.runner_port,
         ipv4_address=self.ipv4,

software/slaprunner/instance-runner.cfg

@@ -41,6 +41,12 @@ project = $${:home}/project
 software-root = $${:home}/software
 instance-root = $${:home}/instance
 
+#Create password for slaprunner
+[slapunner-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:etc}/.passwd
+bytes = 4
+
 # Deploy cloud9 and slaprunner
 [cloud9]
 recipe = slapos.cookbook:cloud9
@@ -65,6 +71,7 @@ working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}
 software-directory = $${runnerdirectory:software-root}
 instance-directory = $${runnerdirectory:instance-root}
+etc = $${rootdirectory:etc}
 ssh_client = $${sshkeys-dropbear:wrapper}
 public_key = $${sshkeys-dropbear:public-key}
 private_key = $${sshkeys-dropbear:private-key}
@@ -135,7 +142,7 @@ backend_url = $${slaprunner:access-url}
 url =  $${request-frontend:connection-site_url}
 cloud9_url = $${cloud9:access-url}
 ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
-
+passwd = $${slapunner-passwd:passwd}
 
 [slap-parameter]
 # Default value if no ssh key is specified

software/slaprunner/software.cfg

@@ -23,7 +23,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = 0ddddd0be595df4fb15d55e566cc3bc3
+md5sum = 9c7daf59883c4c330064632fdaf329fa
 mode = 0644
 
 [eggs]
@@ -72,18 +72,18 @@ slapos.core = 0.26.2
 slapos.libnetworkcache = 0.12
 slapos.recipe.build = 0.9
 slapos.recipe.template = 2.4
-slapos.toolbox = 0.26
+slapos.toolbox = 0.26.1
 smmap = 0.8.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
 # slapos.core==0.26.2
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 GitPython = 0.3.2.RC1
 
 # Required by:
@@ -95,11 +95,11 @@ PyXML = 0.8.4
 Sphinx = 1.1.3
 
 # Required by:
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 feedparser = 5.1.2
 
 # Required by:
@@ -111,18 +111,18 @@ inotifyx = 0.2.0
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 psutil = 0.5.1
 
 # Required by:
 # slapos.cookbook==0.58
 # slapos.core==0.26.2
 # slapos.libnetworkcache==0.12
-# slapos.toolbox==0.26
+# slapos.toolbox==0.26.1
 # supervisor==3.0a12
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846

stack/slapos.cfg

@@ -53,8 +53,5 @@ eggs =
   slapos.cookbook
 
 [versions]
-# Use patched hexagonit.recipe.download from
-# https://github.com/SlapOS/hexagonit.recipe.download
-hexagonit.recipe.download = 1.5.1-dev-slapos-002
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-006