[Erp5-report] r43669 gabriel - in /erp5/trunk/buildout: instance-profiles/ software-profiles/

[nobody at svn.erp5.org]

Author: gabriel
Date: Thu Feb 24 14:14:55 2011
New Revision: 43669

URL: http://svn.erp5.org?rev=43669&view=rev
Log:
add imagemagick.cfg to imagemagick handler and updated mimetype-registry to select ooo handler

Modified:
    erp5/trunk/buildout/instance-profiles/cloudooo.cfg
    erp5/trunk/buildout/software-profiles/cloudooo.cfg

Modified: erp5/trunk/buildout/instance-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/cloudooo.cfg?rev=43669&r1=43668&r2=43669&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] Thu Feb 24 14:14:55 2011
@@ -55,7 +55,7 @@ memory-limit = 3000
 uno-path = ${software_definition:openoffice_software}/basis-link/program/
 office-binary-path = ${software_definition:openoffice_software}/program/
 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
 server-hostname = 0.0.0.0
 server-port = ${configuration:oood_port}
@@ -67,6 +67,12 @@ mimetype-registry =
   video/* * ffmpeg
   application/ogg * ffmpeg
   application/ogv * ffmpeg
+  image/* * imagemagick
+  text/* * ooo
+  application/zip * ooo
+  application/msword * ooo
+  application/vnd* * ooo
+
 
 
 # this name is only for backward compatibility

Modified: erp5/trunk/buildout/software-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/cloudooo.cfg?rev=43669&r1=43668&r2=43669&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/cloudooo.cfg [utf8] Thu Feb 24 14:14:55 2011
@@ -6,6 +6,7 @@ extends =
   ../profiles/software-definition.cfg
   ../profiles/common.cfg
   xpdf.cfg
+  imagemagick.cfg
   file.cfg
   python-2.6.cfg
   libreoffice-bin.cfg
@@ -16,6 +17,7 @@ versions = versions
 parts =
   instance_template
   cloudooo
+  imagemagick
   instance-egg
   libreoffice-bin
   file