diff --git a/software/cloudooo/buildout.hash.cfg b/software/cloudooo/buildout.hash.cfg index f5d289e9e3264048577e6846e5a861bd0a8a6304..94fc3353ea4da8b0c009b76d134970018db5cfc6 100644 --- a/software/cloudooo/buildout.hash.cfg +++ b/software/cloudooo/buildout.hash.cfg @@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0 [template-cloudooo-instance] filename = instance-cloudooo.cfg.in -md5sum = 689a7e4b6e33b9512481a5420e4aa37b +md5sum = e49ee3e309a19f9a3a9590789690c611 diff --git a/software/cloudooo/instance-cloudooo.cfg.in b/software/cloudooo/instance-cloudooo.cfg.in index 0e146f870faa261f7c5ae48e2c3bcf7461c904e6..226234c005b7544455b009e64cc0c3ed3979dc9b 100644 --- a/software/cloudooo/instance-cloudooo.cfg.in +++ b/software/cloudooo/instance-cloudooo.cfg.in @@ -163,9 +163,8 @@ includes = recipe = slapos.cookbook:generic.cloudooo ip = {{ ipv4 }} environment = - LD_LIBRARY_PATH = {{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib + LD_LIBRARY_PATH = {{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['gcc'] }}/lib:{{ parameter_dict['gcc'] }}/lib64:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib FONTCONFIG_FILE = ${fontconfig-conf:rendered} - PATH = ${binary-link:target-directory} mimetype_entry_addition = {% for entry in mimetype_entry_addition.splitlines() -%} diff --git a/software/cloudooo/software-common.cfg b/software/cloudooo/software-common.cfg index bbd9835bfe7bb0a68e16febf4d3f4654a7c00cbb..1ce9323b382c39b87471fb3f2a37e2cf2f90a0f1 100644 --- a/software/cloudooo/software-common.cfg +++ b/software/cloudooo/software-common.cfg @@ -4,6 +4,7 @@ extends = ../../stack/cloudooo.cfg ../../stack/logrotate/buildout.cfg ../../stack/monitor/buildout.cfg + ../../component/defaults.cfg parts = ${cloudooo-buildout:parts} @@ -62,6 +63,7 @@ fontconfig-includes = ${fontconfig:location}/etc/fonts/conf.d freetype = ${freetype:location} +gcc = ${gcc:location} glib = ${glib:location} glu = ${glu:location} haproxy = ${haproxy:location}