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
Jean-Paul Smets
slapos
Commits
8b5ff33f
Commit
8b5ff33f
authored
Jul 05, 2016
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cloudooo: add mimetype entry addition parameter
parent
2025705b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
software/cloudooo/instance-cloudoo-input-schema.json
software/cloudooo/instance-cloudoo-input-schema.json
+4
-0
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+8
-1
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+4
-1
No files found.
software/cloudooo/instance-cloudoo-input-schema.json
View file @
8b5ff33f
...
...
@@ -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
View file @
8b5ff33f
...
...
@@ -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
View file @
8b5ff33f
...
...
@@ -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
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