Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
7bfbb73a
Commit
7bfbb73a
authored
Apr 12, 2012
by
Mohamadou Mbengue
Browse files
Options
Browse Files
Download
Plain Diff
Merge master in lamp-mohamadou branch
parents
4a30813a
55327aa7
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
196 additions
and
196 deletions
+196
-196
CHANGES.txt
CHANGES.txt
+12
-2
component/cloud9/buildout.cfg
component/cloud9/buildout.cfg
+1
-1
component/gnutls/buildout.cfg
component/gnutls/buildout.cfg
+5
-4
component/nodejs/buildout.cfg
component/nodejs/buildout.cfg
+1
-2
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+8
-8
setup.py
setup.py
+1
-1
slapos/recipe/apachephp/template/apache.in
slapos/recipe/apachephp/template/apache.in
+5
-5
slapos/recipe/lamp/__init__.py
slapos/recipe/lamp/__init__.py
+2
-0
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/__init__.py
+16
-4
slapos/recipe/slaprunner/template/slapos.cfg.in
slapos/recipe/slaprunner/template/slapos.cfg.in
+3
-0
software/lamp-template/software.cfg
software/lamp-template/software.cfg
+0
-86
software/slaprunner/instance.cfg
software/slaprunner/instance.cfg
+3
-1
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+32
-32
stack/lamp.cfg
stack/lamp.cfg
+96
-28
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+4
-20
stack/lamp/instance-apache-php.cfg
stack/lamp/instance-apache-php.cfg
+7
-2
No files found.
CHANGES.txt
View file @
7bfbb73a
Changes
Changes
=======
=======
0.4
4
(Unreleased)
0.4
6
(Unreleased)
-----------------
-----------------
* No change yet
* No change yet.
0.45 (2012-03-29)
-----------------
* slaprunner: change number of available partitions to 7 [Alain Takoudjou]
0.44 (2012-03-28)
-----------------
* minor: apachephp: update apache configuration to work with Apache2.4
0.43 (2012-03-28)
0.43 (2012-03-28)
-----------------
-----------------
...
...
component/cloud9/buildout.cfg
View file @
7bfbb73a
...
@@ -26,7 +26,7 @@ repository = https://github.com/ajaxorg/cloud9.git
...
@@ -26,7 +26,7 @@ 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
npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
command = export GIT_SSL_NO_VERIFY=true; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=
/opt/slapgrid/c86b6d036d0004572b96e10de1a1b5e8/parts/nodejs-0.4
/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
command = export GIT_SSL_NO_VERIFY=true; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=
${nodejs-0.4:location}
/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
update-command =
update-command =
[cloud9-npm]
[cloud9-npm]
...
...
component/gnutls/buildout.cfg
View file @
7bfbb73a
...
@@ -13,13 +13,13 @@ md5sum = 7c2710ef439f82ac429b88fec88e9a4c
...
@@ -13,13 +13,13 @@ md5sum = 7c2710ef439f82ac429b88fec88e9a4c
[gcrypt]
[gcrypt]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.
4.6
.tar.gz
url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.
5.0
.tar.gz
md5sum =
bfd45922eefb8a24d598af77366220d4
md5sum =
78f8f8bec4580f75b25816f7896d0389
configure-options =
configure-options =
--with-gpg-error-prefix=${gpg-error:location}
--with-gpg-error-prefix=${gpg-error:location}
environment =
environment =
CPPFLAGS=-I${gpg-error:location}/include
CPPFLAGS=-I${gpg-error:location}/include
LDFLAGS=-
Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
LDFLAGS=-
lgpg-error -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
[gnutls]
[gnutls]
# XXX-Cedric : update to latest gnutls
# XXX-Cedric : update to latest gnutls
...
@@ -28,7 +28,8 @@ url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
...
@@ -28,7 +28,8 @@ url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
configure-options =
configure-options =
--with-libgcrypt-prefix=${gcrypt:location}
--with-libgcrypt-prefix=${gcrypt:location}
--disable-static
environment =
environment =
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
LDFLAGS=-
L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
LDFLAGS=-
lgcrypt -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
PKG_CONFIG=${zlib:location}/lib/pkgconfig
PKG_CONFIG=${zlib:location}/lib/pkgconfig
component/nodejs/buildout.cfg
View file @
7bfbb73a
...
@@ -46,6 +46,5 @@ commit = 3136abc5c6b3ed332c4700ece24450fada63639b
...
@@ -46,6 +46,5 @@ commit = 3136abc5c6b3ed332c4700ece24450fada63639b
origin = https://github.com/isaacs/npm.git
origin = https://github.com/isaacs/npm.git
git-bin = ${git:location}/bin/git
git-bin = ${git:location}/bin/git
node-bin = ${nodejs-0.4:location}/bin/node
node-bin = ${nodejs-0.4:location}/bin/node
command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node
_
bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node
-
bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
update-command =
update-command =
component/slapos/buildout.cfg
View file @
7bfbb73a
...
@@ -120,17 +120,17 @@ Werkzeug = 0.8.3
...
@@ -120,17 +120,17 @@ Werkzeug = 0.8.3
buildout-versions = 1.7
buildout-versions = 1.7
collective.recipe.template = 1.9
collective.recipe.template = 1.9
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
lxml = 2.3.
3
lxml = 2.3.
4
meld3 = 0.6.8
meld3 = 0.6.8
netaddr = 0.7.6
netaddr = 0.7.6
slapos.core = 0.2
3
slapos.core = 0.2
4
slapos.libnetworkcache = 0.12
slapos.libnetworkcache = 0.12
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.2
3
# slapos.core==0.2
4
Flask = 0.8
Flask = 0.8
# Required by:
# Required by:
...
@@ -138,11 +138,11 @@ Flask = 0.8
...
@@ -138,11 +138,11 @@ Flask = 0.8
hexagonit.recipe.download = 1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# Required by:
# slapos.core==0.2
3
# slapos.core==0.2
4
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.core==0.2
3
# slapos.core==0.2
4
# slapos.libnetworkcache==0.12
# slapos.libnetworkcache==0.12
# supervisor==3.0a12
# supervisor==3.0a12
# zc.buildout==1.6.0-dev-SlapOS-004
# zc.buildout==1.6.0-dev-SlapOS-004
...
@@ -150,9 +150,9 @@ netifaces = 0.8
...
@@ -150,9 +150,9 @@ netifaces = 0.8
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
# Required by:
# Required by:
# slapos.core==0.2
3
# slapos.core==0.2
4
supervisor = 3.0a12
supervisor = 3.0a12
# Required by:
# Required by:
# slapos.core==0.2
3
# slapos.core==0.2
4
zope.interface = 3.8.0
zope.interface = 3.8.0
setup.py
View file @
7bfbb73a
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.4
4
-dev'
version
=
'0.4
6
-dev'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/apachephp/template/apache.in
View file @
7bfbb73a
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
# Basic server configuration
# Basic server configuration
PidFile "%(pid_file)s"
PidFile "%(pid_file)s"
LockFile "%(lock_file)s"
Listen %(ip)s:%(port)s
Listen %(ip)s:%(port)s
PHPINIDir %(php_ini_dir)s
PHPINIDir %(php_ini_dir)s
ServerAdmin someone@email
ServerAdmin someone@email
...
@@ -25,20 +24,21 @@ CustomLog "%(access_log)s" common
...
@@ -25,20 +24,21 @@ CustomLog "%(access_log)s" common
<Directory />
<Directory />
Options FollowSymLinks
Options FollowSymLinks
AllowOverride None
AllowOverride None
Order deny,allow
Require all denied
Deny from all
</Directory>
</Directory>
<Directory %(document_root)s>
<Directory %(document_root)s>
Options FollowSymLinks
Options FollowSymLinks
AllowOverride All
AllowOverride All
Order allow,deny
Require all granted
Allow from all
</Directory>
</Directory>
DocumentRoot %(document_root)s
DocumentRoot %(document_root)s
DirectoryIndex index.html index.php
DirectoryIndex index.html index.php
# List of modules
# List of modules
LoadModule unixd_module modules/mod_unixd.so
LoadModule access_compat_module modules/mod_access_compat.so
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule setenvif_module modules/mod_setenvif.so
...
...
slapos/recipe/lamp/__init__.py
View file @
7bfbb73a
...
@@ -33,6 +33,8 @@ import sys
...
@@ -33,6 +33,8 @@ import sys
import
zc.recipe.egg
import
zc.recipe.egg
import
urlparse
import
urlparse
# Warning : this recipe is deprecated and has been replaced by apachephp.
class
BaseRecipe
(
BaseSlapRecipe
):
class
BaseRecipe
(
BaseSlapRecipe
):
def
getTemplateFilename
(
self
,
template_name
):
def
getTemplateFilename
(
self
,
template_name
):
return
pkg_resources
.
resource_filename
(
__name__
,
return
pkg_resources
.
resource_filename
(
__name__
,
...
...
slapos/recipe/slaprunner/__init__.py
View file @
7bfbb73a
...
@@ -40,6 +40,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -40,6 +40,7 @@ class Recipe(BaseSlapRecipe):
ipv6
=
self
.
getGlobalIPv6Address
()
ipv6
=
self
.
getGlobalIPv6Address
()
proxy_port
=
'50000'
proxy_port
=
'50000'
runner_port
=
'50000'
runner_port
=
'50000'
cloud9_port
=
'30000'
workdir
=
self
.
createDataDirectory
(
'runner'
)
workdir
=
self
.
createDataDirectory
(
'runner'
)
software_root
=
os
.
path
.
join
(
workdir
,
'software'
)
software_root
=
os
.
path
.
join
(
workdir
,
'software'
)
instance_root
=
os
.
path
.
join
(
workdir
,
'instance'
)
instance_root
=
os
.
path
.
join
(
workdir
,
'instance'
)
...
@@ -48,7 +49,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -48,7 +49,7 @@ class Recipe(BaseSlapRecipe):
instance_root
=
instance_root
,
instance_root
=
instance_root
,
master_url
=
'http://%s:%s/'
%
(
ipv4
,
proxy_port
),
master_url
=
'http://%s:%s/'
%
(
ipv4
,
proxy_port
),
computer_id
=
'slaprunner'
,
computer_id
=
'slaprunner'
,
partition_amount
=
2
,
partition_amount
=
7
,
slapgrid_sr
=
self
.
options
[
'slapgrid_sr'
],
slapgrid_sr
=
self
.
options
[
'slapgrid_sr'
],
slapgrid_cp
=
self
.
options
[
'slapgrid_cp'
],
slapgrid_cp
=
self
.
options
[
'slapgrid_cp'
],
slapproxy
=
self
.
options
[
'slapproxy'
],
slapproxy
=
self
.
options
[
'slapproxy'
],
...
@@ -64,22 +65,33 @@ class Recipe(BaseSlapRecipe):
...
@@ -64,22 +65,33 @@ class Recipe(BaseSlapRecipe):
proxy_port
=
proxy_port
,
proxy_port
=
proxy_port
,
proxy_database
=
os
.
path
.
join
(
workdir
,
'proxy.db'
),
proxy_database
=
os
.
path
.
join
(
workdir
,
'proxy.db'
),
git
=
self
.
options
[
'git'
],
git
=
self
.
options
[
'git'
],
cloud9_url
=
'http://[%s]:%s'
%
(
ipv6
,
cloud9_port
),
ssh_client
=
self
.
options
[
'ssh_client'
],
ssh_client
=
self
.
options
[
'ssh_client'
],
public_key
=
self
.
options
[
'public_key'
],
public_key
=
self
.
options
[
'public_key'
],
private_key
=
self
.
options
[
'private_key'
]
private_key
=
self
.
options
[
'private_key'
],
)
)
config_file
=
self
.
createConfigurationFile
(
'slapos.cfg'
,
config_file
=
self
.
createConfigurationFile
(
'slapos.cfg'
,
self
.
substituteTemplate
(
pkg_resources
.
resource_filename
(
__name__
,
self
.
substituteTemplate
(
pkg_resources
.
resource_filename
(
__name__
,
'template/slapos.cfg.in'
),
configuration
))
'template/slapos.cfg.in'
),
configuration
))
self
.
path_list
.
append
(
config_file
)
self
.
path_list
.
append
(
config_file
)
environment
=
dict
(
environment
=
dict
(
PATH
=
os
.
path
.
dirname
(
self
.
options
[
'git'
])
+
':'
+
os
.
environ
[
'PATH'
],
PATH
=
os
.
path
.
dirname
(
self
.
options
[
'git'
])
+
':'
+
os
.
environ
[
'PATH'
],
GIT_SSH
=
self
.
options
[
'ssh_client'
]
GIT_SSH
=
self
.
options
[
'ssh_client'
]
)
)
workdir
=
os
.
path
.
join
(
workdir
,
'project'
)
if
not
os
.
path
.
exists
(
workdir
):
os
.
mkdir
(
workdir
)
launch_args
=
[
self
.
options
[
'slaprunner'
].
strip
(),
config_file
,
'--debug'
]
launch_args
=
[
self
.
options
[
'slaprunner'
].
strip
(),
config_file
,
'--debug'
]
cloud9_args
=
[
self
.
options
[
'node-bin'
].
strip
(),
self
.
options
[
'cloud9'
].
strip
(),
'-l'
,
ipv6
,
'-p'
,
cloud9_port
,
'-w'
,
workdir
]
self
.
path_list
.
extend
(
zc
.
buildout
.
easy_install
.
scripts
([(
'slaprunner'
,
self
.
path_list
.
extend
(
zc
.
buildout
.
easy_install
.
scripts
([(
'slaprunner'
,
'slapos.recipe.librecipe.execute'
,
'executee'
)],
self
.
ws
,
sys
.
executable
,
'slapos.recipe.librecipe.execute'
,
'executee'
)],
self
.
ws
,
sys
.
executable
,
self
.
wrapper_directory
,
arguments
=
[
launch_args
,
environment
]))
self
.
wrapper_directory
,
arguments
=
[
launch_args
,
environment
]))
self
.
setConnectionDict
(
dict
(
url
=
'http://[%s]:%s'
%
(
ipv6
,
runner_port
)))
self
.
path_list
.
extend
(
zc
.
buildout
.
easy_install
.
scripts
([(
'cloud9IDE'
,
'slapos.recipe.librecipe.execute'
,
'executee'
)],
self
.
ws
,
sys
.
executable
,
self
.
wrapper_directory
,
arguments
=
[
cloud9_args
,
environment
]))
self
.
setConnectionDict
(
dict
(
slaprunner_url
=
'http://[%s]:%s'
%
(
ipv6
,
runner_port
),
cloud9_url
=
'http://[%s]:%s'
%
(
ipv6
,
cloud9_port
)))
return
self
.
path_list
return
self
.
path_list
slapos/recipe/slaprunner/template/slapos.cfg.in
View file @
7bfbb73a
...
@@ -31,3 +31,6 @@ private_key = %(private_key)s
...
@@ -31,3 +31,6 @@ private_key = %(private_key)s
[gitclient]
[gitclient]
git = %(git)s
git = %(git)s
[cloud9_IDE]
cloud9 = %(cloud9_url)s
\ No newline at end of file
software/lamp-template/software.cfg
View file @
7bfbb73a
...
@@ -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
software/slaprunner/instance.cfg
View file @
7bfbb73a
...
@@ -16,6 +16,8 @@ slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
...
@@ -16,6 +16,8 @@ slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
slapproxy = ${buildout:directory}/bin/slapproxy
slapproxy = ${buildout:directory}/bin/slapproxy
supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
git = ${git:location}/bin/git
git = ${git:location}/bin/git
node-bin = ${nodejs-0.4:location}/bin/node
cloud9 = ${cloud9:location}/bin/cloud9.js
ssh_client = $${sshkeys-dropbear:wrapper}
ssh_client = $${sshkeys-dropbear:wrapper}
public_key = $${sshkeys-dropbear:public-key}
public_key = $${sshkeys-dropbear:public-key}
private_key = $${sshkeys-dropbear:private-key}
private_key = $${sshkeys-dropbear:private-key}
...
@@ -62,4 +64,4 @@ bin = $${buildout:directory}/bin/
...
@@ -62,4 +64,4 @@ bin = $${buildout:directory}/bin/
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
sshkeys = $${rootdirectory:srv}/sshkeys
sshkeys = $${rootdirectory:srv}/sshkeys
services = $${rootdirectory:etc}/run/
services = $${rootdirectory:etc}/run/
ssh = $${rootdirectory:etc}/ssh/
ssh = $${rootdirectory:etc}/ssh/
\ No newline at end of file
software/slaprunner/software.cfg
View file @
7bfbb73a
[buildout]
[buildout]
extensions =
extensions =
buildout-versions
buildout-versions
...
@@ -8,6 +9,7 @@ extends =
...
@@ -8,6 +9,7 @@ extends =
../../stack/shacache-client.cfg
../../stack/shacache-client.cfg
../../component/dropbear/buildout.cfg
../../component/dropbear/buildout.cfg
../../component/git/buildout.cfg
../../component/git/buildout.cfg
../../component/cloud9/buildout.cfg
parts =
parts =
template
template
...
@@ -31,7 +33,7 @@ recipe = slapos.recipe.template
...
@@ -31,7 +33,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
md5sum =
cd69efd5c3a7e9adca7387b9a401590a
md5sum =
7cfd248cdc6fa6cbb4957d25a0aed884
[eggs]
[eggs]
eggs +=
eggs +=
...
@@ -60,6 +62,7 @@ signature-certificate-list =
...
@@ -60,6 +62,7 @@ signature-certificate-list =
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-003
zc.buildout = 1.6.0-dev-SlapOS-003
Jinja2 = 2.6
Jinja2 = 2.6
Werkzeug = 0.8.3
Werkzeug = 0.8.3
apache-libcloud = 0.8.0
apache-libcloud = 0.8.0
...
@@ -68,68 +71,65 @@ buildout-versions = 1.7
...
@@ -68,68 +71,65 @@ buildout-versions = 1.7
gitdb = 0.5.4
gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.8
meld3 = 0.6.8
plone.recipe.command = 1.1
pycrypto = 2.5
pycrypto = 2.5
slapos.cookbook = 0.
39
slapos.cookbook = 0.
45
slapos.libnetworkcache = 0.12
slapos.libnetworkcache = 0.12
slapos.recipe.template = 2.
2
slapos.recipe.template = 2.
3
slapos.toolbox = 0.
18
slapos.toolbox = 0.
20
smmap = 0.8.2
smmap = 0.8.2
# Required by:
# Required by:
# slapos.core==0.2
2
# slapos.core==0.2
4
Flask = 0.8
Flask = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.
18
# slapos.toolbox==0.
20
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
PyXML = 0.8.4
PyXML = 0.8.4
# Required by:
# Required by:
# slapos.toolbox==0.
18
# slapos.toolbox==0.
20
atomize = 0.1.1
atomize = 0.1.1
# Required by:
# Required by:
# slapos.toolbox==0.18
# slapos.toolbox==0.20
feedparser = 5.1
feedparser = 5.1.1
# Required by:
# hexagonit.recipe.cmmi==1.5.0
hexagonit.recipe.download = 1.5.0
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
inotifyx = 0.2.0
inotifyx = 0.2.0
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
# slapos.core==0.2
2
# slapos.core==0.2
4
# xml-marshaller==0.9.7
# xml-marshaller==0.9.7
lxml = 2.3.
3
lxml = 2.3.
4
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
netaddr = 0.7.6
netaddr = 0.7.6
# Required by:
# Required by:
# slapos.core==0.2
2
# slapos.core==0.2
4
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.
18
# slapos.toolbox==0.
20
paramiko = 1.7.7.1
paramiko = 1.7.7.1
# Required by:
# Required by:
# slapos.toolbox==0.
18
# slapos.toolbox==0.
20
psutil = 0.4.1
psutil = 0.4.1
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
# slapos.core==0.2
2
# slapos.core==0.2
4
# slapos.libnetworkcache==0.12
# slapos.libnetworkcache==0.12
# slapos.toolbox==0.
18
# slapos.toolbox==0.
20
# supervisor==3.0a12
# supervisor==3.0a12
# zc.buildout==1.6.0-dev-SlapOS-003
# zc.buildout==1.6.0-dev-SlapOS-003
# zc.recipe.egg==1.3.2
# zc.recipe.egg==1.3.2
...
@@ -137,21 +137,21 @@ psutil = 0.4.1
...
@@ -137,21 +137,21 @@ psutil = 0.4.1
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
slapos.core = 0.2
2
slapos.core = 0.2
4
# Required by:
# Required by:
# slapos.core==0.2
2
# slapos.core==0.2
4
supervisor = 3.0a12
supervisor = 3.0a12
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
# Required by:
# Required by:
# slapos.cookbook==0.
39
# slapos.cookbook==0.
45
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.2
2
# slapos.core==0.2
4
zope.interface = 3.8.0
zope.interface = 3.8.0
\ No newline at end of file
stack/lamp.cfg
View file @
7bfbb73a
[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 =
...
@@ -102,3 +75,98 @@ signature-certificate-list =
...
@@ -102,3 +75,98 @@ signature-certificate-list =
dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
-----END CERTIFICATE-----
-----END CERTIFICATE-----
[versions]
# Generated automatically by buildout-versions
Jinja2 = 2.6
MySQL-python = 1.2.3
Werkzeug = 0.8.3
apache-libcloud = 0.9.1
async = 0.6.1
buildout-versions = 1.7
gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.8
plone.recipe.command = 1.1
slapos.cookbook = 0.45
slapos.recipe.build = 0.7
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.3
slapos.toolbox = 0.23
smmap = 0.8.2
# Required by:
# slapos.core==0.24
# slapos.toolbox==0.23
Flask = 0.8
# Required by:
# slapos.toolbox==0.23
GitPython = 0.3.2.RC1
# Required by:
# slapos.cookbook==0.45
PyXML = 0.8.4
# Required by:
# slapos.toolbox==0.23
atomize = 0.1.1
# Required by:
# slapos.toolbox==0.23
feedparser = 5.1.1
# Required by:
# slapos.cookbook==0.45
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.45
# slapos.core==0.24
# slapos.toolbox==0.23
# xml-marshaller==0.9.7
lxml = 2.3.4
# Required by:
# slapos.cookbook==0.45
netaddr = 0.7.6
# Required by:
# slapos.core==0.24
netifaces = 0.8
# Required by:
# slapos.toolbox==0.23
paramiko = 1.7.7.1
# Required by:
# slapos.toolbox==0.23
psutil = 0.4.1
# Required by:
# slapos.cookbook==0.45
# slapos.core==0.24
# slapos.toolbox==0.23
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.45
# slapos.toolbox==0.23
slapos.core = 0.24
# Required by:
# slapos.core==0.24
supervisor = 3.0a12
# Required by:
# slapos.cookbook==0.45
# slapos.toolbox==0.23
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.45
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.24
zope.interface = 3.8.0
\ No newline at end of file
stack/lamp/buildout.cfg
View file @
7bfbb73a
[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]
...
@@ -84,7 +68,7 @@ mode = 0644
...
@@ -84,7 +68,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-php.cfg
url = ${:_profile_base_location_}/instance-apache-php.cfg
output = ${buildout:directory}/template-apache-php.cfg
output = ${buildout:directory}/template-apache-php.cfg
md5sum =
45bc82dc468e7f418d95c846d1a33d74
md5sum =
8ebed1e26127c066e5b69372e69e6c38
mode = 0644
mode = 0644
[template-apache-backup]
[template-apache-backup]
...
...
stack/lamp/instance-apache-php.cfg
View file @
7bfbb73a
...
@@ -12,6 +12,7 @@ parts =
...
@@ -12,6 +12,7 @@ parts =
logrotate-entry-stunnel
logrotate-entry-stunnel
cron
cron
cron-entry-logrotate
cron-entry-logrotate
promise
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
@@ -21,6 +22,12 @@ offline = true
...
@@ -21,6 +22,12 @@ offline = true
recipe = slapos.cookbook:publishurl
recipe = slapos.cookbook:publishurl
url = http://[$${apache-php:ip}]:$${apache-php:port}/
url = http://[$${apache-php:ip}]:$${apache-php:port}/
[promise]
recipe = slapos.cookbook:check_port_listening
path = $${basedirectory:promises}/apache
hostname = $${apache-php:ip}
port = $${apache-php:port}
[mariadb-urlparse]
[mariadb-urlparse]
recipe = slapos.cookbook:urlparse
recipe = slapos.cookbook:urlparse
url = $${request-mariadb:connection-url}
url = $${request-mariadb:connection-url}
...
@@ -43,8 +50,6 @@ tmp-dir = $${directory:tmp-php}
...
@@ -43,8 +50,6 @@ tmp-dir = $${directory:tmp-php}
httpd-conf = $${rootdirectory:etc}/apache.conf
httpd-conf = $${rootdirectory:etc}/apache.conf
wrapper = $${basedirectory:services}/apache
wrapper = $${basedirectory:services}/apache
promise = $${basedirectory:promises}/apache
httpd-binary = ${apache:location}/bin/httpd
httpd-binary = ${apache:location}/bin/httpd
mysql-username = $${mariadb-urlparse:username}
mysql-username = $${mariadb-urlparse:username}
...
...
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