Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
aa7a24fb
Commit
aa7a24fb
authored
Dec 14, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'slaprunner'
parents
f889326a
e220c753
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
100 deletions
+76
-100
component/cloud9/buildout.cfg
component/cloud9/buildout.cfg
+1
-1
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+38
-0
software/slaprunner/development.cfg
software/slaprunner/development.cfg
+2
-15
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+32
-84
stack/slapos.cfg
stack/slapos.cfg
+3
-0
No files found.
component/cloud9/buildout.cfg
View file @
aa7a24fb
...
...
@@ -28,7 +28,7 @@ environment =
# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
recipe = plone.recipe.command
stop-on-error = true
commit =
bd6dd16c9ccfe4e778b41e98090e959d1462c819
commit =
5d18344936baf1d86b0fa5fc2c690051b4c77cb2
repository = https://github.com/ajaxorg/cloud9.git
location = ${buildout:parts-directory}/${:_buildout_section_name_}
git-binary = ${git:location}/bin/git
...
...
software/slaprunner/common.cfg
0 → 100644
View file @
aa7a24fb
[buildout]
extends =
../../component/cloud9/buildout.cfg
../../component/dash/buildout.cfg
../../component/dropbear/buildout.cfg
../../component/git/buildout.cfg
../../component/lxml-python/buildout.cfg
../../stack/flask.cfg
../../stack/shacache-client.cfg
../../stack/slapos.cfg
parts =
template
slapos-cookbook
eggs
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
md5sum = 5307e4200f044ae57b504ad68444491c
[template-runner]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg
md5sum = 91d6550c43b7a43a999724af4650ae40
mode = 0644
[eggs]
recipe = z3c.recipe.scripts
eggs =
${lxml-python:egg}
slapos.libnetworkcache
slapos.toolbox[flask_auth]
slapos.core
cns.recipe.symlink
software/slaprunner/development.cfg
View file @
aa7a24fb
...
...
@@ -6,15 +6,9 @@
# You'll need to run buildout twice for this profile.
[buildout]
extends =
software
.cfg
extends =
common
.cfg
parts =
# Original parts
template
slapos-cookbook
eggs
# Development parts
parts +=
slapos.cookbook-repository
slapos.core-repository
slapos.toolbox-repository
...
...
@@ -52,10 +46,3 @@ command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
# Unpin versions, in case it has been pinned in software.cfg
[versions]
slapos.cookbook =
slapos.toolbox =
slapos.core =
\ No newline at end of file
software/slaprunner/software.cfg
View file @
aa7a24fb
[buildout]
extends =
../../component/cloud9/buildout.cfg
../../component/dash/buildout.cfg
../../component/dropbear/buildout.cfg
../../component/git/buildout.cfg
../../component/lxml-python/buildout.cfg
../../stack/flask.cfg
../../stack/shacache-client.cfg
../../stack/slapos.cfg
parts =
template
slapos-cookbook
eggs
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
md5sum = 5307e4200f044ae57b504ad68444491c
# Production profile of slaprunner.
# Exactly the same as common.cfg, but:
# 1/ Use a defined set of Python eggs instead of using the latest available
# ones from Pypi, to ensure stability;
# 2/ Define list of trusted certificates for the cache.
[template-runner]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg
md5sum = 91d6550c43b7a43a999724af4650ae40
mode = 0644
[eggs]
recipe = z3c.recipe.scripts
eggs =
${lxml-python:egg}
slapos.libnetworkcache
slapos.toolbox[flask_auth]
slapos.core
cns.recipe.symlink
[buildout]
extends = common.cfg
[networkcache]
# signature certificates of the following uploaders.
...
...
@@ -56,103 +25,82 @@ signature-certificate-list =
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-----END CERTIFICATE-----
[versions]
# Forced stable version of lxml - 3.0 alpha keeps appearing/diseappearing on
# Pypi
lxml = 2.3.6
[versions]
Flask-Auth = 0.85
Jinja2 = 2.6
Werkzeug = 0.8.3
apache-libcloud = 0.11.
3
apache-libcloud = 0.11.
4
async = 0.6.1
buildout-versions = 1.7
cns.recipe.symlink = 0.2.3
gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.6
meld3 = 0.6.9
inotifyx = 0.2.0
lxml = 3.0.1
meld3 = 0.6.10
netaddr = 0.7.10
plone.recipe.command = 1.1
pycrypto = 2.6
slapos.cookbook = 0.70
slapos.libnetworkcache = 0.13.2
pytz = 2012h
slapos.cookbook = 0.70.1-dev
slapos.core = 0.33.1
slapos.libnetworkcache = 0.13.3
slapos.recipe.build = 0.11.5
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.3
1.1
slapos.toolbox = 0.3
2
smmap = 0.8.2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
# Required by:
# slapos.core==0.33.1
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
Flask = 0.9
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
GitPython = 0.3.2.RC1
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
atomize = 0.1.1
# Required by:
# slapos.toolbox==0.3
1.1
feedparser = 5.1.
2
# slapos.toolbox==0.3
2
feedparser = 5.1.
3
# Required by:
# hexagonit.recipe.cmmi==1.6
hexagonit.recipe.download = 1.5.1
# Required by:
# slapos.cookbook==0.70
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.70
netaddr = 0.7.10
hexagonit.recipe.download = 1.6
# Required by:
# slapos.core==0.33.1
netifaces = 0.8
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
paramiko = 1.9.0
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
psutil = 0.6.1
# Required by:
# slapos.cookbook==0.70
pytz = 2012h
# Required by:
# cns.recipe.symlink==0.2.3
# slapos.cookbook==0.70
# slapos.cookbook==0.70
.1-dev
# slapos.core==0.33.1
# slapos.libnetworkcache==0.13.2
# slapos.toolbox==0.31.1
# slapos.libnetworkcache==0.13.3
# slapos.toolbox==0.32
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
# z
c.recipe.egg==1.3
.2
# z
ope.interface==4.0
.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.70
slapos.core = 0.33.1
# Required by:
# slapos.core==0.33.1
supervisor = 3.0b1
# Required by:
# slapos.cookbook==0.70
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.70
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.33.1
zope.interface = 4.0.
1
zope.interface = 4.0.
2
stack/slapos.cfg
View file @
aa7a24fb
...
...
@@ -68,6 +68,9 @@ eggs =
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-010
# zc.recipe.egg 2.0.0a is buggy
zc.recipe.egg = 1.3.2
[networkcache]
download-cache-url = http://www.shacache.org/shacache
download-dir-url = http://www.shacache.org/shadir
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