Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kasra Jamshidi
slapos
Commits
ddd14a3a
Commit
ddd14a3a
authored
Feb 15, 2013
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade BOINC, Condor, Redis and BonjourGrid SR
parent
3a379207
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
47 additions
and
44 deletions
+47
-44
setup.py
setup.py
+2
-2
software/bonjourgrid-client/bonjourgrid-instance.cfg
software/bonjourgrid-client/bonjourgrid-instance.cfg
+4
-4
software/bonjourgrid-client/software.cfg
software/bonjourgrid-client/software.cfg
+2
-2
software/bonjourgrid-client/templates/machineinfo.worker.sh.in
...are/bonjourgrid-client/templates/machineinfo.worker.sh.in
+14
-15
software/bonjourgrid/instance-bonjourgrid.cfg
software/bonjourgrid/instance-bonjourgrid.cfg
+1
-1
software/bonjourgrid/instance-redis.cfg
software/bonjourgrid/instance-redis.cfg
+4
-3
software/bonjourgrid/software.cfg
software/bonjourgrid/software.cfg
+2
-2
software/redis-server/instance-redis.cfg
software/redis-server/instance-redis.cfg
+5
-4
software/redis-server/software.cfg
software/redis-server/software.cfg
+1
-1
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+2
-2
stack/boinc/instance-boinc.cfg
stack/boinc/instance-boinc.cfg
+5
-4
stack/boinc/instance-mariadb.cfg
stack/boinc/instance-mariadb.cfg
+5
-4
No files found.
setup.py
View file @
ddd14a3a
...
@@ -74,7 +74,7 @@ setup(name=name,
...
@@ -74,7 +74,7 @@ setup(name=name,
'apacheperl = slapos.recipe.apacheperl:Recipe'
,
'apacheperl = slapos.recipe.apacheperl:Recipe'
,
'apachephp = slapos.recipe.apachephp:Recipe'
,
'apachephp = slapos.recipe.apachephp:Recipe'
,
'apacheproxy = slapos.recipe.apacheproxy:Recipe'
,
'apacheproxy = slapos.recipe.apacheproxy:Recipe'
,
'boinc = slapos.recipe.boinc:Recipe'
,
'boinc = slapos.recipe.boinc:Recipe'
,
'boinc.app = slapos.recipe.boinc:App'
,
'boinc.app = slapos.recipe.boinc:App'
,
'boinc.client = slapos.recipe.boinc:Client'
,
'boinc.client = slapos.recipe.boinc:Client'
,
'bonjourgrid = slapos.recipe.bonjourgrid:Recipe'
,
'bonjourgrid = slapos.recipe.bonjourgrid:Recipe'
,
...
@@ -86,7 +86,7 @@ setup(name=name,
...
@@ -86,7 +86,7 @@ setup(name=name,
'check_url_available = slapos.recipe.check_url_available:Recipe'
,
'check_url_available = slapos.recipe.check_url_available:Recipe'
,
'cloud9 = slapos.recipe.cloud9:Recipe'
,
'cloud9 = slapos.recipe.cloud9:Recipe'
,
'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe'
,
'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe'
,
'condor = slapos.recipe.condor:Recipe'
,
'condor = slapos.recipe.condor:Recipe'
,
'condor.submit = slapos.recipe.condor:AppSubmit'
,
'condor.submit = slapos.recipe.condor:AppSubmit'
,
'cron = slapos.recipe.dcron:Recipe'
,
'cron = slapos.recipe.dcron:Recipe'
,
'cron.d = slapos.recipe.dcron:Part'
,
'cron.d = slapos.recipe.dcron:Part'
,
...
...
software/bonjourgrid-client/bonjourgrid-instance.cfg
View file @
ddd14a3a
...
@@ -48,8 +48,8 @@ wrapper = $${basedirectory:services}/bonjourGrid-Worker
...
@@ -48,8 +48,8 @@ wrapper = $${basedirectory:services}/bonjourGrid-Worker
log_file = $${basedirectory:log}/bonjourgrid-worker.log
log_file = $${basedirectory:log}/bonjourgrid-worker.log
pid_file = $${basedirectory:run}/bonjourgrid-worker.pid
pid_file = $${basedirectory:run}/bonjourgrid-worker.pid
python-bin = ${buildout:executable}
python-bin = ${buildout:executable}
redis-url = $${slap-parameter:
server-url
}
redis-url = $${slap-parameter:
redis-ip
}
redis-port = $${slap-parameter:
server
-port}
redis-port = $${slap-parameter:
redis
-port}
#Boinc and Condor parameters
#Boinc and Condor parameters
ipv6 = $${slap-network-information:global-ipv6}
ipv6 = $${slap-network-information:global-ipv6}
...
@@ -75,5 +75,5 @@ boinc-account-passwd = $${account-passwd:passwd}
...
@@ -75,5 +75,5 @@ boinc-account-passwd = $${account-passwd:passwd}
[slap-parameter]
[slap-parameter]
user-email = your.email@your.domain.com
user-email = your.email@your.domain.com
full-name = Your Full Name
full-name = Your Full Name
server-url =
redis-ip =
server-port = 6379
redis-port = 6379
\ No newline at end of file
\ No newline at end of file
software/bonjourgrid-client/software.cfg
View file @
ddd14a3a
...
@@ -28,7 +28,7 @@ recipe = slapos.recipe.template
...
@@ -28,7 +28,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/bonjourgrid-instance.cfg
url = ${:_profile_base_location_}/bonjourgrid-instance.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
mode = 0644
mode = 0644
md5sum =
59b55246b2813bc162f528734132df02
md5sum =
79906aff35d05227d177a7e18880e3c0
[bonjourgrid]
[bonjourgrid]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
...
@@ -38,7 +38,7 @@ md5sum = 50f6da04e9cd203a886a9cb4658f8e03
...
@@ -38,7 +38,7 @@ md5sum = 50f6da04e9cd203a886a9cb4658f8e03
[computer-info]
[computer-info]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/templates/machineinfo.worker.sh.in
url = ${:_profile_base_location_}/templates/machineinfo.worker.sh.in
md5sum =
630303e64d98a9af31be7e9f8c0d91b6
md5sum =
3fd602fdf8a4fd30a247752c7c03031a
filename = machineinfo.worker.sh.in
filename = machineinfo.worker.sh.in
download-only = true
download-only = true
...
...
software/bonjourgrid-client/templates/machineinfo.worker.sh.in
View file @
ddd14a3a
#!/bin/sh
#!/bin/sh
# This script generates a file (with the name `hostname`) of the characteristics of the machine
# This script generates a file (with the name `hostname`) of the characteristics of the machine
Mhz
=
`
grep
-i
Mhz /proc/cpuinfo |
cut
-d
:
-f2
|
head
-1
|
cut
-f2
-d
" "
`
Mhz
=
`
grep
-i
Mhz /proc/cpuinfo |
cut
-d
:
-f2
|
head
-1
|
cut
-f2
-d
" "
`
mem
=
`
grep
-i
MemTotal /proc/meminfo |
cut
-f2
-d
:
`
mem
=
`
grep
-i
MemTotal /proc/meminfo |
cut
-f2
-d
:
`
Ram
=
`
echo
$mem
|
cut
-f1
-d
" "
`
Ram
=
`
echo
$mem
|
cut
-f1
-d
" "
`
Cpu
=
`
uname
-a
|
cut
-f3
-d
" "
`
Cpu
=
`
uname
-a
|
cut
-f3
-d
" "
`
H
=
`
hostname
`
H
=
`
hostname
`
Nbproc
=
`
grep
processor /proc/cpuinfo |wc
-l
`
Nbproc
=
`
grep
processor /proc/cpuinfo |wc
-l
`
Ip
=
${
:ip_address
}
Ip
=
${
:ip_address
}
c
=
"{'"
MHZ
"':
\"
$Mhz
\"
,'"
Ram
"':
\"
$Ram
\"
,'"
Cpu
"':
\"
$Cpu
\"
,'"
HOST
"':
\"
$H
\"
,'"
IP
"':
\"
$Ip
\"
}"
c
=
"{'"
MHZ
"':
\"
$Mhz
\"
,'"
Ram
"':
\"
$Ram
\"
,'"
Cpu
"':
\"
$Cpu
\"
,'"
HOST
"':
\"
$H
\"
,'"
IP
"':
\"
$Ip
\"
}"
filename
=
`
hostname
`
filename
=
`
hostname
`
echo
$c
>
$filename
echo
$c
>
$filename
software/bonjourgrid/instance-bonjourgrid.cfg
View file @
ddd14a3a
...
@@ -71,5 +71,5 @@ server-port = $${redis:port}
...
@@ -71,5 +71,5 @@ server-port = $${redis:port}
server-password = $${redis:passwd}
server-password = $${redis:passwd}
worker-number = 1
worker-number = 1
#specified if we want to run BOINC or Condor project:
#specified if we want to run BOINC or Condor project:
#project-type = boinc | condor
| both
#project-type = boinc | condor
project-type = boinc
project-type = boinc
\ No newline at end of file
software/bonjourgrid/instance-redis.cfg
View file @
ddd14a3a
...
@@ -19,7 +19,8 @@ bin = $${buildout:directory}/bin/
...
@@ -19,7 +19,8 @@ bin = $${buildout:directory}/bin/
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run/
scripts = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
run = $${rootdirectory:var}/run/
run = $${rootdirectory:var}/run/
log = $${rootdirectory:var}/log/
log = $${rootdirectory:var}/log/
...
@@ -44,10 +45,10 @@ wrapper = $${basedirectory:services}/redis_server
...
@@ -44,10 +45,10 @@ wrapper = $${basedirectory:services}/redis_server
# Send informations to SlapOS Master
# Send informations to SlapOS Master
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
redis_
url
= $${redis:ipv6}
redis_
ip
= $${redis:ipv6}
redis_port = $${redis:port}
redis_port = $${redis:port}
redis_passwd = $${redis:passwd}
redis_passwd = $${redis:passwd}
redis_password = $${redis:use_passwd}
redis_
uses_
password = $${redis:use_passwd}
[slap-parameter]
[slap-parameter]
use_passwd = false
use_passwd = false
\ No newline at end of file
software/bonjourgrid/software.cfg
View file @
ddd14a3a
...
@@ -37,7 +37,7 @@ recipe = slapos.recipe.template
...
@@ -37,7 +37,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
url = ${:_profile_base_location_}/instance-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
output = ${buildout:directory}/template-bonjourgrid.cfg
mode = 0644
mode = 0644
md5sum =
c1334a8564d5ddbd6f18e06995d8f5ca
md5sum =
16e6f827c1fcc2a62ab8eaea167bf937
[bonjourgrid]
[bonjourgrid]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
...
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template
...
@@ -49,7 +49,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg
url = ${:_profile_base_location_}/instance-redis.cfg
output = ${buildout:directory}/template-redis.cfg
output = ${buildout:directory}/template-redis.cfg
mode = 0644
mode = 0644
md5sum =
d46047a3b6285b12843572b8101e955a
md5sum =
8b223d1fe0ffd40c7151766730da7fcb
[boinc-instance]
[boinc-instance]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
...
software/redis-server/instance-redis.cfg
View file @
ddd14a3a
...
@@ -19,6 +19,7 @@ bin = $${buildout:directory}/bin/
...
@@ -19,6 +19,7 @@ bin = $${buildout:directory}/bin/
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
scripts = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
services = $${rootdirectory:etc}/service/
run = $${rootdirectory:var}/run/
run = $${rootdirectory:var}/run/
log = $${rootdirectory:var}/log/
log = $${rootdirectory:var}/log/
...
@@ -44,10 +45,10 @@ wrapper = $${basedirectory:services}/redis_server
...
@@ -44,10 +45,10 @@ wrapper = $${basedirectory:services}/redis_server
# Send informations to SlapOS Master
# Send informations to SlapOS Master
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
server_url
= $${redis:ipv6}
redis_ip
= $${redis:ipv6}
port = $${redis:port}
redis_
port = $${redis:port}
passwd = $${redis:passwd}
redis_
passwd = $${redis:passwd}
use_master
_password = $${redis:use_passwd}
redis_uses
_password = $${redis:use_passwd}
[slap-parameter]
[slap-parameter]
use_passwd = false
use_passwd = false
\ No newline at end of file
software/redis-server/software.cfg
View file @
ddd14a3a
...
@@ -29,7 +29,7 @@ recipe = slapos.recipe.template
...
@@ -29,7 +29,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg
url = ${:_profile_base_location_}/instance-redis.cfg
output = ${buildout:directory}/template-redis.cfg
output = ${buildout:directory}/template-redis.cfg
mode = 0644
mode = 0644
md5sum =
438ef8177854f78055218413d468b065
md5sum =
8b223d1fe0ffd40c7151766730da7fcb
# Local development
# Local development
[slapos.cookbook-repository]
[slapos.cookbook-repository]
...
...
stack/boinc/buildout.cfg
View file @
ddd14a3a
...
@@ -34,7 +34,7 @@ eggs =
...
@@ -34,7 +34,7 @@ eggs =
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 =
d93a345e9f1aa1e299105437f71189f9
md5sum =
004691e9194eca2fa9cb1033094d3738
mode = 0644
mode = 0644
#Template for deploying MySQL Database Server
#Template for deploying MySQL Database Server
...
@@ -42,7 +42,7 @@ mode = 0644
...
@@ -42,7 +42,7 @@ 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 =
f355b0b29901a0e8b5e173e0cfa24326
md5sum =
8142244a3087a23e002a08225579528a
mode = 0644
mode = 0644
[template-httpd-conf]
[template-httpd-conf]
...
...
stack/boinc/instance-boinc.cfg
View file @
ddd14a3a
...
@@ -38,7 +38,8 @@ project = $${buildout:directory}/projects/
...
@@ -38,7 +38,8 @@ project = $${buildout:directory}/projects/
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
log = $${rootdirectory:var}/log/
log = $${rootdirectory:var}/log/
services = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
scripts = $${rootdirectory:etc}/run/
run = $${rootdirectory:var}/run/
run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/
backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/
promises = $${rootdirectory:etc}/promise/
...
@@ -189,7 +190,7 @@ fullname = $${slap-parameter:full-name}
...
@@ -189,7 +190,7 @@ fullname = $${slap-parameter:full-name}
copyright = $${slap-parameter:copyright-holder}
copyright = $${slap-parameter:copyright-holder}
boinc = ${boinc:location}
boinc = ${boinc:location}
installroot = $${rootdirectory:project}/$${slap-parameter:project}
installroot = $${rootdirectory:project}/$${slap-parameter:project}
wrapper-dir = $${basedirectory:s
ervice
s}
wrapper-dir = $${basedirectory:s
cript
s}
source = ${boinc:source}
source = ${boinc:source}
passwd = $${boinc-passwd:storage-path}
passwd = $${boinc-passwd:storage-path}
#Manualy add develop-egg and boinc-egg to pythonpath
#Manualy add develop-egg and boinc-egg to pythonpath
...
@@ -318,7 +319,7 @@ pid-file = $${basedirectory:run}/apache.pid
...
@@ -318,7 +319,7 @@ pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:s
ervice
s}/slapmonitor
path = $${basedirectory:s
cript
s}/slapmonitor
[slapreport]
[slapreport]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapreport
...
@@ -331,7 +332,7 @@ logbox-user = admin
...
@@ -331,7 +332,7 @@ logbox-user = admin
logbox-passwd = passer
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:s
ervice
s}/slapreport
path = $${basedirectory:s
cript
s}/slapreport
# Publish all instance parameters (url of instance)
# Publish all instance parameters (url of instance)
...
...
stack/boinc/instance-mariadb.cfg
View file @
ddd14a3a
...
@@ -30,7 +30,8 @@ bin = $${buildout:directory}/bin/
...
@@ -30,7 +30,8 @@ bin = $${buildout:directory}/bin/
[basedirectory]
[basedirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
log = $${rootdirectory:var}/log/
log = $${rootdirectory:var}/log/
services = $${rootdirectory:etc}/run/
scripts = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/service/
run = $${rootdirectory:var}/run/
run = $${rootdirectory:var}/run/
backup = $${rootdirectory:srv}/backup/
backup = $${rootdirectory:srv}/backup/
promises = $${rootdirectory:etc}/promise/
promises = $${rootdirectory:etc}/promise/
...
@@ -62,7 +63,7 @@ database = boincdb
...
@@ -62,7 +63,7 @@ database = boincdb
# Paths
# Paths
wrapper = $${basedirectory:services}/mariadb
wrapper = $${basedirectory:services}/mariadb
update-wrapper = $${basedirectory:s
ervice
s}/mariadb_update
update-wrapper = $${basedirectory:s
cript
s}/mariadb_update
logrotate-post = $${rootdirectory:bin}/mariadb_post_logrotate
logrotate-post = $${rootdirectory:bin}/mariadb_post_logrotate
data-directory = $${directory:mariadb-data}
data-directory = $${directory:mariadb-data}
pid-file = $${basedirectory:run}/mariadb.pid
pid-file = $${basedirectory:run}/mariadb.pid
...
@@ -84,7 +85,7 @@ pid-file = $${basedirectory:run}/mariadb.pid
...
@@ -84,7 +85,7 @@ pid-file = $${basedirectory:run}/mariadb.pid
database-path = $${basedirectory:log}/slapmonitor.db
database-path = $${basedirectory:log}/slapmonitor.db
shell-path = ${dash:location}/bin/dash
shell-path = ${dash:location}/bin/dash
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:s
ervice
s}/slapmonitor
path = $${basedirectory:s
cript
s}/slapmonitor
[slapreport]
[slapreport]
recipe = slapos.cookbook:slapreport
recipe = slapos.cookbook:slapreport
...
@@ -97,7 +98,7 @@ logbox-user = admin
...
@@ -97,7 +98,7 @@ logbox-user = admin
logbox-passwd = passer
logbox-passwd = passer
shell-path = ${dash:location}/bin/dash
shell-path = ${dash:location}/bin/dash
slapreport-path = ${buildout:bin-directory}/slapreport
slapreport-path = ${buildout:bin-directory}/slapreport
path = $${basedirectory:s
ervice
s}/slapreport
path = $${basedirectory:s
cript
s}/slapreport
[certificate-authority]
[certificate-authority]
recipe = slapos.cookbook:certificate_authority
recipe = slapos.cookbook:certificate_authority
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment