Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joanne Hugé
slapos
Commits
e28edcf0
Commit
e28edcf0
authored
Nov 06, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add more libraries for LibreOffice 4.3.3.2.
parent
85305952
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
62 additions
and
37 deletions
+62
-37
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+1
-1
software/cloudooo/instance.cfg.in
software/cloudooo/instance.cfg.in
+13
-8
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+9
-4
stack/cloudooo.cfg
stack/cloudooo.cfg
+19
-15
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+11
-5
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+1
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+8
-3
No files found.
software/cloudooo/instance-cloudoo.cfg.in
View file @
e28edcf0
...
@@ -19,7 +19,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
...
@@ -19,7 +19,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
recipe = slapos.cookbook:generic.cloudooo
recipe = slapos.cookbook:generic.cloudooo
ip = {{ ipv4 }}
ip = {{ ipv4 }}
environment =
environment =
LD_LIBRARY_PATH = {{ 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['
libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender
'] }}/lib:{{ parameter_dict['zlib'] }}/lib
LD_LIBRARY_PATH = {{ 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['xdamage'] }}/lib:{{ parameter_dict['xfixes
'] }}/lib:{{ parameter_dict['zlib'] }}/lib
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
PATH = ${binary-link:target-directory}
PATH = ${binary-link:target-directory}
# Binary information
# Binary information
...
...
software/cloudooo/instance.cfg.in
View file @
e28edcf0
...
@@ -25,31 +25,36 @@ context =
...
@@ -25,31 +25,36 @@ context =
${:extra-context}
${:extra-context}
[dynamic-template-cloudooo-parameters]
[dynamic-template-cloudooo-parameters]
buildout-bin-directory = {{ buildout_bin_directory }}
coreutils = {{ coreutils_location }}
cups = {{ cups_location }}
cups = {{ cups_location }}
dbus = {{ dbus_location }}
dbus = {{ dbus_location }}
dbus-glib = {{ dbus_glib_location }}
dbus-glib = {{ dbus_glib_location }}
file = {{ file_location }}
file = {{ file_location }}
fontconfig = {{ fontconfig_location }}
fontconfig = {{ fontconfig_location }}
fonts = {{ fonts_location }}
freetype = {{ freetype_location }}
freetype = {{ freetype_location }}
glib = {{ glib_location }}
glib = {{ glib_location }}
glu = {{ glu_location }}
haproxy = {{ haproxy_location }}
haproxy = {{ haproxy_location }}
libffi = {{ libffi
_location }}
imagemagick = {{ imagemagick
_location }}
libICE = {{ libICE_location }}
libICE = {{ libICE_location }}
libpng12 = {{ libpng12_location }}
libSM = {{ libSM_location }}
libSM = {{ libSM_location }}
libX11 = {{ libX11_location }}
libX11 = {{ libX11_location }}
libXau = {{ libXau_location }}
libXau = {{ libXau_location }}
libXdmcp = {{ libXdmcp_location }}
libXdmcp = {{ libXdmcp_location }}
libXext = {{ libXext_location }}
libXext = {{ libXext_location }}
libxcb = {{ libxcb_location }}
libXrender = {{ libXrender_location }}
libXrender = {{ libXrender_location }}
zlib = {{ zlib_location }}
libexpat = {{ libexpat_location }}
libffi = {{ libffi_location }}
libpng12 = {{ libpng12_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
fonts = {{ fonts_location }}
libxcb = {{ libxcb_location }}
coreutils = {{ coreutils_location }}
mesa = {{ mesa_location }}
imagemagick = {{ imagemagick_location }}
poppler = {{ poppler_location }}
poppler = {{ poppler_location }}
buildout-bin-directory = {{ buildout_bin_directory }}
xdamage = {{ xdamage_location }}
xfixes = {{ xfixes_location }}
zlib = {{ zlib_location }}
[dynamic-template-cloudooo]
[dynamic-template-cloudooo]
< = jinja2-template-base
< = jinja2-template-base
...
...
software/cloudooo/software.cfg
View file @
e28edcf0
...
@@ -37,12 +37,13 @@ context =
...
@@ -37,12 +37,13 @@ context =
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
1c5dab821393845b118644686154710f
md5sum =
2ad39c607cfa80bf87dd6258c29754c3
extra-context =
extra-context =
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key coreutils_location coreutils:location
key cups_location cups:location
key cups_location cups:location
key dbus_location dbus:location
key dbus_glib_location dbus-glib:location
key dbus_glib_location dbus-glib:location
key dbus_location dbus:location
key dcron_location dcron:location
key dcron_location dcron:location
key file_location file:location
key file_location file:location
key fontconfig_location fontconfig:location
key fontconfig_location fontconfig:location
...
@@ -50,6 +51,7 @@ extra-context =
...
@@ -50,6 +51,7 @@ extra-context =
key freetype_location freetype:location
key freetype_location freetype:location
key git_location git:location
key git_location git:location
key glib_location glib:location
key glib_location glib:location
key glu_location glu:location
key haproxy_location haproxy:location
key haproxy_location haproxy:location
key imagemagick_location imagemagick:location
key imagemagick_location imagemagick:location
key libICE_location libICE:location
key libICE_location libICE:location
...
@@ -59,20 +61,23 @@ extra-context =
...
@@ -59,20 +61,23 @@ extra-context =
key libXdmcp_location libXdmcp:location
key libXdmcp_location libXdmcp:location
key libXext_location libXext:location
key libXext_location libXext:location
key libXrender_location libXrender:location
key libXrender_location libXrender:location
key libexpat_location libexpat:location
key libffi_location libffi:location
key libffi_location libffi:location
key libpng12_location libpng12:location
key libpng12_location libpng12:location
key libreoffice_bin_location libreoffice-bin:location
key libreoffice_bin_location libreoffice-bin:location
key libxcb_location libxcb:location
key libxcb_location libxcb:location
key mesa_location mesa:location
key openssl_location openssl:location
key openssl_location openssl:location
key poppler_location poppler:location
key poppler_location poppler:location
key template_cloudooo template-cloudooo:target
key template_cloudooo template-cloudooo:target
key xdamage_location xdamage:location
key xfixes_location xfixes:location
key zlib_location zlib:location
key zlib_location zlib:location
key coreutils_location coreutils:location
[template-cloudooo]
[template-cloudooo]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum =
740a313b0d9d98800b099af8bf7cd0a7
md5sum =
4bede3be20dbc2ecfdb5d49b3184742e
mode = 640
mode = 640
[versions]
[versions]
...
...
stack/cloudooo.cfg
View file @
e28edcf0
...
@@ -9,27 +9,28 @@ exec-sitecustomize = false
...
@@ -9,27 +9,28 @@ exec-sitecustomize = false
extends =
extends =
../stack/slapos.cfg
../stack/slapos.cfg
../component/cloudooo/buildout.cfg
../component/coreutils/buildout.cfg
../component/cups/buildout.cfg
../component/cups/buildout.cfg
../component/dbus/buildout.cfg
../component/dbus/buildout.cfg
../component/dcron/buildout.cfg
../component/ffmpeg/buildout.cfg
../component/file/buildout.cfg
../component/fonts/buildout.cfg
../component/git/buildout.cfg
../component/glib/buildout.cfg
../component/glib/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/haproxy/buildout.cfg
../component/imagemagick/buildout.cfg
../component/libffi/buildout.cfg
../component/libffi/buildout.cfg
../component/libpng/buildout.cfg
../component/libpng/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/lxml-python/buildout.cfg
../component/lxml-python/buildout.cfg
../component/python-2.7/buildout.cfg
../component/mesa/buildout.cfg
../component/xorg/buildout.cfg
../component/fonts/buildout.cfg
../component/git/buildout.cfg
../component/poppler/buildout.cfg
../component/poppler/buildout.cfg
../component/imagemagick/buildout.cfg
../component/python-2.7/buildout.cfg
../component/ffmpeg/buildout.cfg
../component/file/buildout.cfg
../component/stunnel/buildout.cfg
../component/rdiff-backup/buildout.cfg
../component/rdiff-backup/buildout.cfg
../component/dcron/buildout.cfg
../component/stunnel/buildout.cfg
../component/coreutils/buildout.cfg
../component/xorg/buildout.cfg
../component/cloudooo/buildout.cfg
../component/haproxy/buildout.cfg
versions = versions
versions = versions
...
@@ -57,8 +58,11 @@ parts =
...
@@ -57,8 +58,11 @@ parts =
dbus
dbus
dbus-glib
dbus-glib
glib
glib
libexpat
libffi
libffi
libpng12
libpng12
xdamage
xfixes
imagemagick
imagemagick
file
file
poppler
poppler
...
...
stack/erp5/buildout.cfg
View file @
e28edcf0
...
@@ -27,6 +27,7 @@ extends =
...
@@ -27,6 +27,7 @@ extends =
../../component/libpng/buildout.cfg
../../component/libpng/buildout.cfg
../../component/libreoffice-bin/buildout.cfg
../../component/libreoffice-bin/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/mesa/buildout.cfg
../../component/percona-toolkit/buildout.cfg
../../component/percona-toolkit/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/mariadb/buildout.cfg
../../component/mysql-python/buildout.cfg
../../component/mysql-python/buildout.cfg
...
@@ -186,7 +187,7 @@ mode = 640
...
@@ -186,7 +187,7 @@ mode = 640
[template-cloudooo]
[template-cloudooo]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum =
45f8a58568fb7e6eb832802551f3ff03
md5sum =
c93c881267beadf840dc0b339a3a466a
mode = 640
mode = 640
[template-zope-conf]
[template-zope-conf]
...
@@ -200,7 +201,7 @@ mode = 640
...
@@ -200,7 +201,7 @@ mode = 640
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
66a1be44c72437d87a7b609eb58c3526
md5sum =
2ed28d874b5494521cb874a2474af7c5
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
...
@@ -209,8 +210,8 @@ extra-context =
...
@@ -209,8 +210,8 @@ extra-context =
key cups_location cups:location
key cups_location cups:location
key curl_location curl:location
key curl_location curl:location
key dash_location dash:location
key dash_location dash:location
key dbus_location dbus:location
key dbus_glib_location dbus-glib:location
key dbus_glib_location dbus-glib:location
key dbus_location dbus:location
key dcron_location dcron:location
key dcron_location dcron:location
key dmtx_utils_location dmtx-utils:location
key dmtx_utils_location dmtx-utils:location
key erp5_location erp5:location
key erp5_location erp5:location
...
@@ -219,9 +220,10 @@ extra-context =
...
@@ -219,9 +220,10 @@ extra-context =
key fonts_location fonts:location
key fonts_location fonts:location
key freetype_location freetype:location
key freetype_location freetype:location
key git_location git:location
key git_location git:location
key glib_location glib:location
key glu_location glu:location
key graphviz_location graphviz:location
key graphviz_location graphviz:location
key grep_location grep:location
key grep_location grep:location
key glib_location glib:location
key gzip_location gzip:location
key gzip_location gzip:location
key haproxy_location haproxy:location
key haproxy_location haproxy:location
key imagemagick_location imagemagick:location
key imagemagick_location imagemagick:location
...
@@ -233,6 +235,7 @@ extra-context =
...
@@ -233,6 +235,7 @@ extra-context =
key libXdmcp_location libXdmcp:location
key libXdmcp_location libXdmcp:location
key libXext_location libXext:location
key libXext_location libXext:location
key libXrender_location libXrender:location
key libXrender_location libXrender:location
key libexpat_location libexpat:location
key libffi_location libffi:location
key libffi_location libffi:location
key libpng12_location libpng12:location
key libpng12_location libpng12:location
key libreoffice_bin_location libreoffice-bin:location
key libreoffice_bin_location libreoffice-bin:location
...
@@ -241,13 +244,14 @@ extra-context =
...
@@ -241,13 +244,14 @@ extra-context =
key local_bt5_repository local-bt5-repository:list
key local_bt5_repository local-bt5-repository:list
key logrotate_location logrotate:location
key logrotate_location logrotate:location
key mariadb_location mariadb:location
key mariadb_location mariadb:location
key mesa_location mesa:location
key openssl_location openssl:location
key openssl_location openssl:location
key poppler_location poppler:location
key poppler_location poppler:location
key sed_location sed:location
key sed_location sed:location
key stunnel_location stunnel:location
key stunnel_location stunnel:location
key template_cloudooo template-cloudooo:target
key template_cloudooo template-cloudooo:target
key template_erp5_single template-erp5-single:target
key template_erp5_cluster template-erp5-cluster:target
key template_erp5_cluster template-erp5-cluster:target
key template_erp5_single template-erp5-single:target
key template_kumofs template-kumofs:rendered
key template_kumofs template-kumofs:rendered
key template_mariadb template-mariadb:rendered
key template_mariadb template-mariadb:rendered
key template_memcached template-memcached:rendered
key template_memcached template-memcached:rendered
...
@@ -259,6 +263,8 @@ extra-context =
...
@@ -259,6 +263,8 @@ extra-context =
key varnish_location varnish-3.0:location
key varnish_location varnish-3.0:location
key w3m_location w3m:location
key w3m_location w3m:location
key wget_location wget:location
key wget_location wget:location
key xdamage_location xdamage:location
key xfixes_location xfixes:location
key zlib_location zlib:location
key zlib_location zlib:location
[template-memcached]
[template-memcached]
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
e28edcf0
...
@@ -31,7 +31,7 @@ wrapper = ${directory:service}/cloudooo
...
@@ -31,7 +31,7 @@ wrapper = ${directory:service}/cloudooo
data-directory = ${directory:cloudooo-data}
data-directory = ${directory:cloudooo-data}
environment =
environment =
LD_LIBRARY_PATH = {{ 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['
libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender
'] }}/lib:{{ parameter_dict['zlib'] }}/lib
LD_LIBRARY_PATH = {{ 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['xdamage'] }}/lib:{{ parameter_dict['xfixes
'] }}/lib:{{ parameter_dict['zlib'] }}/lib
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
# Binary information
# Binary information
...
...
stack/erp5/instance.cfg.in
View file @
e28edcf0
...
@@ -75,16 +75,21 @@ file = {{ file_location }}
...
@@ -75,16 +75,21 @@ file = {{ file_location }}
fontconfig = {{ fontconfig_location }}
fontconfig = {{ fontconfig_location }}
freetype = {{ freetype_location }}
freetype = {{ freetype_location }}
glib = {{ glib_location }}
glib = {{ glib_location }}
libffi = {{ libffi
_location }}
glu = {{ glu
_location }}
libICE = {{ libICE_location }}
libICE = {{ libICE_location }}
libpng12 = {{ libpng12_location }}
libSM = {{ libSM_location }}
libSM = {{ libSM_location }}
libX11 = {{ libX11_location }}
libX11 = {{ libX11_location }}
libXau = {{ libXau_location }}
libXau = {{ libXau_location }}
libXdmcp = {{ libXdmcp_location }}
libXdmcp = {{ libXdmcp_location }}
libXext = {{ libXext_location }}
libXext = {{ libXext_location }}
libxcb = {{ libxcb_location }}
libXrender = {{ libXrender_location }}
libXrender = {{ libXrender_location }}
libexpat = {{ libexpat_location }}
libffi = {{ libffi_location }}
libpng12 = {{ libpng12_location }}
libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
xdamage = {{ xdamage_location }}
xfixes = {{ xfixes_location }}
zlib = {{ zlib_location }}
zlib = {{ zlib_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
fonts = {{ fonts_location }}
fonts = {{ fonts_location }}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment