Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SlapOS Develop
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
Eric Zheng
SlapOS Develop
Commits
ca51bd94
Commit
ca51bd94
authored
Mar 30, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into erp5
parents
f39e3df0
1e81747d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
133 deletions
+4
-133
software/lamp-template/software.cfg
software/lamp-template/software.cfg
+0
-86
stack/lamp.cfg
stack/lamp.cfg
+1
-28
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-19
No files found.
software/lamp-template/software.cfg
View file @
ca51bd94
...
@@ -7,7 +7,6 @@ parts =
...
@@ -7,7 +7,6 @@ parts =
mariadb
mariadb
eggs
eggs
instance-recipe-egg
instance-recipe-egg
downloadcache-workaround
extends =
extends =
../../stack/lamp.cfg
../../stack/lamp.cfg
...
@@ -18,7 +17,6 @@ url = Student shall put here url of zipped or tarballed web page or application
...
@@ -18,7 +17,6 @@ url = Student shall put here url of zipped or tarballed web page or application
md5sum = Student may put here md5sum of this file, this is good idea
md5sum = Student may put here md5sum of this file, this is good idea
#If provided tarball does not contain top directory, option shall be changed to false
#If provided tarball does not contain top directory, option shall be changed to false
strip-top-level-dir = true
strip-top-level-dir = true
#extract-directory =
[application-template]
[application-template]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
...
@@ -43,91 +41,7 @@ url = ${:_profile_base_location_}/instance.cfg
...
@@ -43,91 +41,7 @@ url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[mariadb]
keep-compile-dir = false
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
${instance-recipe:egg}
${instance-recipe:egg}
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-003
# Generated by buildout-versions
Jinja2 = 2.6
Werkzeug = 0.8.2
buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.8
plone.recipe.command = 1.1
slapos.cookbook = 0.20
slapos.recipe.build = 0.7
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.2
# Required by:
# slapos.core==0.21
Flask = 0.8
# Required by:
# slapos.cookbook==0.38
PyXML = 0.8.4
# Required by:
# hexagonit.recipe.cmmi==1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# slapos.cookbook==0.38
# slapos.core==0.21
# xml-marshaller==0.9.7
lxml = 2.3.3
# Required by:
# slapos.cookbook==0.38
netaddr = 0.7.6
# Required by:
# slapos.core==0.21
netifaces = 0.6
# Required by:
# slapos.cookbook==0.38
# slapos.core==0.21
# zc.buildout==1.6.0-dev-SlapOS-003
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.38
slapos.core = 0.21
# Required by:
# slapos.core==0.21
supervisor = 3.0a12
# Required by:
# slapos.cookbook==0.38
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.38
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.21
zope.interface = 3.8.0
[downloadcache-workaround]
# workaround irritating problem of hexagonit.recipe.cmmi which automatically
# creates download cache, which in turn switches builout to "semi-offline" mode
recipe = plone.recipe.command
# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
# to ${buildout:directory}/downloads but this variable is available late, that's
# why it is hardcoded only for required case
download-cache = ${buildout:directory}/downloads
command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
update-command = ${:command}
stop-on-error = True
stack/lamp.cfg
View file @
ca51bd94
[buildout]
[buildout]
extensions = buildout-versions
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
# Use only quite well working sites.
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
alastairs-place.net
dist.repoze.org
effbot.org
github.com
launchpad.net
peak.telecommunity.com
psutil.googlecode.com
www.dabeaz.com
parts =
parts =
template
template
apache-php
apache-php
...
@@ -38,7 +19,7 @@ extends =
...
@@ -38,7 +19,7 @@ extends =
../component/stunnel/buildout.cfg
../component/stunnel/buildout.cfg
../component/pycrypto-python/buildout.cfg
../component/pycrypto-python/buildout.cfg
../component/mysql-python/buildout.cfg
../component/mysql-python/buildout.cfg
shacache-client
.cfg
../stack/slapos
.cfg
../component/python-2.7/buildout.cfg
../component/python-2.7/buildout.cfg
# python-2.7 component is here only for compatibility with old software.cfg.
# python-2.7 component is here only for compatibility with old software.cfg.
# It is not needed and should not be used in LAMP-based software.cfg
# It is not needed and should not be used in LAMP-based software.cfg
...
@@ -52,14 +33,6 @@ eggs =
...
@@ -52,14 +33,6 @@ eggs =
[mariadb]
[mariadb]
keep-compile-dir = false
keep-compile-dir = false
[application]
#XXX-Cedric : ugly hack to work around h.r.cmmi unrespectful behavior, so that
# a cmmi Executes before application but after template downloading.
# Useful when [application] uses slapos.recipe.build or
# slapos.recipe.download rather than h.r.download.
depends = ${apache-php:location}
[networkcache]
[networkcache]
# Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
# Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
signature-certificate-list =
signature-certificate-list =
...
...
stack/lamp/buildout.cfg
View file @
ca51bd94
[buildout]
[buildout]
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
parts =
parts =
apache-php
apache-php
mariadb
mariadb
...
@@ -18,21 +15,7 @@ parts =
...
@@ -18,21 +15,7 @@ parts =
template-mariadb-pbsready-import
template-mariadb-pbsready-import
template-mariadb-pbsready-export
template-mariadb-pbsready-export
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
alastairs-place.net
dist.repoze.org
effbot.org
github.com
peak.telecommunity.com
psutil.googlecode.com
www.dabeaz.com
launchpad.net
extends =
extends =
../shacache-client.cfg
../../component/mariadb/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/apache/buildout.cfg
../../component/apache/buildout.cfg
../../component/apache-php/buildout.cfg
../../component/apache-php/buildout.cfg
...
@@ -40,7 +23,6 @@ extends =
...
@@ -40,7 +23,6 @@ extends =
../../component/git/buildout.cfg
../../component/git/buildout.cfg
../../component/glib/buildout.cfg
../../component/glib/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/perl/buildout.cfg
../../component/perl/buildout.cfg
../../component/sqlite3/buildout.cfg
../../component/sqlite3/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
...
@@ -52,6 +34,9 @@ extends =
...
@@ -52,6 +34,9 @@ extends =
../../component/mysql-python/buildout.cfg
../../component/mysql-python/buildout.cfg
../../component/dropbear/buildout.cfg
../../component/dropbear/buildout.cfg
../slapos.cfg
../slapos.cfg
../../component/python-2.7/buildout.cfg
# python-2.7 component is here only for compatibility with old software.cfg.
# It is not needed and should not be used in LAMP-based software.cfg
versions = versions
versions = versions
...
@@ -65,7 +50,6 @@ module = lamp.request
...
@@ -65,7 +50,6 @@ module = lamp.request
[instance-recipe-egg]
[instance-recipe-egg]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
#python = python2.7
eggs = ${instance-recipe:egg}
eggs = ${instance-recipe:egg}
[application]
[application]
...
...
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