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
Matevz Golob
slapos
Commits
8d1be5fc
Commit
8d1be5fc
authored
Jan 30, 2017
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XXX remove x2t from Cloudooo SR + stack/{erp5,cloudooo}
parent
081ac151
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
10 deletions
+3
-10
software/cloudooo/instance-cloudooo.cfg.in
software/cloudooo/instance-cloudooo.cfg.in
+0
-1
software/cloudooo/software-common.cfg
software/cloudooo/software-common.cfg
+1
-2
stack/cloudooo.cfg
stack/cloudooo.cfg
+0
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-4
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+0
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+0
-1
No files found.
software/cloudooo/instance-cloudooo.cfg.in
View file @
8d1be5fc
...
...
@@ -250,7 +250,6 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['onlyoffice-x2t'] }}/x2t
# rest of parts are candidates for some generic stuff
[directory]
...
...
software/cloudooo/software-common.cfg
View file @
8d1be5fc
...
...
@@ -69,7 +69,6 @@ libreoffice-bin = ${libreoffice-bin:location}
libxcb = ${libxcb:location}
mesa = ${mesa:location}
openssl = ${openssl:location}
onlyoffice-x2t = ${onlyoffice-x2t:location}
poppler = ${poppler:location}
pixman = ${pixman:location}
wkhtmltopdf = ${wkhtmltopdf:location}
...
...
@@ -83,5 +82,5 @@ template-logrotate-base = ${template-logrotate-base:rendered}
[template-cloudooo-instance]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudooo.cfg.in
md5sum =
3de0b4732e5132448027c1387a4de3c9
md5sum =
84b9da151545039f6755c969b1532ec2
mode = 640
stack/cloudooo.cfg
View file @
8d1be5fc
...
...
@@ -22,7 +22,6 @@ extends =
../component/logrotate/buildout.cfg
../component/lxml-python/buildout.cfg
../component/mesa/buildout.cfg
../component/onlyoffice-x2t/buildout.cfg
../component/poppler/buildout.cfg
../component/python-2.7/buildout.cfg
../component/rdiff-backup/buildout.cfg
...
...
stack/erp5/buildout.cfg
View file @
8d1be5fc
...
...
@@ -25,7 +25,6 @@ extends =
../../component/matplotlib/buildout.cfg
../../component/mesa/buildout.cfg
../../component/numpy/buildout.cfg
../../component/onlyoffice-x2t/buildout.cfg
../../component/pandas/buildout.cfg
../../component/percona-toolkit/buildout.cfg
../../component/patch/buildout.cfg
...
...
@@ -179,7 +178,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
[template-cloudooo]
<= download-base
filename = instance-cloudoo.cfg.in
md5sum =
c553bbcdc5f80d893907a05acefc1356
md5sum =
060d264c45fe52d115a90dd0c7ae9923
[template-zope-conf]
<= download-base
...
...
@@ -236,7 +235,7 @@ recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe
rendered = ${buildout:directory}/template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
ec143441fac42ce6b3a183724298bc6b
md5sum =
4485e8f775591a7e7d477df9594311a1
mode = 640
context =
key mariadb_link_binary template-mariadb:link-binary
...
...
@@ -288,7 +287,6 @@ context =
key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
key matplotlibrc_location matplotlibrc:location
key mesa_location mesa:location
key onlyoffice_x2t_location onlyoffice-x2t:location
key openssl_location openssl:location
key pixman_location pixman:location
key poppler_location poppler:location
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
8d1be5fc
...
...
@@ -129,7 +129,6 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['onlyoffice-x2t'] }}/x2t
[xvfb-instance]
recipe = slapos.cookbook:xvfb
...
...
stack/erp5/instance.cfg.in
View file @
8d1be5fc
...
...
@@ -29,7 +29,6 @@ libffi = {{ libffi_location }}
libpng12 = {{ libpng12_location }}
libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
onlyoffice-x2t = {{ dumps(onlyoffice_x2t_location) }}
pixman = {{ pixman_location }}
poppler = {{ dumps(poppler_location) }}
wkhtmltopdf = {{ dumps(wkhtmltopdf_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