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
Romain Courteaud
slapos
Commits
d760665f
Commit
d760665f
authored
Dec 18, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into lapp-resilient3
parents
10f72b63
c5c304b1
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
92 additions
and
106 deletions
+92
-106
component/cloud9/buildout.cfg
component/cloud9/buildout.cfg
+1
-1
component/fonts/buildout.cfg
component/fonts/buildout.cfg
+8
-0
component/imagemagick/buildout.cfg
component/imagemagick/buildout.cfg
+0
-1
component/libdmtx/buildout.cfg
component/libdmtx/buildout.cfg
+3
-1
component/librsvg/buildout.cfg
component/librsvg/buildout.cfg
+3
-2
component/libtiff/buildout.cfg
component/libtiff/buildout.cfg
+2
-4
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
+30
-82
stack/cloudooo.cfg
stack/cloudooo.cfg
+1
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-0
stack/slapos.cfg
stack/slapos.cfg
+3
-0
No files found.
component/cloud9/buildout.cfg
View file @
d760665f
...
@@ -28,7 +28,7 @@ environment =
...
@@ -28,7 +28,7 @@ environment =
# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
recipe = plone.recipe.command
recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
commit =
bd6dd16c9ccfe4e778b41e98090e959d1462c819
commit =
5d18344936baf1d86b0fa5fc2c690051b4c77cb2
repository = https://github.com/ajaxorg/cloud9.git
repository = https://github.com/ajaxorg/cloud9.git
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
git-binary = ${git:location}/bin/git
git-binary = ${git:location}/bin/git
...
...
component/fonts/buildout.cfg
View file @
d760665f
...
@@ -3,6 +3,7 @@ parts =
...
@@ -3,6 +3,7 @@ parts =
liberation-fonts
liberation-fonts
ipaex-fonts
ipaex-fonts
ipa-fonts
ipa-fonts
ocrb-fonts
[fonts]
[fonts]
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -32,3 +33,10 @@ strip-top-level-dir = true
...
@@ -32,3 +33,10 @@ strip-top-level-dir = true
url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
md5sum = 39a828acf27790adbe4944dfb4d94bb1
md5sum = 39a828acf27790adbe4944dfb4d94bb1
destination = ${fonts:location}/${:_buildout_section_name_}
destination = ${fonts:location}/${:_buildout_section_name_}
[ocrb-fonts]
recipe = hexagonit.recipe.download
strip-top-level-dir = true
url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
md5sum = 9f2acd83291a31dbe053912f4115db75
destination = ${fonts:location}/${:_buildout_section_name_}
component/imagemagick/buildout.cfg
View file @
d760665f
...
@@ -28,7 +28,6 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
...
@@ -28,7 +28,6 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
[imagemagick]
[imagemagick]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
#url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
url = http://ftp.vim.org/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
url = http://ftp.vim.org/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
md5sum = 4e5c8f102f3e7401587c924f5b4bca15
md5sum = 4e5c8f102f3e7401587c924f5b4bca15
depends =
depends =
...
...
component/libdmtx/buildout.cfg
View file @
d760665f
...
@@ -3,8 +3,10 @@
...
@@ -3,8 +3,10 @@
[buildout]
[buildout]
extends =
extends =
../bzip2/buildout.cfg
../imagemagick/buildout.cfg
../imagemagick/buildout.cfg
../jbigkit/buildout.cfg
../jbigkit/buildout.cfg
../zlib/buildout.cfg
parts =
parts =
libdmtx
libdmtx
dmtx-utils
dmtx-utils
...
@@ -26,4 +28,4 @@ environment =
...
@@ -26,4 +28,4 @@ environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
CPPFLAGS=-I${libdmtx:location}/include
CPPFLAGS=-I${libdmtx:location}/include
LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib
LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib
-Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib
component/librsvg/buildout.cfg
View file @
d760665f
...
@@ -14,7 +14,8 @@ url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
...
@@ -14,7 +14,8 @@ url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
md5sum = e1e93eeff4367c896f3959af34ba20eb
md5sum = e1e93eeff4367c896f3959af34ba20eb
environment =
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
LDFLAGS=-Wl,-rpath=${zlib:location}/lib
[librsvg]
[librsvg]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
...
@@ -36,4 +37,4 @@ configure-options =
...
@@ -36,4 +37,4 @@ configure-options =
environment =
environment =
PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
-Wl,-rpath=${zlib:location}/lib
component/libtiff/buildout.cfg
View file @
d760665f
...
@@ -9,11 +9,9 @@ parts =
...
@@ -9,11 +9,9 @@ parts =
[libtiff]
[libtiff]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
version = 4.0.
2
version = 4.0.
3
url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
# server is down - circumvent
md5sum = 051c1068e6a0627f461948c365290410
#url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
md5sum = 04a08fa1e07e696e820a0c3f32465a13
configure-options =
configure-options =
--disable-static
--disable-static
--without-x
--without-x
...
...
software/slaprunner/common.cfg
0 → 100644
View file @
d760665f
[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 @
d760665f
...
@@ -6,15 +6,9 @@
...
@@ -6,15 +6,9 @@
# You'll need to run buildout twice for this profile.
# You'll need to run buildout twice for this profile.
[buildout]
[buildout]
extends =
software
.cfg
extends =
common
.cfg
parts =
parts +=
# Original parts
template
slapos-cookbook
eggs
# Development parts
slapos.cookbook-repository
slapos.cookbook-repository
slapos.core-repository
slapos.core-repository
slapos.toolbox-repository
slapos.toolbox-repository
...
@@ -52,10 +46,3 @@ command =
...
@@ -52,10 +46,3 @@ command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
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.core.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.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 @
d760665f
[buildout]
# Production profile of slaprunner.
# Exactly the same as common.cfg, but:
extends =
# 1/ Use a defined set of Python eggs instead of using the latest available
../../component/cloud9/buildout.cfg
# ones from Pypi, to ensure stability;
../../component/dash/buildout.cfg
# 2/ Define list of trusted certificates for the cache.
../../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]
[buildout]
recipe = z3c.recipe.scripts
extends = common.cfg
eggs =
${lxml-python:egg}
slapos.libnetworkcache
slapos.toolbox[flask_auth]
slapos.core
cns.recipe.symlink
[networkcache]
[networkcache]
# signature certificates of the following uploaders.
# signature certificates of the following uploaders.
...
@@ -56,103 +25,82 @@ signature-certificate-list =
...
@@ -56,103 +25,82 @@ signature-certificate-list =
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-----END CERTIFICATE-----
-----END CERTIFICATE-----
[versions]
# Forced stable version of lxml - 3.0 alpha keeps appearing/diseappearing on
# Pypi
lxml = 2.3.6
[versions]
[versions]
Flask-Auth = 0.85
Flask-Auth = 0.85
Jinja2 = 2.6
Jinja2 = 2.6
Werkzeug = 0.8.3
Werkzeug = 0.8.3
apache-libcloud = 0.11.
3
apache-libcloud = 0.11.
4
async = 0.6.1
async = 0.6.1
buildout-versions = 1.7
buildout-versions = 1.7
cns.recipe.symlink = 0.2.3
cns.recipe.symlink = 0.2.3
gitdb = 0.5.4
gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.6
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
plone.recipe.command = 1.1
pycrypto = 2.6
pycrypto = 2.6
pytz = 2012h
slapos.cookbook = 0.70
slapos.cookbook = 0.70
slapos.libnetworkcache = 0.13.2
slapos.core = 0.33.1
slapos.libnetworkcache = 0.13.3
slapos.recipe.build = 0.11.5
slapos.recipe.build = 0.11.5
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.3
1.1
slapos.toolbox = 0.3
2
smmap = 0.8.2
smmap = 0.8.2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
# Required by:
# Required by:
# slapos.core==0.33.1
# slapos.core==0.33.1
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
Flask = 0.9
Flask = 0.9
# Required by:
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
atomize = 0.1.1
atomize = 0.1.1
# Required by:
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
feedparser = 5.1.
2
feedparser = 5.1.
3
# Required by:
# Required by:
# hexagonit.recipe.cmmi==1.6
# hexagonit.recipe.cmmi==1.6
hexagonit.recipe.download = 1.5.1
hexagonit.recipe.download = 1.6
# Required by:
# slapos.cookbook==0.70
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.70
netaddr = 0.7.10
# Required by:
# Required by:
# slapos.core==0.33.1
# slapos.core==0.33.1
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
paramiko = 1.9.0
paramiko = 1.9.0
# Required by:
# Required by:
# slapos.toolbox==0.3
1.1
# slapos.toolbox==0.3
2
psutil = 0.6.1
psutil = 0.6.1
# Required by:
# slapos.cookbook==0.70
pytz = 2012h
# Required by:
# Required by:
# cns.recipe.symlink==0.2.3
# cns.recipe.symlink==0.2.3
# slapos.cookbook==0.70
# slapos.cookbook==0.70
# slapos.core==0.33.1
# slapos.core==0.33.1
# slapos.libnetworkcache==0.13.2
# slapos.libnetworkcache==0.13.3
# slapos.toolbox==0.31.1
# slapos.toolbox==0.32
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
# 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
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.70
slapos.core = 0.33.1
# Required by:
# Required by:
# slapos.core==0.33.1
# slapos.core==0.33.1
supervisor = 3.0b1
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:
# Required by:
# slapos.core==0.33.1
# slapos.core==0.33.1
zope.interface = 4.0.
1
zope.interface = 4.0.
2
stack/cloudooo.cfg
View file @
d760665f
...
@@ -69,6 +69,7 @@ parts =
...
@@ -69,6 +69,7 @@ parts =
# fonts
# fonts
liberation-fonts
liberation-fonts
ipaex-fonts
ipaex-fonts
ocrb-fonts
# Dependencies
# Dependencies
libpng12
libpng12
...
...
stack/erp5/buildout.cfg
View file @
d760665f
...
@@ -117,6 +117,7 @@ parts =
...
@@ -117,6 +117,7 @@ parts =
# fonts
# fonts
liberation-fonts
liberation-fonts
ipaex-fonts
ipaex-fonts
ocrb-fonts
# Cloudooo specific part
# Cloudooo specific part
cloudooo
cloudooo
...
...
stack/slapos.cfg
View file @
d760665f
...
@@ -68,6 +68,9 @@ eggs =
...
@@ -68,6 +68,9 @@ eggs =
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-010
zc.buildout = 1.6.0-dev-SlapOS-010
# zc.recipe.egg 2.0.0a is buggy
zc.recipe.egg = 1.3.2
[networkcache]
[networkcache]
download-cache-url = http://www.shacache.org/shacache
download-cache-url = http://www.shacache.org/shacache
download-dir-url = http://www.shacache.org/shadir
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