Skip to content

S
slapos
Commit 2901f28a authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Merge branch 'erp5' into vifib

parents 59fbe1f9 a9a394db
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
software/erp5/instance.cfg
View file @ 2901f28a
...@@ -58,6 +58,7 @@ link_binary_list = ...@@ -58,6 +58,7 @@ link_binary_list =
${w3m:location}/bin/w3m ${w3m:location}/bin/w3m
${xpdf:location}/bin/pdfinfo ${xpdf:location}/bin/pdfinfo
${xpdf:location}/bin/pdftotext ${xpdf:location}/bin/pdftotext
${poppler:location}/bin/pdftohtml
# XXX: products won't be needed as soon as all ERP5 (and products-deps) # XXX: products won't be needed as soon as all ERP5 (and products-deps)
# products will be eggified so then it will be possible to use them thanks to # products will be eggified so then it will be possible to use them thanks to
......
software/erp5/software.cfg
View file @ 2901f28a
...@@ -23,6 +23,6 @@ module = erp5 ...@@ -23,6 +23,6 @@ module = erp5
# Default template for erp5 instance. # Default template for erp5 instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = 9bc4cb9221bb5cc973b3ff7c4720a21b md5sum = 11e2d4205ba2cb0039f84f708331225f
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
stack/erp5.cfg
View file @ 2901f28a
...@@ -80,6 +80,7 @@ parts = ...@@ -80,6 +80,7 @@ parts =
varnish-2.1 varnish-2.1
stunnel stunnel
w3m w3m
poppler
xpdf xpdf
libpng12 libpng12
ghostscript ghostscript
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7