Add BOINC content promise

software/boinc/boinc-app.cfg

@@ -14,6 +14,7 @@ parts  =
   slapmonitor
   slapreport
   frontend-promise
+  content-promise
   publish-connection-informations
   boinc-app
 

software/boinc/software.cfg

 [buildout]
 
 parts = 
-  slapos.cookbook-repository
-  check-recipe
   boinc-instance
   template
   boinc-application
@@ -11,6 +9,8 @@ parts =
   template_input
   slapos-cookbook
   instance-egg
+  slapos.cookbook-repository
+  check-recipe
 
 extends =
   ../../stack/boinc/buildout.cfg
@@ -21,7 +21,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/boinc-app.cfg
 output = ${buildout:directory}/template-app.cfg
 mode = 0644
-md5sum = ecec6192ac5b361e326cb2f1bd5f97dc
+md5sum = c30c21128e6522d0d6578466f5792517
 
 [template]
 recipe = slapos.recipe.template

stack/boinc/buildout.cfg

@@ -40,7 +40,7 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-boinc.cfg
 output = ${buildout:directory}/template-boinc.cfg
-md5sum = 1e57f587e1408cae8102abcecd22dd38
+md5sum = cb4ac3f37266731cfa4e9f304266cb77
 mode = 0644
 
 #Template for deploying MySQL Database Server
@@ -68,41 +68,41 @@ update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 
 [versions]
-Jinja2 = 2.6
 MySQL-python = 1.2.3
+Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.1
+apache-libcloud = 0.11.3
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-meld3 = 0.6.8
+meld3 = 0.6.9
 plone.recipe.command = 1.1
 pycrypto = 2.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.30
+slapos.toolbox = 0.31.1
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.28.6
-# slapos.toolbox==0.30
+# slapos.core==0.31.2
+# slapos.toolbox==0.31.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.61-dev
+# slapos.cookbook==0.68.2-dev
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31.1
 feedparser = 5.1.2
 
 # Required by:
@@ -110,57 +110,61 @@ feedparser = 5.1.2
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.61-dev
+# slapos.cookbook==0.68.2-dev
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.core==0.28.6
-# slapos.toolbox==0.30
+# slapos.core==0.31.2
+# slapos.toolbox==0.31.1
 # xml-marshaller==0.9.7
-lxml = 3.0alpha2
+lxml = 2.3.6
 
 # Required by:
-# slapos.cookbook==0.61-dev
+# slapos.cookbook==0.68.2-dev
 netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.28.6
+# slapos.core==0.31.2
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.30
-paramiko = 1.7.7.2
+# slapos.toolbox==0.31.1
+paramiko = 1.8.0
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31.1
 psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.61-dev
-# slapos.core==0.28.6
-# slapos.toolbox==0.30
-# zc.buildout==1.6.0-dev-SlapOS-006
+# slapos.cookbook==0.68.2-dev
+pytz = 2012f
+
+# Required by:
+# slapos.cookbook==0.68.2-dev
+# slapos.core==0.31.2
+# slapos.toolbox==0.31.1
+# zc.buildout==1.6.0-dev-SlapOS-010
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.61-dev
-# slapos.toolbox==0.30
-slapos.core = 0.28.6
+# slapos.cookbook==0.68.2-dev
+# slapos.toolbox==0.31.1
+slapos.core = 0.31.2
 
 # Required by:
-# slapos.core==0.28.6
+# slapos.core==0.31.2
 supervisor = 3.0b1
 
 # Required by:
-# slapos.cookbook==0.61-dev
-# slapos.toolbox==0.30
+# slapos.cookbook==0.68.2-dev
+# slapos.toolbox==0.31.1
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.61-dev
+# slapos.cookbook==0.68.2-dev
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.28.6
+# slapos.core==0.31.2
 zope.interface = 4.0.1

stack/boinc/instance-boinc.cfg

@@ -14,6 +14,7 @@ parts =
   slapmonitor
   slapreport
   frontend-promise
+  content-promise
   publish-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
@@ -175,7 +176,6 @@ python-binary = ${buildout:executable}
 perl-binary = ${perl:location}/bin
 
 #Apache and php
-www-data = $${apache-php:htdocs}
 ip = $${apache-php:ip}
 port = $${apache-php:port}
 httpd-conf = $${apache-php:httpd-conf}
@@ -184,6 +184,7 @@ apache-wrapper = $${apache-php:wrapper}
 htpasswd  = ${apache:location}/bin/htpasswd
 php-ini = $${apache-php:php-ini-dir}/php.ini
 php-bin = ${apache-php:location}/bin/php
+pid-file = $${apache-php:pid-file}
 php-wrapper = $${rootdirectory:bin}php
 
 #Mysql Informations
@@ -320,6 +321,12 @@ url = $${request-frontend:connection-site_url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
+[content-promise]
+recipe = slapos.cookbook:check_page_content
+path = $${basedirectory:promises}/content
+url = $${boinc-server:home_page}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
 
 [slap-parameter]
 #Default config value for boinc