slaprunner add promise

software/slaprunner/instance-runner.cfg

@@ -6,6 +6,8 @@ parts =
   dropbear-server-add-authorized-key
   sshkeys-authority
   publish-connection-informations
+  frontend-promise
+
   
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -51,7 +53,7 @@ bytes = 4
 [cloud9]
 recipe = slapos.cookbook:cloud9
 ip = $${slap-network-information:global-ipv6}
-port = 30000
+port = 30001
 wrapper = $${basedirectory:services}/cloud9
 working-directory = $${runnerdirectory:home}
 git-binary = ${git:location}/bin/git
@@ -78,8 +80,8 @@ public_key = $${sshkeys-dropbear:public-key}
 private_key = $${sshkeys-dropbear:private-key}
 ipv4 = $${slap-network-information:local-ipv4}
 ipv6 = $${slap-network-information:global-ipv6}
-proxy_port = 50000
-runner_port = 50000
+proxy_port = 50001
+runner_port = 50001
 partition-amount = 7
 cloud9-url = $${cloud9:access-url}
 wrapper = $${basedirectory:services}/slaprunner
@@ -148,3 +150,20 @@ password_recovery_code = $${recovery-code:passwd}
 [slap-parameter]
 # Default value if no ssh key is specified
 authorized-key =
+
+
+
+# Deploy promises scripts
+#[promise]
+#recipe = slapos.cookbook:check_port_listening
+#path = $${basedirectory:promises}/apache
+#hostname = $${apache-php:ip}
+#port = $${apache-php:port}
+
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+

software/slaprunner/software.cfg

@@ -7,6 +7,7 @@ extends =
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/cloud9/buildout.cfg
+  ../../component/dash/buildout.cfg
 
 parts =
   template
@@ -24,7 +25,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = b25a4c40be2a562afa2569c6e71afecd
+md5sum = 961ac6ea62366afc106da25f2993db23 
 mode = 0644
 
 [eggs]
@@ -71,17 +72,17 @@ slapos.cookbook = 0.60
 slapos.libnetworkcache = 0.12
 slapos.recipe.build = 0.10.2
 slapos.recipe.template = 2.4.1
-slapos.toolbox = 0.28.1
+slapos.toolbox = 0.28
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
 # slapos.core==0.27
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 GitPython = 0.3.2.RC1
 
 # Required by:
@@ -93,11 +94,11 @@ PyXML = 0.8.4
 Sphinx = 1.1.3
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 feedparser = 5.1.2
 
 # Required by:
@@ -110,7 +111,7 @@ inotifyx = 0.2.0
 
 # Required by:
 # slapos.core==0.27
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 # xml-marshaller==0.9.7
 lxml = 2.3.5
 
@@ -123,18 +124,18 @@ netaddr = 0.7.7
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 psutil = 0.6.0
 
 # Required by:
 # slapos.cookbook==0.60
 # slapos.core==0.27
 # slapos.libnetworkcache==0.12
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.28
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2