Commit 379b26c9 authored by Gabriel Monnerat's avatar Gabriel Monnerat

add imagemagick.cfg to imagemagick handler and updated mimetype-registry to select ooo handler

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43669 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 96476469
...@@ -55,7 +55,7 @@ memory-limit = 3000 ...@@ -55,7 +55,7 @@ memory-limit = 3000
uno-path = ${software_definition:openoffice_software}/basis-link/program/ uno-path = ${software_definition:openoffice_software}/basis-link/program/
office-binary-path = ${software_definition:openoffice_software}/program/ office-binary-path = ${software_definition:openoffice_software}/program/
openoffice-port = 4062 openoffice-port = 4062
env-PATH = ${software_definition:software_home}/parts/xpdf/bin env-PATH = ${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/imagemagick/bin
env-LD_LIBRARY_PATH = ${software_definition:software_home}/parts/file/lib env-LD_LIBRARY_PATH = ${software_definition:software_home}/parts/file/lib
server-hostname = 0.0.0.0 server-hostname = 0.0.0.0
server-port = ${configuration:oood_port} server-port = ${configuration:oood_port}
...@@ -67,6 +67,12 @@ mimetype-registry = ...@@ -67,6 +67,12 @@ mimetype-registry =
video/* * ffmpeg video/* * ffmpeg
application/ogg * ffmpeg application/ogg * ffmpeg
application/ogv * ffmpeg application/ogv * ffmpeg
image/* * imagemagick
text/* * ooo
application/zip * ooo
application/msword * ooo
application/vnd* * ooo
# this name is only for backward compatibility # this name is only for backward compatibility
......
...@@ -6,6 +6,7 @@ extends = ...@@ -6,6 +6,7 @@ extends =
../profiles/software-definition.cfg ../profiles/software-definition.cfg
../profiles/common.cfg ../profiles/common.cfg
xpdf.cfg xpdf.cfg
imagemagick.cfg
file.cfg file.cfg
python-2.6.cfg python-2.6.cfg
libreoffice-bin.cfg libreoffice-bin.cfg
...@@ -16,6 +17,7 @@ versions = versions ...@@ -16,6 +17,7 @@ versions = versions
parts = parts =
instance_template instance_template
cloudooo cloudooo
imagemagick
instance-egg instance-egg
libreoffice-bin libreoffice-bin
file file
......
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