diff --git a/component/userhosts/buildout.cfg b/component/userhosts/buildout.cfg index 515dd1735c88b4bd63701b13400ae6f0333d4e54..86482471120483a41f05049fcdf94fecb2bf5044 100644 --- a/component/userhosts/buildout.cfg +++ b/component/userhosts/buildout.cfg @@ -2,7 +2,8 @@ recipe = slapos.recipe.cmmi shared = true url = https://lab.nexedi.com/nexedi/userhosts/repository/${:revision}/archive.tar.gz -revision = 1d3b463e7856db6e674a06258c0840206e6a7b72 +revision = a05fe5a3a5cb7005351ef4ec41460089f3ce4d0a +md5sum = 5a80b4d962d975f290a60cf790c3334d configure-command = true make-options = PREFIX=@@LOCATION@@ make-targets = check install diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index 9b569649e73f4f9c182e91329aa62adce323687a..577d4c29fbd0b622a30bcb93b8aa4f894c75abb0 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -70,7 +70,7 @@ md5sum = cc19560b9400cecbd23064d55c501eec [template] filename = instance.cfg.in -md5sum = 2ccfd6e2eb803a0d5e23e36a5e6c50ad +md5sum = b5ac16fdeed8863e465e955ba6d1e12a [monitor-template-dummy] filename = dummy.cfg @@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9 [template-zope] filename = instance-zope.cfg.in -md5sum = 2f3ddd328ac1c375e483ecb2ef5ffb57 +md5sum = fece4db89f72c16f8d71019746059469 [template-balancer] filename = instance-balancer.cfg.in diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in index 33656f78b8bd6ab03d8f9245f82bfdba4f38185a..8f55dd48cb6f8b21e7e0d77bba30829a6d0a6b99 100644 --- a/stack/erp5/instance-zope.cfg.in +++ b/stack/erp5/instance-zope.cfg.in @@ -177,7 +177,8 @@ recipe = slapos.cookbook:wrapper environment = HOSTALIASES=${hostaliases:rendered} HOSTS=${hosts:rendered} -command-line = '{{ parameter_dict['userhosts'] }}' ${:wrapped-command-line} + LD_PRELOAD={{ parameter_dict['userhosts'] }}:$LD_PRELOAD +command-line = ${:wrapped-command-line} {# Hack to deploy SSL certs via instance parameters -#} {% for zodb in zodb_dict.itervalues() -%} diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in index f3e541fbf44545714a49c1e897fb070437eb7bf5..1004a25c2e7d9cff173c5f398f42cf1e6366f460 100644 --- a/stack/erp5/instance.cfg.in +++ b/stack/erp5/instance.cfg.in @@ -107,7 +107,7 @@ link-binary = {{ dumps(zope_link_binary) }} fonts = {{ dumps(zope_fonts) }} fontconfig-includes = {{ dumps(zope_fontconfig_includes) }} template-fonts-conf = {{ dumps(template_fonts_conf) }} -userhosts = {{ userhosts_location }}/bin/userhosts +userhosts = {{ userhosts_location }}/lib/userhosts.so site-zcml = {{ site_zcml }} extra-path-list = {{ dumps(extra_path_list) }} matplotlibrc = {{ matplotlibrc_location }}