Update boinc stack

stack/boinc/buildout.cfg

@@ -6,8 +6,6 @@ parts =
   apache-php
   template-mariadb
   template-boinc
-  template
-  boinc-configuration
 
 extends =
   ../../component/boinc/buildout.cfg
@@ -28,13 +26,6 @@ recipe = zc.recipe.egg
 eggs =
   ${mysql-python:egg}
   slapos.toolbox
-  
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-mode = 0644
-md5sum = 4a286795a6822ee6d53743191d5374a6
 
 #Because Boinc deamon and Boinc sheduler(with apache) work side by side, we deploy
 #Boinc and apache-php in the same partition.
@@ -42,7 +33,7 @@ md5sum = 4a286795a6822ee6d53743191d5374a6
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-boinc.cfg
 output = ${buildout:directory}/template-boinc.cfg
-md5sum = f026a82512ac5f9b486e617e5bf392be
+md5sum = 5cbc5fbc1d56a829b64613aaa6ebc27f
 mode = 0644
 
 #Template for deploying MySQL Database Server
@@ -50,10 +41,5 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 4d9907f27910533959e8e56c8438b84a  
+md5sum = f355b0b29901a0e8b5e173e0cfa24326  
 mode = 0644
-
-#default Configuration for boinc project
-[boinc-configuration]
-dbname = boinctest
-project = boinc_test
\ No newline at end of file

stack/boinc/instance-boinc.cfg

@@ -9,6 +9,7 @@ parts =
   logrotate-entry-stunnel
   cron
   cron-entry-logrotate
+  cron-entry-boinc
   promise
   slapmonitor
   slapreport
@@ -38,6 +39,7 @@ run = $${rootdirectory:var}/run/
 backup = $${rootdirectory:srv}/backup/
 promises = $${rootdirectory:etc}/promise/
 application = $${rootdirectory:tmp}/application
+boinc = $${rootdirectory:tmp}/boinc
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -154,11 +156,13 @@ bytes = 4
 [boinc-server]
 recipe = slapos.cookbook:boinc
 home = $${buildout:directory}
-project = ${boinc-configuration:project}
+project = $${slap-parameter:project}
+fullname = $${slap-parameter:full-name}
+copyright = $${slap-parameter:copyright-holder}
 project-config = $${:home}/.$${:project}.conf
 boinc-httpd-conf = $${rootdirectory:etc}/apache_boinc.conf
 boinc = ${boinc:location}
-installroot = $${rootdirectory:project}/${boinc-configuration:project}
+installroot = $${rootdirectory:project}/$${slap-parameter:project}
 wrapper-dir = $${basedirectory:services}
 source = ${boinc:source}
 passwd = $${boinc-passwd:storage-path}
@@ -189,9 +193,6 @@ mysql-database = $${mariadb-urlparse:path}
 mysql-host = $${stunnel:local-host}
 mysql-port = $${stunnel:local-port}
 
-#This value is return by boinc recipe. use it to configure cron
-#cronjob = 
-
 # Deploy logrotate, cron, configure it
 [logrotate]
 recipe = slapos.cookbook:logrotate
@@ -249,6 +250,13 @@ name = logrotate
 frequency = 0 0 * * *
 command = $${logrotate:wrapper}
 
+[cron-entry-boinc]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = cronjob
+frequency = 0,5,10,15,20,25,30,35,40,45,50,55 * * * *
+command = $${boinc-server:installroot}$${boinc-server:project}/bin/start --cron
+
 
 # Request frontend
 [request-frontend]
@@ -314,8 +322,11 @@ curl_path = ${curl:location}/bin/curl
 
 
 [slap-parameter]
-#Default value for instance deployment type. If user want to 'erase' previous project instance or to 'update'(install)
-request-mode = update
+#Default config value for boinc
+dbname = boinctest
+project = boinc_test
+full-name = Boinc Project SAMPLE
+copyright-holder = REPLACE WITH COPYRIGHT HOLDER
 # Default value if no domain is specified
 domain =
 # Default value if no ssh parameter is specified

stack/boinc/instance-mariadb.cfg

@@ -58,7 +58,7 @@ recovering = false
 user = user
 port = 3306
 ip = $${slap-network-information:local-ipv4}
-database = ${boinc-configuration:dbname}
+database = boincdb
 
 # Paths
 wrapper = $${basedirectory:services}/mariadb