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
Sebastian
slapos
Commits
8080fab7
Commit
8080fab7
authored
Jan 25, 2017
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: add missing cloudooo minaries
coreutils imagemagick poppler
parent
a6384b65
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+4
-2
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+14
-0
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+3
-0
No files found.
stack/erp5/buildout.cfg
View file @
8080fab7
...
@@ -179,7 +179,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
...
@@ -179,7 +179,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
[template-cloudooo]
[template-cloudooo]
<= download-base
<= download-base
filename = instance-cloudoo.cfg.in
filename = instance-cloudoo.cfg.in
md5sum =
ef5b5c48c2af6bf0a481af917b89756
6
md5sum =
c553bbcdc5f80d893907a05acefc135
6
[template-zope-conf]
[template-zope-conf]
<= download-base
<= download-base
...
@@ -236,7 +236,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -236,7 +236,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 =
d1954eff0fa50137ea1a86709f1f8d60
md5sum =
ec143441fac42ce6b3a183724298bc6b
mode = 640
mode = 640
context =
context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
...
@@ -264,6 +264,7 @@ context =
...
@@ -264,6 +264,7 @@ context =
key glu_location glu:location
key glu_location glu: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 instance_common_cfg instance-common:rendered
key instance_common_cfg instance-common:rendered
key jsl_location jsl:location
key jsl_location jsl:location
key jupyter_enable_default erp5-defaults:jupyter-enable-default
key jupyter_enable_default erp5-defaults:jupyter-enable-default
...
@@ -290,6 +291,7 @@ context =
...
@@ -290,6 +291,7 @@ context =
key onlyoffice_x2t_location onlyoffice-x2t:location
key onlyoffice_x2t_location onlyoffice-x2t:location
key openssl_location openssl:location
key openssl_location openssl:location
key pixman_location pixman:location
key pixman_location pixman:location
key poppler_location poppler:location
key postfix_location postfix:location
key postfix_location postfix:location
key root_common root-common:target
key root_common root-common:target
key site_zcml site-zcml:target
key site_zcml site-zcml:target
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
8080fab7
...
@@ -115,6 +115,20 @@ monitor-title = Cloudooo monitor
...
@@ -115,6 +115,20 @@ monitor-title = Cloudooo monitor
recipe = slapos.cookbook:symbolic.link
recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:bin}
target-directory = ${directory:bin}
link-binary =
link-binary =
{{ parameter_dict['coreutils'] }}/bin/basename
{{ parameter_dict['coreutils'] }}/bin/cat
{{ parameter_dict['coreutils'] }}/bin/cp
{{ parameter_dict['coreutils'] }}/bin/ls
{{ parameter_dict['coreutils'] }}/bin/tr
{{ parameter_dict['coreutils'] }}/bin/uname
{{ parameter_dict['coreutils'] }}/bin/dirname
# wrapper recipe needs the head command
{{ parameter_dict['coreutils'] }}/bin/head
{{ parameter_dict['imagemagick'] }}/bin/convert
{{ parameter_dict['imagemagick'] }}/bin/identify
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['onlyoffice-x2t'] }}/x2t
{{ parameter_dict['onlyoffice-x2t'] }}/x2t
[xvfb-instance]
[xvfb-instance]
...
...
stack/erp5/instance.cfg.in
View file @
8080fab7
...
@@ -7,6 +7,7 @@ context +=
...
@@ -7,6 +7,7 @@ context +=
[dynamic-template-cloudooo-parameters]
[dynamic-template-cloudooo-parameters]
cairo = {{ cairo_location }}
cairo = {{ cairo_location }}
coreutils = {{ dumps(coreutils_location) }}
cups = {{ cups_location }}
cups = {{ cups_location }}
dbus = {{ dbus_location }}
dbus = {{ dbus_location }}
dbus-glib = {{ dbus_glib_location }}
dbus-glib = {{ dbus_glib_location }}
...
@@ -15,6 +16,7 @@ fontconfig = {{ fontconfig_location }}
...
@@ -15,6 +16,7 @@ fontconfig = {{ fontconfig_location }}
freetype = {{ freetype_location }}
freetype = {{ freetype_location }}
glib = {{ glib_location }}
glib = {{ glib_location }}
glu = {{ glu_location }}
glu = {{ glu_location }}
imagemagick = {{ dumps(imagemagick_location) }}
libICE = {{ libICE_location }}
libICE = {{ libICE_location }}
libSM = {{ libSM_location }}
libSM = {{ libSM_location }}
libX11 = {{ libX11_location }}
libX11 = {{ libX11_location }}
...
@@ -29,6 +31,7 @@ libxcb = {{ libxcb_location }}
...
@@ -29,6 +31,7 @@ libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
mesa = {{ mesa_location }}
onlyoffice-x2t = {{ dumps(onlyoffice_x2t_location) }}
onlyoffice-x2t = {{ dumps(onlyoffice_x2t_location) }}
pixman = {{ pixman_location }}
pixman = {{ pixman_location }}
poppler = {{ dumps(poppler_location) }}
wkhtmltopdf = {{ dumps(wkhtmltopdf_location) }}
wkhtmltopdf = {{ dumps(wkhtmltopdf_location) }}
xdamage = {{ xdamage_location }}
xdamage = {{ xdamage_location }}
xfixes = {{ xfixes_location }}
xfixes = {{ xfixes_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