Commit a72cae48 authored by Alain Takoudjou's avatar Alain Takoudjou

Update boinc stack

parent 233a6c84
...@@ -6,8 +6,6 @@ parts = ...@@ -6,8 +6,6 @@ parts =
apache-php apache-php
template-mariadb template-mariadb
template-boinc template-boinc
template
boinc-configuration
extends = extends =
../../component/boinc/buildout.cfg ../../component/boinc/buildout.cfg
...@@ -29,20 +27,13 @@ eggs = ...@@ -29,20 +27,13 @@ eggs =
${mysql-python:egg} ${mysql-python:egg}
slapos.toolbox 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 #Because Boinc deamon and Boinc sheduler(with apache) work side by side, we deploy
#Boinc and apache-php in the same partition. #Boinc and apache-php in the same partition.
[template-boinc] [template-boinc]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg output = ${buildout:directory}/template-boinc.cfg
md5sum = f026a82512ac5f9b486e617e5bf392be md5sum = 5cbc5fbc1d56a829b64613aaa6ebc27f
mode = 0644 mode = 0644
#Template for deploying MySQL Database Server #Template for deploying MySQL Database Server
...@@ -50,10 +41,5 @@ mode = 0644 ...@@ -50,10 +41,5 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-mariadb.cfg url = ${:_profile_base_location_}/instance-mariadb.cfg
output = ${buildout:directory}/template-mariadb.cfg output = ${buildout:directory}/template-mariadb.cfg
md5sum = 4d9907f27910533959e8e56c8438b84a md5sum = f355b0b29901a0e8b5e173e0cfa24326
mode = 0644 mode = 0644
#default Configuration for boinc project
[boinc-configuration]
dbname = boinctest
project = boinc_test
\ No newline at end of file
...@@ -9,6 +9,7 @@ parts = ...@@ -9,6 +9,7 @@ parts =
logrotate-entry-stunnel logrotate-entry-stunnel
cron cron
cron-entry-logrotate cron-entry-logrotate
cron-entry-boinc
promise promise
slapmonitor slapmonitor
slapreport slapreport
...@@ -38,6 +39,7 @@ run = $${rootdirectory:var}/run/ ...@@ -38,6 +39,7 @@ run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/ backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/ promises = $${rootdirectory:etc}/promise/
application = $${rootdirectory:tmp}/application application = $${rootdirectory:tmp}/application
boinc = $${rootdirectory:tmp}/boinc
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -154,11 +156,13 @@ bytes = 4 ...@@ -154,11 +156,13 @@ bytes = 4
[boinc-server] [boinc-server]
recipe = slapos.cookbook:boinc recipe = slapos.cookbook:boinc
home = $${buildout:directory} 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 project-config = $${:home}/.$${:project}.conf
boinc-httpd-conf = $${rootdirectory:etc}/apache_boinc.conf boinc-httpd-conf = $${rootdirectory:etc}/apache_boinc.conf
boinc = ${boinc:location} boinc = ${boinc:location}
installroot = $${rootdirectory:project}/${boinc-configuration:project} installroot = $${rootdirectory:project}/$${slap-parameter:project}
wrapper-dir = $${basedirectory:services} wrapper-dir = $${basedirectory:services}
source = ${boinc:source} source = ${boinc:source}
passwd = $${boinc-passwd:storage-path} passwd = $${boinc-passwd:storage-path}
...@@ -189,9 +193,6 @@ mysql-database = $${mariadb-urlparse:path} ...@@ -189,9 +193,6 @@ mysql-database = $${mariadb-urlparse:path}
mysql-host = $${stunnel:local-host} mysql-host = $${stunnel:local-host}
mysql-port = $${stunnel:local-port} mysql-port = $${stunnel:local-port}
#This value is return by boinc recipe. use it to configure cron
#cronjob =
# Deploy logrotate, cron, configure it # Deploy logrotate, cron, configure it
[logrotate] [logrotate]
recipe = slapos.cookbook:logrotate recipe = slapos.cookbook:logrotate
...@@ -249,6 +250,13 @@ name = logrotate ...@@ -249,6 +250,13 @@ name = logrotate
frequency = 0 0 * * * frequency = 0 0 * * *
command = $${logrotate:wrapper} 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
[request-frontend] [request-frontend]
...@@ -314,8 +322,11 @@ curl_path = ${curl:location}/bin/curl ...@@ -314,8 +322,11 @@ curl_path = ${curl:location}/bin/curl
[slap-parameter] [slap-parameter]
#Default value for instance deployment type. If user want to 'erase' previous project instance or to 'update'(install) #Default config value for boinc
request-mode = update dbname = boinctest
project = boinc_test
full-name = Boinc Project SAMPLE
copyright-holder = REPLACE WITH COPYRIGHT HOLDER
# Default value if no domain is specified # Default value if no domain is specified
domain = domain =
# Default value if no ssh parameter is specified # Default value if no ssh parameter is specified
......
...@@ -58,7 +58,7 @@ recovering = false ...@@ -58,7 +58,7 @@ recovering = false
user = user user = user
port = 3306 port = 3306
ip = $${slap-network-information:local-ipv4} ip = $${slap-network-information:local-ipv4}
database = ${boinc-configuration:dbname} database = boincdb
# Paths # Paths
wrapper = $${basedirectory:services}/mariadb wrapper = $${basedirectory:services}/mariadb
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment