Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
f4ab5f38
Commit
f4ab5f38
authored
Jan 30, 2017
by
Tristan Cavelier
Committed by
Romain Courteaud
Feb 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use onlyoffice-core instead of component/onlyoffice-x2t
parent
5bdd3486
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
39 deletions
+10
-39
component/onlyoffice-x2t/buildout.cfg
component/onlyoffice-x2t/buildout.cfg
+0
-29
software/cloudooo/buildout.hash.cfg
software/cloudooo/buildout.hash.cfg
+1
-1
software/cloudooo/instance-cloudooo.cfg.in
software/cloudooo/instance-cloudooo.cfg.in
+1
-1
software/cloudooo/software-common.cfg
software/cloudooo/software-common.cfg
+1
-1
stack/cloudooo.cfg
stack/cloudooo.cfg
+1
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+2
-2
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+1
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+1
-1
No files found.
component/onlyoffice-x2t/buildout.cfg
deleted
100644 → 0
View file @
5bdd3486
[buildout]
extends =
../dash/buildout.cfg
../curl/buildout.cfg
parts +=
onlyoffice-x2t
[onlyoffice-x2t]
recipe = slapos.recipe.build
url = https://lab.nexedi.com/tc/bin/raw/fc3af671d3b19e9d25b40326373222b601f23edc/onlyoffice-x2t-part.tar.gz
md5sum = 3e08a8b1345c301078cdce3a7f7360b2
# script to install.
script =
location = %(location)r
self.failIfPathExists(location)
import sys
extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
shutil.move(extract_dir, location)
wrapper_location = os.path.join("%(location)s", "x2t")
wrapper = open(wrapper_location, 'w')
wrapper.write('''#!${dash:location}/bin/dash
export LD_LIBRARY_PATH=%(location)s/lib:${curl:location}/lib
exec %(location)s/bin/x2t "$@"''')
wrapper.close()
os.chmod(wrapper_location, 0755)
os.chmod(location, 0750)
software/cloudooo/buildout.hash.cfg
View file @
f4ab5f38
...
@@ -19,4 +19,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
...
@@ -19,4 +19,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
[template-cloudooo-instance]
[template-cloudooo-instance]
filename = instance-cloudooo.cfg.in
filename = instance-cloudooo.cfg.in
md5sum =
afbfed1d762e5cdf7c6fd1292e7b28e7
md5sum =
b1e0c365b5cfffd86278daf39fb6de9f
software/cloudooo/instance-cloudooo.cfg.in
View file @
f4ab5f38
...
@@ -247,7 +247,7 @@ link-binary =
...
@@ -247,7 +247,7 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['onlyoffice-
x2t'] }}
/x2t
{{ parameter_dict['onlyoffice-
core'] }}/bin
/x2t
# rest of parts are candidates for some generic stuff
# rest of parts are candidates for some generic stuff
[directory]
[directory]
...
...
software/cloudooo/software-common.cfg
View file @
f4ab5f38
...
@@ -68,7 +68,7 @@ libreoffice-bin = ${libreoffice-bin:location}
...
@@ -68,7 +68,7 @@ libreoffice-bin = ${libreoffice-bin:location}
libxcb = ${libxcb:location}
libxcb = ${libxcb:location}
mesa = ${mesa:location}
mesa = ${mesa:location}
openssl = ${openssl:location}
openssl = ${openssl:location}
onlyoffice-
x2t = ${onlyoffice-x2t
:location}
onlyoffice-
core = ${onlyoffice-core
:location}
poppler = ${poppler:location}
poppler = ${poppler:location}
pixman = ${pixman:location}
pixman = ${pixman:location}
wkhtmltopdf = ${wkhtmltopdf:location}
wkhtmltopdf = ${wkhtmltopdf:location}
...
...
stack/cloudooo.cfg
View file @
f4ab5f38
...
@@ -22,7 +22,7 @@ extends =
...
@@ -22,7 +22,7 @@ extends =
../component/logrotate/buildout.cfg
../component/logrotate/buildout.cfg
../component/lxml-python/buildout.cfg
../component/lxml-python/buildout.cfg
../component/mesa/buildout.cfg
../component/mesa/buildout.cfg
../component/onlyoffice-
x2t
/buildout.cfg
../component/onlyoffice-
core
/buildout.cfg
../component/poppler/buildout.cfg
../component/poppler/buildout.cfg
../component/python-2.7/buildout.cfg
../component/python-2.7/buildout.cfg
../component/rdiff-backup/buildout.cfg
../component/rdiff-backup/buildout.cfg
...
...
stack/erp5/buildout.cfg
View file @
f4ab5f38
...
@@ -31,7 +31,7 @@ extends =
...
@@ -31,7 +31,7 @@ extends =
../../component/statsmodels/buildout.cfg
../../component/statsmodels/buildout.cfg
../../component/h5py/buildout.cfg
../../component/h5py/buildout.cfg
../../component/ocropy/buildout.cfg
../../component/ocropy/buildout.cfg
../../component/onlyoffice-
x2t
/buildout.cfg
../../component/onlyoffice-
core
/buildout.cfg
../../component/pandas/buildout.cfg
../../component/pandas/buildout.cfg
../../component/percona-toolkit/buildout.cfg
../../component/percona-toolkit/buildout.cfg
../../component/patch/buildout.cfg
../../component/patch/buildout.cfg
...
@@ -284,7 +284,7 @@ context =
...
@@ -284,7 +284,7 @@ context =
key mariadb_start_clone_from_backup mariadb-start-clone-from-backup:target
key mariadb_start_clone_from_backup mariadb-start-clone-from-backup:target
key matplotlibrc_location matplotlibrc:location
key matplotlibrc_location matplotlibrc:location
key mesa_location mesa:location
key mesa_location mesa:location
key onlyoffice_
x2t_location onlyoffice-x2t
:location
key onlyoffice_
core_location onlyoffice-core
:location
key parts_directory buildout:parts-directory
key parts_directory buildout:parts-directory
key openssl_location openssl:location
key openssl_location openssl:location
key percona_toolkit_location percona-toolkit:location
key percona_toolkit_location percona-toolkit:location
...
...
stack/erp5/buildout.hash.cfg
View file @
f4ab5f38
...
@@ -35,7 +35,7 @@ md5sum = 091d3c3feb2d543d176b0fadb11c07dc
...
@@ -35,7 +35,7 @@ md5sum = 091d3c3feb2d543d176b0fadb11c07dc
[template-cloudooo]
[template-cloudooo]
filename = instance-cloudoo.cfg.in
filename = instance-cloudoo.cfg.in
md5sum =
76f9e8c8cdc352081e34539d8fc17026
md5sum =
a3ca0af4983b3b80d191de3f2cc2146d
[template-zope-conf]
[template-zope-conf]
filename = zope.conf.in
filename = zope.conf.in
...
@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
...
@@ -71,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
47d09a83d44f38d3ea62743f004e866b
md5sum =
eba0b4596484dcf24b1da29ddeac453d
[monitor-template-dummy]
[monitor-template-dummy]
filename = dummy.cfg
filename = dummy.cfg
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
f4ab5f38
...
@@ -132,7 +132,7 @@ link-binary =
...
@@ -132,7 +132,7 @@ link-binary =
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdfinfo
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftotext
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['poppler'] }}/bin/pdftohtml
{{ parameter_dict['onlyoffice-
x2t'] }}
/x2t
{{ parameter_dict['onlyoffice-
core'] }}/bin
/x2t
[xvfb-instance]
[xvfb-instance]
recipe = slapos.cookbook:xvfb
recipe = slapos.cookbook:xvfb
...
...
stack/erp5/instance.cfg.in
View file @
f4ab5f38
...
@@ -30,7 +30,7 @@ libffi = {{ libffi_location }}
...
@@ -30,7 +30,7 @@ libffi = {{ libffi_location }}
libpng12 = {{ libpng12_location }}
libpng12 = {{ libpng12_location }}
libxcb = {{ libxcb_location }}
libxcb = {{ libxcb_location }}
mesa = {{ mesa_location }}
mesa = {{ mesa_location }}
onlyoffice-
x2t = {{ dumps(onlyoffice_x2t
_location) }}
onlyoffice-
core = {{ dumps(onlyoffice_core
_location) }}
pixman = {{ pixman_location }}
pixman = {{ pixman_location }}
poppler = {{ dumps(poppler_location) }}
poppler = {{ dumps(poppler_location) }}
wkhtmltopdf = {{ dumps(wkhtmltopdf_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