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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Justin
slapos
Commits
63831b39
Commit
63831b39
authored
Jan 24, 2017
by
Tristan Cavelier
Committed by
Rafael Monnerat
Jan 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: add wkhtmltopdf converter to cloudooo
parent
6ec9371d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
2 deletions
+29
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+5
-2
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+22
-0
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-0
No files found.
stack/erp5/buildout.cfg
View file @
63831b39
...
@@ -40,6 +40,7 @@ extends =
...
@@ -40,6 +40,7 @@ extends =
../../component/tesseract/buildout.cfg
../../component/tesseract/buildout.cfg
../../component/w3-validator/buildout.cfg
../../component/w3-validator/buildout.cfg
../../component/w3m/buildout.cfg
../../component/w3m/buildout.cfg
../../component/wkhtmltopdf/buildout.cfg
../../component/xorg/buildout.cfg
../../component/xorg/buildout.cfg
../../component/poppler/buildout.cfg
../../component/poppler/buildout.cfg
../../component/zabbix/buildout.cfg
../../component/zabbix/buildout.cfg
...
@@ -178,7 +179,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
...
@@ -178,7 +179,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
[template-cloudooo]
[template-cloudooo]
<= download-base
<= download-base
filename = instance-cloudoo.cfg.in
filename = instance-cloudoo.cfg.in
md5sum =
5cf6058589201dc3ffb526a9162f7a55
md5sum =
ef5b5c48c2af6bf0a481af917b897566
[template-zope-conf]
[template-zope-conf]
<= download-base
<= download-base
...
@@ -235,7 +236,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -235,7 +236,7 @@ recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
rendered = ${buildout:directory}/template.cfg
rendered = ${buildout:directory}/template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
89bb530fe9fbbcf7f9dbed118e3c5285
md5sum =
d1954eff0fa50137ea1a86709f1f8d60
mode = 640
mode = 640
context =
context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
...
@@ -317,8 +318,10 @@ context =
...
@@ -317,8 +318,10 @@ context =
key template_zope_conf template-zope-conf:target
key template_zope_conf template-zope-conf:target
key userhosts_location userhosts:location
key userhosts_location userhosts:location
key wget_location wget:location
key wget_location wget:location
key wkhtmltopdf_location wkhtmltopdf:location
key xdamage_location xdamage:location
key xdamage_location xdamage:location
key xfixes_location xfixes:location
key xfixes_location xfixes:location
key xserver_location xserver:location
key zlib_location zlib:location
key zlib_location zlib:location
key extra_path_list eggs:extra-paths
key extra_path_list eggs:extra-paths
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
63831b39
...
@@ -10,6 +10,8 @@ parts +=
...
@@ -10,6 +10,8 @@ parts +=
promise
promise
promise-openoffice
promise-openoffice
{% if use_ipv6 %}promise-tunnel{% endif %}
{% if use_ipv6 %}promise-tunnel{% endif %}
xvfb-instance
wkhtmltopdf-on-xvfb
[publish]
[publish]
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
...
@@ -96,10 +98,13 @@ recipe = slapos.cookbook:mkdirectory
...
@@ -96,10 +98,13 @@ recipe = slapos.cookbook:mkdirectory
bin = ${buildout:directory}/bin
bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
srv = ${buildout:directory}/srv
srv = ${buildout:directory}/srv
var = ${buildout:directory}/var
run = ${:var}/run
service = ${:etc}/run
service = ${:etc}/run
promise = ${:etc}/promise
promise = ${:etc}/promise
cloudooo-data = ${:srv}/cloudooo
cloudooo-data = ${:srv}/cloudooo
font = ${:srv}/font
font = ${:srv}/font
framebuffer = ${:srv}/framebuffer
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
...
@@ -111,3 +116,20 @@ recipe = slapos.cookbook:symbolic.link
...
@@ -111,3 +116,20 @@ recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:bin}
target-directory = ${directory:bin}
link-binary =
link-binary =
{{ parameter_dict['onlyoffice-x2t'] }}/x2t
{{ parameter_dict['onlyoffice-x2t'] }}/x2t
[xvfb-instance]
recipe = slapos.cookbook:xvfb
runner-path = ${directory:service}/xvfb
xvfb-path = {{ parameter_dict["xserver"] }}/bin/Xvfb
fbdir-path = ${directory:framebuffer}
tmp-path = ${directory:run}
shell-path = {{ parameter_dict["dash"] }}/bin/dash
[wkhtmltopdf-on-xvfb]
recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/wkhtmltopdf
environment =
DISPLAY=:0
TMPDIR=${directory:run}
command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver
parameters-extra = true
stack/erp5/instance.cfg.in
View file @
63831b39
...
@@ -29,8 +29,10 @@ libxcb = {{ libxcb_location }}
...
@@ -29,8 +29,10 @@ libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
mesa = {{ mesa_location }}
onlyoffice-x2t = {{ dumps(onlyoffice_x2t_location) }}
onlyoffice-x2t = {{ dumps(onlyoffice_x2t_location) }}
pixman = {{ pixman_location }}
pixman = {{ pixman_location }}
wkhtmltopdf = {{ dumps(wkhtmltopdf_location) }}
xdamage = {{ xdamage_location }}
xdamage = {{ xdamage_location }}
xfixes = {{ xfixes_location }}
xfixes = {{ xfixes_location }}
xserver = {{ dumps(xserver_location) }}
zlib = {{ zlib_location }}
zlib = {{ zlib_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
libreoffice-bin = {{ libreoffice_bin_location }}
fonts = {{ fonts_location }}
fonts = {{ fonts_location }}
...
...
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