diff --git a/slapos/recipe/cloudooo/__init__.py b/slapos/recipe/cloudooo/__init__.py index 4caddc7be51c68bda1d2ba73cadc6fd4e6ea7441..fa7875e8f43bfa88da636c5cefcc5050028f92ef 100755 --- a/slapos/recipe/cloudooo/__init__.py +++ b/slapos/recipe/cloudooo/__init__.py @@ -26,6 +26,7 @@ ############################################################################## from slapos.recipe.librecipe import BaseSlapRecipe import os +from os.path import sep import pkg_resources import sys import zc.buildout @@ -95,11 +96,17 @@ class Recipe(BaseSlapRecipe): def installConversionServer(self, ip, port, openoffice_port): name = 'conversion_server' + env_path = [] + for binary in self.options.get('link_binary_list', '').splitlines(): + path = sep.join(binary.split(sep)[:-1]) + if not path in env_path: + env_path.append(path) working_directory = self.createDataDirectory(name) conversion_server_dict = dict( working_path=working_directory, uno_path=self.options['ooo_uno_path'], office_binary_path=self.options['ooo_binary_path'], + env_PATH = ':'.join(env_path)[1:], ip=ip, port=port, openoffice_port=openoffice_port, diff --git a/slapos/recipe/cloudooo/template/cloudooo.cfg.in b/slapos/recipe/cloudooo/template/cloudooo.cfg.in index 2e6be7899205b54e101525b890d971970a573fad..e58a4b0ecf50eb0f592421da2ae3529ac3d172af 100755 --- a/slapos/recipe/cloudooo/template/cloudooo.cfg.in +++ b/slapos/recipe/cloudooo/template/cloudooo.cfg.in @@ -32,6 +32,7 @@ limit_memory_used = 3000 application_hostname = %(ip)s # OpenOffice Port openoffice_port = %(openoffice_port)s +env-PATH = %(env_PATH)s # LD_LIBRARY_PATH passed to OpenOffice env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s