diff --git a/component/apache-php/buildout.cfg b/component/apache-php/buildout.cfg index b7bb2d0c88d87dadc3de48006c62947c209e4a12..e6a684df6e17d16b1ae57466f5dae3276a44c8f8 100644 --- a/component/apache-php/buildout.cfg +++ b/component/apache-php/buildout.cfg @@ -22,8 +22,8 @@ extends = recipe = hexagonit.recipe.cmmi depends = ${mariadb:version} -url = http://fr2.php.net/distributions/php-5.3.13.tar.gz -md5sum = 179c67ce347680f468edbfc3c425476a +url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2 +md5sum = 5c7b614242ae12e9cacca21c8ab84818 configure-options = --with-apxs2=${apache:location}/bin/apxs --with-libxml-dir=${libxml2:location} @@ -65,6 +65,7 @@ environment = 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 TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_} + HOME=${apache:location} diff --git a/slapos/recipe/request.py b/slapos/recipe/request.py index d08755b760be361a4d788d61c75e9dd160ee9763..33163f4d370ee31f82f49955193d00bf27cbc39b 100644 --- a/slapos/recipe/request.py +++ b/slapos/recipe/request.py @@ -127,10 +127,11 @@ class Recipe(object): return_parameters) if not slave: # 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: self._raise_request_exception = exc self._raise_request_exception_formatted = traceback.format_exc() + return_parameter_dict = {} for param in return_parameters: options['connection-%s' % param] = '' diff --git a/stack/lamp/apache/instance-apache-export.cfg.jinja2 b/stack/lamp/apache/instance-apache-export.cfg.jinja2 index f5191792c75687b07a68c008f8a3e70d90672c7a..ac2c24505c5d86beb50fbe4e49e25dab7fcfe998 100644 --- a/stack/lamp/apache/instance-apache-export.cfg.jinja2 +++ b/stack/lamp/apache/instance-apache-export.cfg.jinja2 @@ -23,9 +23,6 @@ parts += cron cron-entry-logrotate promise - slapmonitor - slapmonitor-xml - frontend-promise content-promise publish-connection-informations diff --git a/stack/lamp/apache/instance-apache-php.cfg.in b/stack/lamp/apache/instance-apache-php.cfg.in index 80faeda290339046ac0c51b03bea67aab252ee69..32d43626e70a9dbdd5a3a06c1becdc46894a0d8c 100644 --- a/stack/lamp/apache/instance-apache-php.cfg.in +++ b/stack/lamp/apache/instance-apache-php.cfg.in @@ -9,8 +9,6 @@ parts = cron cron-entry-logrotate promise - slapmonitor - slapmonitor-xml frontend-promise content-promise @@ -249,18 +247,18 @@ config-custom_domain = $${slap-parameter:domain} #-- #-- Deploy slapmonitor. -[slapmonitor] -recipe = slapos.cookbook:slapmonitor -pid-file = $${basedirectory:run}/apache.pid -database-path = $${basedirectory:log}/slapmonitor.db -slapmonitor-path = ${buildout:bin-directory}/slapmonitor -path = $${basedirectory:services}/slapmonitor - -[slapmonitor-xml] -recipe = slapos.cookbook:slapmonitor-xml -database-path = $${basedirectory:log}/slapmonitor.db -slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml -path = $${directory:report}/slapmonitor-xml +#[slapmonitor] +#recipe = slapos.cookbook:slapmonitor +#pid-file = $${basedirectory:run}/apache.pid +#database-path = $${basedirectory:log}/slapmonitor.db +#slapmonitor-path = ${buildout:bin-directory}/slapmonitor +#path = $${basedirectory:services}/slapmonitor +# +#[slapmonitor-xml] +#recipe = slapos.cookbook:slapmonitor-xml +#database-path = $${basedirectory:log}/slapmonitor.db +#slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml +#path = $${directory:report}/slapmonitor-xml #---------------- diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index c9b2b3b7b566adfe9bc4b0c228256258cc7ef979..37aa823492a1855ec20daa2a6c1e12d7fd300401 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -74,7 +74,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in output = ${buildout:directory}/instance-apache-php.cfg -md5sum = 0538b05d27d8a64e89f898c09eb57716 +md5sum = 2440496923a8ccb6f5251801bf685b83 mode = 0644 [instance-apache-import] @@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output import-list = file parts template-parts:destination file replicated template-replicated:destination -md5sum = 2dc6134621b8a12817d43a979b84089a +md5sum = 4704f2788f096c7494694db72a9f6193 mode = 0644 [instance-resilient] @@ -310,6 +310,8 @@ slapos.recipe.template = 2.4.2 slapos.toolbox = 0.33 smmap = 0.8.2 +plone.recipe.command = 1.1 + # Required by: # slapos.core==0.35.1 # slapos.toolbox==0.33