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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Aurel
slapos
Commits
453b3265
Commit
453b3265
authored
11 years ago
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'grid-computing'
parents
67b54a3d
188d2fa7
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
114 deletions
+13
-114
software/ajaxplorer/software.cfg
software/ajaxplorer/software.cfg
+2
-20
software/boinc-client/software.cfg
software/boinc-client/software.cfg
+3
-24
software/boinc/software.cfg
software/boinc/software.cfg
+0
-23
software/condor/software.cfg
software/condor/software.cfg
+3
-22
software/redis-server/software.cfg
software/redis-server/software.cfg
+3
-24
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+2
-1
No files found.
software/ajaxplorer/software.cfg
View file @
453b3265
[buildout]
develop =
${:parts-directory}/slapos.cookbook-repository
parts =
slapos-cookbook
subversion
...
...
@@ -14,8 +11,6 @@ parts =
application
website1-template
website2-template
slapos.cookbook-repository
check-recipe
extends =
../../stack/slapos.cfg
...
...
@@ -28,7 +23,6 @@ extends =
../../component/dash/buildout.cfg
../../component/stunnel/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/git/buildout.cfg
[instance]
recipe = slapos.recipe.template
...
...
@@ -86,19 +80,6 @@ filename = apache.conf.in
md5sum = 6788381fadd8ca96f892d33df3163da0
location = ${buildout:parts-directory}/${:_buildout_section_name_}
# Local development
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
branch = grid-computing
git-executable = ${git:location}/bin/git
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[networkcache]
# signature certificates of the following uploaders.
# Romain Courteaud
...
...
@@ -222,6 +203,7 @@ lxml = 3.1.1
numpy = 1.6.2
# websockify 0.4.1 doesn't install well
websockify = 0.3.0
slapos.cookbook=0.78.1
setuptools = 0.6c12dev-r88846
...
...
@@ -247,7 +229,7 @@ z3c.recipe.mkdir = 0.5
Flask = 0.9
# Required by:
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
lock-file = 2.0
# Required by:
...
...
This diff is collapsed.
Click to expand it.
software/boinc-client/software.cfg
View file @
453b3265
[buildout]
# Local development - to be remove
develop =
${:parts-directory}/slapos.cookbook-repository
parts=
slapos-cookbook
boinc
template
template-boinc
slapos.cookbook-repository
check-recipe
extends =
../../component/boinc-client/buildout.cfg
../../component/git/buildout.cfg
../../stack/slapos.cfg
[template]
...
...
@@ -32,22 +26,6 @@ md5sum = 4a50c02252792d11b99d88206bc49e12
output = ${buildout:directory}/template-boinc.cfg
mode = 0644
# Local development
[slapos.cookbook-repository]
recipe = plone.recipe.command
stop-on-error = true
branch = grid-computing
revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[networkcache]
# signature certificates of the following uploaders.
# Romain Courteaud
...
...
@@ -180,13 +158,14 @@ slapos.recipe.cmmi = 0.1.1
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2
xml-marshaller = 0.9.7
slapos.cookbook=0.78.1
# Required by:
# slapos.core==0.35.1
Flask = 0.9
# Required by:
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
lock-file = 2.0
# Required by:
...
...
@@ -199,7 +178,7 @@ pyflakes = 0.7.2
# Required by:
# hexagonit.recipe.download==1.6nxd002
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
# slapos.core==0.35.1
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
...
...
This diff is collapsed.
Click to expand it.
software/boinc/software.cfg
View file @
453b3265
[buildout]
# Local development
develop =
${:parts-directory}/slapos.cookbook-repository
parts =
template
application
...
...
@@ -12,11 +8,8 @@ parts =
template_input
slapos-cookbook
instance-egg
slapos.cookbook-repository
check-recipe
extends =
../../component/git/buildout.cfg
../../stack/boinc/buildout.cfg
#Generate All instances templates
...
...
@@ -72,19 +65,3 @@ template-result = ${template_result:location}/${template_result:filename}
template-wu = ${template_wu:location}/${template_wu:filename}
platform = x86_64-pc-linux-gnu
extension =
# Local development
[slapos.cookbook-repository]
recipe = plone.recipe.command
stop-on-error = true
branch = grid-computing
revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
This diff is collapsed.
Click to expand it.
software/condor/software.cfg
View file @
453b3265
[buildout]
# Local development - to be remove
develop =
${:parts-directory}/slapos.cookbook-repository
parts =
condor
slapos-cookbook
...
...
@@ -11,12 +7,9 @@ parts =
template-condor
description-file
executable
slapos.cookbook-repository
check-recipe
extends =
../../component/condor/buildout.cfg
../../component/git/buildout.cfg
../../stack/slapos.cfg
[template]
...
...
@@ -52,19 +45,6 @@ md5sum = c512f495cdd112bceb04feab7c909a10
[condor-application]
list = {"condor_test":{"description-file":"${description-file:location}/${description-file:filename}", "executable":"${executable:location}/${executable:filename}", "executable-name":"${executable:filename}", "files":{}}}
# Local development
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
branch = grid-computing
git-executable = ${git:location}/bin/git
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[networkcache]
# signature certificates of the following uploaders.
...
...
@@ -214,13 +194,14 @@ slapos.recipe.cmmi = 0.1.1
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2
xml-marshaller = 0.9.7
slapos.cookbook=0.78.1
# Required by:
# slapos.core==0.35.1
Flask = 0.9
# Required by:
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
lock-file = 2.0
# Required by:
...
...
@@ -233,7 +214,7 @@ pyflakes = 0.7.2
# Required by:
# hexagonit.recipe.download==1.6nxd002
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
# slapos.core==0.35.1
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
...
...
This diff is collapsed.
Click to expand it.
software/redis-server/software.cfg
View file @
453b3265
[buildout]
# Local development
develop =
${:parts-directory}/slapos.cookbook-repository
parts =
slapos-cookbook
redis
template
template-redis
slapos.cookbook-repository
check-recipe
extends =
../../component/redis/buildout.cfg
...
...
@@ -31,22 +25,6 @@ output = ${buildout:directory}/template-redis.cfg
mode = 0644
md5sum = f7b01ca7698c1b771f0653d64dc945a7
# Local development
[slapos.cookbook-repository]
recipe = plone.recipe.command
stop-on-error = true
branch = grid-computing
revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[networkcache]
# signature certificates of the following uploaders.
# Romain Courteaud
...
...
@@ -178,6 +156,7 @@ signature-certificate-list =
-----END CERTIFICATE-----
[versions]
slapos.cookbook=0.78.1
Jinja2 = 2.7
MarkupSafe = 0.18
Werkzeug = 0.8.3
...
...
@@ -199,7 +178,7 @@ xml-marshaller = 0.9.7
Flask = 0.9
# Required by:
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
lock-file = 2.0
# Required by:
...
...
@@ -212,7 +191,7 @@ pyflakes = 0.7.2
# Required by:
# hexagonit.recipe.download==1.6nxd002
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
# slapos.core==0.35.1
# supervisor==3.0b2
# zc.buildout==1.6.0-dev-SlapOS-010
...
...
This diff is collapsed.
Click to expand it.
stack/boinc/buildout.cfg
View file @
453b3265
...
...
@@ -201,6 +201,7 @@ slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.34.0
smmap = 0.8.2
slapos.cookbook=0.78.1
# Required by:
# slapos.core==0.35.1
...
...
@@ -220,7 +221,7 @@ atomize = 0.1.1
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.78.1
.dev
# slapos.cookbook==0.78.1
lock-file = 2.0
# Required by:
...
...
This diff is collapsed.
Click to expand it.
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