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
isaak yansane-sisk
slapos
Commits
a91e558b
Commit
a91e558b
authored
Mar 05, 2013
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merger master into lamp-app
parents
d08bbe09
332f1f3f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
65 deletions
+46
-65
component/apache-php/buildout.cfg
component/apache-php/buildout.cfg
+3
-2
slapos/recipe/request.py
slapos/recipe/request.py
+2
-1
software/agent/instance-agent.cfg
software/agent/instance-agent.cfg
+11
-9
software/agent/software.cfg
software/agent/software.cfg
+15
-35
stack/lamp/apache/instance-apache-export.cfg.jinja2
stack/lamp/apache/instance-apache-export.cfg.jinja2
+0
-3
stack/lamp/apache/instance-apache-php.cfg.in
stack/lamp/apache/instance-apache-php.cfg.in
+12
-14
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+3
-1
No files found.
component/apache-php/buildout.cfg
View file @
a91e558b
...
@@ -22,8 +22,8 @@ extends =
...
@@ -22,8 +22,8 @@ extends =
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
depends =
depends =
${mariadb:version}
${mariadb:version}
url = http://fr2.php.net/distributions/php-5.
3.13.tar.gz
url = http://fr2.php.net/distributions/php-5.
4.12.tar.bz2
md5sum =
179c67ce347680f468edbfc3c425476a
md5sum =
5c7b614242ae12e9cacca21c8ab84818
configure-options =
configure-options =
--with-apxs2=${apache:location}/bin/apxs
--with-apxs2=${apache:location}/bin/apxs
--with-libxml-dir=${libxml2:location}
--with-libxml-dir=${libxml2:location}
...
@@ -65,6 +65,7 @@ environment =
...
@@ -65,6 +65,7 @@ environment =
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
HOME=${apache:location}
...
...
slapos/recipe/request.py
View file @
a91e558b
...
@@ -127,10 +127,11 @@ class Recipe(object):
...
@@ -127,10 +127,11 @@ class Recipe(object):
return_parameters
)
return_parameters
)
if
not
slave
:
if
not
slave
:
# XXX: convention: should be instance-guid
# XXX: convention: should be instance-guid
options
[
'instance_guid'
]
=
self
.
instance
.
getId
()
options
[
'instance_guid'
]
=
self
.
instance
.
getI
nstanceGui
d
()
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
,
slapmodule
.
ResourceNotReady
)
as
exc
:
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
,
slapmodule
.
ResourceNotReady
)
as
exc
:
self
.
_raise_request_exception
=
exc
self
.
_raise_request_exception
=
exc
self
.
_raise_request_exception_formatted
=
traceback
.
format_exc
()
self
.
_raise_request_exception_formatted
=
traceback
.
format_exc
()
return_parameter_dict
=
{}
for
param
in
return_parameters
:
for
param
in
return_parameters
:
options
[
'connection-%s'
%
param
]
=
''
options
[
'connection-%s'
%
param
]
=
''
...
...
software/agent/instance-agent.cfg
View file @
a91e558b
...
@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory}
...
@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
offline = true
[directory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
run = $${:etc}/run
agentlog = $${buildout:directory}/var/log/agent
srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin
[instance]
[instance]
recipe =
${instance-recipe:egg}:${instance-recipe:module}
recipe =
slapos.cookbook:agent
agent_binary = ${buildout:directory}/bin/agent
agent_binary = ${buildout:directory}/bin/agent
pidfile = $${directory:srv}/agent.pid
pidfile = $${directory:srv}/agent.pid
log = $${directory:agentlog}/agent.log
log = $${directory:agentlog}/agent.log
...
@@ -21,11 +31,3 @@ default_max_install_duration = $${slap-parameter:default_max_install_duration}
...
@@ -21,11 +31,3 @@ default_max_install_duration = $${slap-parameter:default_max_install_duration}
default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration}
default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration}
default_max_request_duration = $${slap-parameter:default_max_request_duration}
default_max_request_duration = $${slap-parameter:default_max_request_duration}
default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration}
default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration}
[directory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
run = $${:etc}/run
agentlog = $${buildout:directory}/var/log/agent
srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin
software/agent/software.cfg
View file @
a91e558b
...
@@ -12,52 +12,32 @@ parts =
...
@@ -12,52 +12,32 @@ parts =
template
template
template-agent
template-agent
slapos.cookbook-repository
slapos.cookbook-repository
check-recipe
slapos.toolbox-repository
slapos.toolbox-repository
check-recipe
-toolbox
check-recipe
instance-recipe-egg
slapos-cookbook
script
script
# Local development
# Local development
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe =
plone.recipe.command
recipe =
slapos.recipe.build:gitclone
stop-on-error = true
repository = http://git.erp5.org/repos/slapos.git
branch = agent
branch = agent
location = ${buildout:parts-directory}/${:_buildout_section_name_}
git-executable = ${git:location}/bin/git
command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.git ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[check-recipe]
recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[slapos.toolbox-repository]
[slapos.toolbox-repository]
recipe = plone.recipe.command
recipe = slapos.recipe.build:gitclone
stop-on-error = true
repository = http://git.erp5.org/repos/slapos.toolbox.git
branch = agent
branch = agent3
location = ${buildout:parts-directory}/${:_buildout_section_name_}
git-executable = ${git:location}/bin/git
command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.toolbox.git ${:location}
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[check-recipe
-toolbox
]
[check-recipe]
recipe = plone.recipe.command
recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link;
[instance-recipe]
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
# XXX-Cedric: it can use newest slapos.cfg to not have duplication
egg = slapos.cookbook
module = agent
[instance-recipe-egg]
# XXX-Cedric: it can use newest slapos.cfg to not have duplication
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
${instance-recipe:egg}
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
@@ -70,7 +50,7 @@ mode = 0644
...
@@ -70,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-agent.cfg
url = ${:_profile_base_location_}/instance-agent.cfg
output = ${buildout:directory}/template-agent.cfg
output = ${buildout:directory}/template-agent.cfg
md5sum =
fd9670d8473be402b10990398b553b00
md5sum =
7c5c43eb98d5a11961d72fce97a8e67b
mode = 0644
mode = 0644
[script]
[script]
...
...
stack/lamp/apache/instance-apache-export.cfg.jinja2
View file @
a91e558b
...
@@ -23,9 +23,6 @@ parts +=
...
@@ -23,9 +23,6 @@ parts +=
cron
cron
cron-entry-logrotate
cron-entry-logrotate
promise
promise
slapmonitor
slapmonitor-xml
frontend-promise
frontend-promise
content-promise
content-promise
publish-connection-informations
publish-connection-informations
...
...
stack/lamp/apache/instance-apache-php.cfg.in
View file @
a91e558b
...
@@ -9,8 +9,6 @@ parts =
...
@@ -9,8 +9,6 @@ parts =
cron
cron
cron-entry-logrotate
cron-entry-logrotate
promise
promise
slapmonitor
slapmonitor-xml
frontend-promise
frontend-promise
content-promise
content-promise
...
@@ -249,18 +247,18 @@ config-custom_domain = $${slap-parameter:domain}
...
@@ -249,18 +247,18 @@ config-custom_domain = $${slap-parameter:domain}
#--
#--
#-- Deploy slapmonitor.
#-- Deploy slapmonitor.
[slapmonitor]
#
[slapmonitor]
recipe = slapos.cookbook:slapmonitor
#
recipe = slapos.cookbook:slapmonitor
pid-file = $${basedirectory:run}/apache.pid
#
pid-file = $${basedirectory:run}/apache.pid
database-path = $${basedirectory:log}/slapmonitor.db
#
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
#
slapmonitor-path = ${buildout:bin-directory}/slapmonitor
path = $${basedirectory:services}/slapmonitor
#
path = $${basedirectory:services}/slapmonitor
#
[slapmonitor-xml]
#
[slapmonitor-xml]
recipe = slapos.cookbook:slapmonitor-xml
#
recipe = slapos.cookbook:slapmonitor-xml
database-path = $${basedirectory:log}/slapmonitor.db
#
database-path = $${basedirectory:log}/slapmonitor.db
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
#
slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
path = $${directory:report}/slapmonitor-xml
#
path = $${directory:report}/slapmonitor-xml
#----------------
#----------------
...
...
stack/lamp/buildout.cfg
View file @
a91e558b
...
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
...
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum =
2dc6134621b8a12817d43a979b84089a
md5sum =
4704f2788f096c7494694db72a9f6193
mode = 0644
mode = 0644
[instance-resilient]
[instance-resilient]
...
@@ -310,6 +310,8 @@ slapos.recipe.template = 2.4.2
...
@@ -310,6 +310,8 @@ slapos.recipe.template = 2.4.2
slapos.toolbox = 0.33
slapos.toolbox = 0.33
smmap = 0.8.2
smmap = 0.8.2
plone.recipe.command = 1.1
# Required by:
# Required by:
# slapos.core==0.35.1
# slapos.core==0.35.1
# slapos.toolbox==0.33
# slapos.toolbox==0.33
...
...
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