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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Aurélien Vermylen
slapos
Commits
5c47b676
Commit
5c47b676
authored
Aug 11, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up : LibreOffice 5.0.0.5.
update cloudooo configuration as well.
parent
ac2e7bfc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
7 deletions
+15
-7
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+1
-1
software/cloudooo/instance.cfg.in
software/cloudooo/instance.cfg.in
+2
-0
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+4
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+5
-3
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+1
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-0
No files found.
software/cloudooo/instance-cloudoo.cfg.in
View file @
5c47b676
...
@@ -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['c
ups'] }}/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
LD_LIBRARY_PATH = {{ parameter_dict['c
airo'] }}/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
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 @
5c47b676
...
@@ -26,6 +26,7 @@ context =
...
@@ -26,6 +26,7 @@ context =
[dynamic-template-cloudooo-parameters]
[dynamic-template-cloudooo-parameters]
buildout-bin-directory = {{ buildout_bin_directory }}
buildout-bin-directory = {{ buildout_bin_directory }}
cairo = {{ cairo_location }}
coreutils = {{ coreutils_location }}
coreutils = {{ coreutils_location }}
cups = {{ cups_location }}
cups = {{ cups_location }}
dbus = {{ dbus_location }}
dbus = {{ dbus_location }}
...
@@ -52,6 +53,7 @@ libreoffice-bin = {{ libreoffice_bin_location }}
...
@@ -52,6 +53,7 @@ libreoffice-bin = {{ libreoffice_bin_location }}
libxcb = {{ libxcb_location }}
libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
mesa = {{ mesa_location }}
poppler = {{ poppler_location }}
poppler = {{ poppler_location }}
pixman = {{ pixman_location }}
xdamage = {{ xdamage_location }}
xdamage = {{ xdamage_location }}
xfixes = {{ xfixes_location }}
xfixes = {{ xfixes_location }}
zlib = {{ zlib_location }}
zlib = {{ zlib_location }}
...
...
software/cloudooo/software.cfg
View file @
5c47b676
...
@@ -38,10 +38,11 @@ context =
...
@@ -38,10 +38,11 @@ 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 =
2ad39c607cfa80bf87dd6258c29754c3
md5sum =
a26cb2a94b7bec07f62efcbe14fec608
extra-context =
extra-context =
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key coreutils_location coreutils:location
key coreutils_location coreutils:location
key cairo_location cairo:location
key cups_location cups:location
key cups_location cups:location
key dbus_glib_location dbus-glib:location
key dbus_glib_location dbus-glib:location
key dbus_location dbus:location
key dbus_location dbus:location
...
@@ -69,6 +70,7 @@ extra-context =
...
@@ -69,6 +70,7 @@ extra-context =
key libxcb_location libxcb:location
key libxcb_location libxcb:location
key mesa_location mesa:location
key mesa_location mesa:location
key openssl_location openssl:location
key openssl_location openssl:location
key pixman_location pixman: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 xdamage_location xdamage:location
...
@@ -78,5 +80,5 @@ extra-context =
...
@@ -78,5 +80,5 @@ extra-context =
[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 = 4
bede3be20dbc2ecfdb5d49b3184742
e
md5sum = 4
39c6f397b851d2884803e88e5a2d8d
e
mode = 640
mode = 640
stack/erp5/buildout.cfg
View file @
5c47b676
...
@@ -165,7 +165,7 @@ md5sum = 7d9760fe65f454700342eeffec14c884
...
@@ -165,7 +165,7 @@ md5sum = 7d9760fe65f454700342eeffec14c884
[template-cloudooo]
[template-cloudooo]
<= download-base
<= download-base
filename = instance-cloudoo.cfg.in
filename = instance-cloudoo.cfg.in
md5sum =
050fa6ff4eb397c5d4cb41a9f75afb3
f
md5sum =
8468648aa91712f0349baa1ad0c8ccd
f
[template-zope-conf]
[template-zope-conf]
<= download-base
<= download-base
...
@@ -202,7 +202,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -202,7 +202,7 @@ recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
rendered = ${buildout:directory}/template.cfg
rendered = ${buildout:directory}/template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
6a2c99f8df8bb8fe8e2b7fa96f68f62
b
md5sum =
f0c8b6491f97fdb0568b0db883dcda0
b
mode = 640
mode = 640
context =
context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
...
@@ -211,6 +211,7 @@ context =
...
@@ -211,6 +211,7 @@ context =
key aspell_location aspell:location
key aspell_location aspell:location
key bin_directory buildout:bin-directory
key bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key cairo_location cairo:location
key coreutils_location coreutils:location
key coreutils_location coreutils:location
key cups_location cups:location
key cups_location cups:location
key curl_location curl:location
key curl_location curl:location
...
@@ -250,6 +251,7 @@ context =
...
@@ -250,6 +251,7 @@ context =
key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
key mesa_location mesa:location
key mesa_location mesa:location
key openssl_location openssl:location
key openssl_location openssl:location
key pixman_location pixman:location
key root_common root-common:target
key root_common root-common:target
key sixtunnel_location 6tunnel:location
key sixtunnel_location 6tunnel:location
key slapos_core_version versions:slapos.core
key slapos_core_version versions:slapos.core
...
@@ -545,7 +547,7 @@ setup = ${erp5:location}
...
@@ -545,7 +547,7 @@ setup = ${erp5:location}
[cloudooo-repository]
[cloudooo-repository]
branch =
branch =
revision =
3241978a6ec832f6aa71d1df1a62e22a8feae2f1
revision =
d54ebe17b34f39446762e73fc3d31277
[slapos-toolbox]
[slapos-toolbox]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
5c47b676
...
@@ -34,7 +34,7 @@ wrapper = ${directory:service}/cloudooo
...
@@ -34,7 +34,7 @@ wrapper = ${directory:service}/cloudooo
data-directory = ${directory:cloudooo-data}
data-directory = ${directory:cloudooo-data}
environment =
environment =
LD_LIBRARY_PATH = {{ parameter_dict['c
ups'] }}/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
LD_LIBRARY_PATH = {{ parameter_dict['c
airo'] }}/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
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
# Binary information
# Binary information
...
...
stack/erp5/instance.cfg.in
View file @
5c47b676
...
@@ -6,6 +6,7 @@ context +=
...
@@ -6,6 +6,7 @@ context +=
raw slapos_core_version {{ slapos_core_version }}
raw slapos_core_version {{ slapos_core_version }}
[dynamic-template-cloudooo-parameters]
[dynamic-template-cloudooo-parameters]
cairo = {{ cairo_location }}
cups = {{ cups_location }}
cups = {{ cups_location }}
dbus = {{ dbus_location }}
dbus = {{ dbus_location }}
dbus-glib = {{ dbus_glib_location }}
dbus-glib = {{ dbus_glib_location }}
...
@@ -26,6 +27,7 @@ libffi = {{ libffi_location }}
...
@@ -26,6 +27,7 @@ libffi = {{ libffi_location }}
libpng12 = {{ libpng12_location }}
libpng12 = {{ libpng12_location }}
libxcb = {{ libxcb_location }}
libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
mesa = {{ mesa_location }}
pixman = {{ pixman_location }}
xdamage = {{ xdamage_location }}
xdamage = {{ xdamage_location }}
xfixes = {{ xfixes_location }}
xfixes = {{ xfixes_location }}
zlib = {{ zlib_location }}
zlib = {{ zlib_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