Commit 332f1f3f authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'lapp-resilient3'

parents 513c3cc9 5cc00f00
...@@ -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}
......
...@@ -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.getInstanceGuid()
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] = ''
......
...@@ -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
......
...@@ -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
#---------------- #----------------
......
...@@ -74,7 +74,7 @@ mode = 0644 ...@@ -74,7 +74,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg output = ${buildout:directory}/instance-apache-php.cfg
md5sum = 0538b05d27d8a64e89f898c09eb57716 md5sum = 2440496923a8ccb6f5251801bf685b83
mode = 0644 mode = 0644
[instance-apache-import] [instance-apache-import]
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment