cloudooo: add mimetype entry addition parameter

software/cloudooo/instance-cloudoo-input-schema.json

@@ -35,6 +35,10 @@
           "type": "string"
         }
       }
+    },
+    "mimetype-entry-addition": {
+      "description": "The list of entry to add to the cloudooo mimetype registry. Each entry should on one line which format is: \"<source_mimetype> <destination_mimetype> <handler>\"",
+      "type": "string"
     }
   }
 }

software/cloudooo/instance-cloudoo.cfg.in

@@ -22,6 +22,11 @@
 {%   set ssl_parameter_dict = slapparameter_dict.get(instance_parameter_dict['ssl-dict-parameter-name'], ssl_parameter_dict) -%}
 {% endif -%}
 
+{% set mimetype_entry_addition = instance_parameter_dict.get('mimetype-entry-addition', '') -%}
+{% if instance_parameter_dict.get('mimetype-entry-addition-parameter-name') -%}
+{%   set mimetype_entry_addition = mimetype_entry_addition ~ "\n" ~ slapparameter_dict.get(instance_parameter_dict['mimetype-entry-addition-parameter-name'], '') -%}
+{% endif -%}
+
 {% set apache_port = next_port -%}
 {% set haproxy_port = next_port + 1 -%}
 {% set next_port = next_port + 2 -%}
@@ -151,7 +156,9 @@ environment =
   FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
   PATH = ${binary-link:target-directory}
 mimetype_entry_addition =
-  text/html application/pdf wkhtmltopdf
+{% for entry in mimetype_entry_addition.splitlines() -%}
+{{ "  " ~ entry.strip() }}
+{% endfor -%}
 # Binary information
 # cloudooo specific configuration
 ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program

software/cloudooo/software.cfg

@@ -6,6 +6,9 @@ backend-count-parameter-name = backend-count
 backend-count = 1
 ssl-dict-parameter-name = ssl
 #ssl-dict =
+mimetype-entry-addition-parameter-name = mimetype-entry-addition
+mimetype-entry-addition =
+  text/html application/pdf wkhtmltopdf
 
 
 [buildout]
@@ -96,5 +99,5 @@ extra-context =
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = 5e8fb5070c873f8405ba72573a68854f
+md5sum = b23e68b3b76b7e7cba8df3a6c1dd5b4c
 mode = 640