Skip to content

slapos
slapos
Commit 33b957f1 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼
Browse files
Options

Update Release Candidate

parents f64a2e53 0ff62733
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 116 deletions
component/boost-lib/buildout.cfg
View file @ 33b957f1
...@@ -3,6 +3,7 @@ parts = ...@@ -3,6 +3,7 @@ parts =
boost-lib boost-lib
extends = extends =
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../patch/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
...@@ -12,7 +13,7 @@ shared = true ...@@ -12,7 +13,7 @@ shared = true
url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_67_0.tar.bz2 url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_67_0.tar.bz2
md5sum = ced776cb19428ab8488774e1415535ab md5sum = ced776cb19428ab8488774e1415535ab
location = @@LOCATION@@ location = @@LOCATION@@
configure-command = ./bootstrap.sh --prefix=${:location} --without-icu configure-command = ./bootstrap.sh --prefix=${:location} --without-icu $${PYTHON:+--with-python=$PYTHON}
make-binary = make-binary =
make-options = make-options =
make-targets = for a in $MAKEFLAGS; do case $a in -j*) j=$a; break;; esac; done; make-targets = for a in $MAKEFLAGS; do case $a in -j*) j=$a; break;; esac; done;
...@@ -23,4 +24,8 @@ environment = ...@@ -23,4 +24,8 @@ environment =
ZLIB_INCLUDE=${zlib:location}/include ZLIB_INCLUDE=${zlib:location}/include
ZLIB_LIBPATH=${zlib:location}/lib ZLIB_LIBPATH=${zlib:location}/lib
LZMA_INCLUDE=${xz-utils:location}/include LZMA_INCLUDE=${xz-utils:location}/include
LZMA_LIBRARY_PATH=${xz-utils:location}/lib LZMA_LIBRARY_PATH=${xz-utils:location}/lib
\ No newline at end of file patch-options = -p1
patches =
${:_profile_base_location_}/fix-ftbfs-python-3.3.patch#c85fb479d51354deafd1cc7af78f25d2
patch-binary = ${patch:location}/bin/patch
component/boost-lib/fix-ftbfs-python-3.3.patch 0 → 100644
View file @ 33b957f1
Description: python3.3 has an extra multiarch include location
Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Last-Update: 2012-10-26
Forwarded: no
--- boost1.65.1-1.65.1+dfsg.orig/tools/build/src/tools/python.jam
+++ boost1.65.1-1.65.1+dfsg/tools/build/src/tools/python.jam
@@ -544,7 +544,9 @@
}
else
{
- includes ?= $(prefix)/include/python$(version) ;
+ python_includes = [ shell-cmd "printf `python$(version) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc());'`" ] ;
+ python_platincludes = [ shell-cmd "printf `python$(version) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc(plat_specific=1));'`" ] ;
+ includes ?= $(python_includes) $(python_platincludes) ;
local lib = $(exec-prefix)/lib ;
libraries ?= $(lib)/python$(version)/config $(lib) ;
component/defaults.cfg
View file @ 33b957f1
[buildout] [buildout]
extends = extends =
gcc/buildout.cfg
python-2.7/buildout.cfg python-2.7/buildout.cfg
python3/buildout.cfg python3/buildout.cfg
python = python python = python
...@@ -25,6 +26,12 @@ update = ...@@ -25,6 +26,12 @@ update =
depends = ${gcc:recipe} depends = ${gcc:recipe}
[gcc] [gcc]
depends =
# requirements that are common to gcc & python
${gettext:recipe}
${perl:recipe}
# python requirements for which the compiler does not matter
${patch:recipe}
recipe = slapos.recipe.build recipe = slapos.recipe.build
# Latest version provided by SlapOS. # Latest version provided by SlapOS.
part = gcc-8.2 part = gcc-8.2
......
component/p7zip/buildout.cfg
View file @ 33b957f1
...@@ -4,6 +4,7 @@ parts = ...@@ -4,6 +4,7 @@ parts =
[p7zip] [p7zip]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true
url = http://downloads.sf.net/project/p7zip/p7zip/${:version}/p7zip_${:version}_src_all.tar.bz2 url = http://downloads.sf.net/project/p7zip/p7zip/${:version}/p7zip_${:version}_src_all.tar.bz2
version = 9.38.1 version = 9.38.1
md5sum = 6cba8402ccab2370d3b70c5e28b3d651 md5sum = 6cba8402ccab2370d3b70c5e28b3d651
...@@ -11,4 +12,4 @@ configure-command = rm -r DOC ...@@ -11,4 +12,4 @@ configure-command = rm -r DOC
make-binary = make-binary =
make-options = make-options =
make-targets = make -j1 7z install make-targets = make -j1 7z install
DEST_HOME=${buildout:parts-directory}/${:_buildout_section_name_} DEST_HOME=@@LOCATION@@
component/python3/buildout.cfg
View file @ 33b957f1
...@@ -12,7 +12,6 @@ extends = ...@@ -12,7 +12,6 @@ extends =
../patch/buildout.cfg ../patch/buildout.cfg
../readline/buildout.cfg ../readline/buildout.cfg
../sqlite3/buildout.cfg ../sqlite3/buildout.cfg
../gcc/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
......
component/qemu-kvm/buildout.cfg
View file @ 33b957f1
...@@ -13,14 +13,9 @@ extends = ...@@ -13,14 +13,9 @@ extends =
../pcre/buildout.cfg ../pcre/buildout.cfg
../glib/buildout.cfg ../glib/buildout.cfg
# XXX Change all reference to kvm section to qemu section, then
# use qemu as main name section.
[qemu] [qemu]
<= kvm
[kvm]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
# qemu-kvm and qemu are now the same since 1.3. shared = true
url = https://download.qemu.org/qemu-4.1.1.tar.xz url = https://download.qemu.org/qemu-4.1.1.tar.xz
md5sum = 53879f792ef2675c6c5e6cbf5cc1ac6c md5sum = 53879f792ef2675c6c5e6cbf5cc1ac6c
configure-options = configure-options =
...@@ -47,14 +42,10 @@ environment = ...@@ -47,14 +42,10 @@ environment =
LDFLAGS=-L${pixman:location}/lib -Wl,-rpath=${pixman:location}/lib LDFLAGS=-L${pixman:location}/lib -Wl,-rpath=${pixman:location}/lib
[debian-netinst-base] [debian-netinst-base]
recipe = hexagonit.recipe.download recipe = slapos.recipe.build:download
ignore-existing = true
filename = ${:_buildout_section_name_} filename = ${:_buildout_section_name_}
url = https://cdimage.debian.org/cdimage/${:release}/${:arch}/iso-cd/debian-${:version}-${:arch}-netinst.iso url = https://cdimage.debian.org/cdimage/${:release}/${:arch}/iso-cd/debian-${:version}-${:arch}-netinst.iso
release = archive/${:version} release = archive/${:version}
download-only = true
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[debian-amd64-netinst-base] [debian-amd64-netinst-base]
<= debian-netinst-base <= debian-netinst-base
...@@ -80,11 +71,11 @@ md5sum = 50e7919f4276787f3a4631544edceae3 ...@@ -80,11 +71,11 @@ md5sum = 50e7919f4276787f3a4631544edceae3
# XXX: This is not the latest version because # XXX: This is not the latest version because
# Debian does not provide a stable URL for it. # Debian does not provide a stable URL for it.
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
version = 10.2.0 version = 10.3.0
md5sum = 36de671429939e90f2a31ce3fbed0aaf md5sum = 5956434be4b81e6376151b64ef9b1596
[debian-amd64-testing-netinst.iso] [debian-amd64-testing-netinst.iso]
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
release = daily-builds/daily/20200210-1 release = bullseye_di_alpha2
version = testing version = bullseye-DI-alpha2
md5sum = 437bdcbed2b279bea58b0a1ac3bd7ae2 md5sum = 3d7f45ac47e36212f5f7924b41c47f61
component/vm-img/debian.cfg
View file @ 33b957f1
...@@ -24,21 +24,14 @@ wait-ssh = 100 ...@@ -24,21 +24,14 @@ wait-ssh = 100
recipe = slapos.recipe.build:vm.install-debian recipe = slapos.recipe.build:vm.install-debian
environment = vm-install-environment environment = vm-install-environment
dists = debian-stable dists = debian-stable
size = 1Gi size = 2Gi
preseed.partman/early_command =
set -e /usr/lib/apt-setup/generators/99 AllowUnauthenticated; if [ "`debconf-get mirror/http/hostname`" = archive.debian.org ]; then echo "echo 'APT::Get::$2 \"true\";' >/target/etc/apt/apt.conf.d/01$2" >$1$2; chmod +x $1$2; fi
late-command = late-command =
# rdnssd causes too much trouble with recent QEMU, because the latter acts as # rdnssd causes too much trouble with recent QEMU, because the latter acts as
# a DNS proxy on both IPv4 and IPv6 without translating queries to what the # a DNS proxy on both IPv4 and IPv6 without translating queries to what the
# host supports. # host supports.
dpkg -P rdnssd dpkg -P rdnssd
[ $DIST != debian-squeeze ] || {
# Squeeze kernel (2.6.32) is too old for 9p mount points.
set squeeze-backports /etc/apt/sources.list.d/backports.list `
aptitude -F %p search '?source-package("^linux-latest-2.6$")~i'`
echo 'Acquire::Check-Valid-Until "false";' >/etc/apt/apt.conf.d/00AcceptExpired
echo deb http://archive.debian.org/debian-backports/ $1 main >$2
apt-get update --no-list-cleanup -o Dir::Etc::SourceList=/dev/null
apt-get install -y -t $1 $3
}
mount |grep -q 'on / .*\bdiscard\b' || ! type fstrim || { mount |grep -q 'on / .*\bdiscard\b' || ! type fstrim || {
apt-get clean apt-get clean
sync sync
...@@ -47,9 +40,7 @@ late-command = ...@@ -47,9 +40,7 @@ late-command =
debconf.debconf = debconf.debconf =
debconf/frontend noninteractive debconf/frontend noninteractive
debconf/priority critical debconf/priority critical
debian-squeeze/preseed.mirror/country = manual debian-wheezy/preseed.apt-setup/services-select = volatile
debian-squeeze/preseed.mirror/http/hostname = archive.debian.org
debian-squeeze/preseed.mirror/http/directory = /debian
debian-wheezy/preseed.mirror/country = manual debian-wheezy/preseed.mirror/country = manual
debian-wheezy/preseed.mirror/http/hostname = archive.debian.org debian-wheezy/preseed.mirror/http/hostname = archive.debian.org
debian-wheezy/preseed.mirror/http/directory = /debian debian-wheezy/preseed.mirror/http/directory = /debian
...@@ -70,10 +61,6 @@ x86_64.initrd = install.amd/initrd.gz ...@@ -70,10 +61,6 @@ x86_64.initrd = install.amd/initrd.gz
<= debian-stable <= debian-stable
x86_64.iso = debian-amd64-testing-netinst.iso x86_64.iso = debian-amd64-testing-netinst.iso
[debian-squeeze]
<= debian-stable
x86_64.iso = debian-amd64-squeeze-netinst.iso
[debian-wheezy] [debian-wheezy]
<= debian-stable <= debian-stable
x86_64.iso = debian-amd64-wheezy-netinst.iso x86_64.iso = debian-amd64-wheezy-netinst.iso
......
software/caddy-frontend/README.caddy_frontend.rst
View file @ 33b957f1
...@@ -592,3 +592,32 @@ Then specify in the master instance parameters: ...@@ -592,3 +592,32 @@ Then specify in the master instance parameters:
* set ``port`` to ``443`` * set ``port`` to ``443``
* set ``plain_http_port`` to ``80`` * set ``plain_http_port`` to ``80``
Technical notes
===============
Instantiated cluster structure
------------------------------
Instantiating caddy-frontend results with a cluster in various partitions:
* master (the controlling one)
* kedifa (contains kedifa server)
* caddy-frontend-N which contains the running processes to serve sites - this partition can be replicated by ``-frontend-quantity`` parameter
So it means sites are served in `caddy-frontend-N` partition, and this partition is structured as:
* Caddy serving the browser
* (optional) Apache Traffic Server for caching
* Caddy connected to the backend
Kedifa implementation
---------------------
`Kedifa <https://lab.nexedi.com/nexedi/kedifa>`_ server runs on kedifa partition.
Each `caddy-frontend-N` partition downloads certificates from the kedifa server.
Caucase (exposed by ``kedifa-caucase-url`` in master partition parameters) is used to handle certificates for authentication to kedifa server.
If ``automatic-internal-kedifa-caucase-csr`` is enabled (by default it is) there are scripts running on master partition to simulate human to sign certificates for each caddy-frontend-N node.
software/cloudooo/software-common.cfg
View file @ 33b957f1
...@@ -61,15 +61,10 @@ fonts = ...@@ -61,15 +61,10 @@ fonts =
${ipaex-fonts:location} ${ipaex-fonts:location}
${liberation-fonts:location} ${liberation-fonts:location}
${ocrb-fonts:location} ${ocrb-fonts:location}
# XXX These fonts have always been missing in cloudooo, but we want ${dejavu-fonts:location}
# keep compatibility a little bit more. ${libreoffice-bin:location}/share/fonts/
# ${dejavu-fonts:location}
# ${libreoffice-bin:location}/share/fonts/
# XXX fonts-include also have always been missing, which causes wrong
# font selections in cloudooo, such as using a serif fonts for Arial
fontconfig-includes = fontconfig-includes =
# ${fontconfig:location}/etc/fonts/conf.d ${fontconfig:location}/etc/fonts/conf.d
freetype = ${freetype:location} freetype = ${freetype:location}
glib = ${glib:location} glib = ${glib:location}
......
software/cloudooo/test/test.py
View file @ 33b957f1
...@@ -103,8 +103,7 @@ class HTMLtoPDFConversionFontTestMixin: ...@@ -103,8 +103,7 @@ class HTMLtoPDFConversionFontTestMixin:
def test(self): def test(self):
actual_font_mapping_mapping = {} actual_font_mapping_mapping = {}
for font, expected_substitution in sorted( for font in self.expected_font_mapping:
self.expected_font_mapping.items()):
src_html = ''' src_html = '''
<style> <style>
p {{ font-family: "{font}"; font-size: 20pt; }} p {{ font-family: "{font}"; font-size: 20pt; }}
...@@ -133,44 +132,44 @@ class TestWkhtmlToPDF(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase): ...@@ -133,44 +132,44 @@ class TestWkhtmlToPDF(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
__partition_reference__ = 'wk' __partition_reference__ = 'wk'
pdf_producer = 'Qt 4.8.7' pdf_producer = 'Qt 4.8.7'
expected_font_mapping = { expected_font_mapping = {
'Arial Black': 'Roboto-Medium', 'Arial': 'LiberationSans',
'Arial': 'Roboto-Medium', 'Arial Black': 'LiberationSans',
'Avant Garde': 'Roboto-Medium', 'Avant Garde': 'LiberationSans',
'Bookman': 'Roboto-Medium', 'Bookman': 'LiberationSans',
'Carlito': 'Roboto-Medium', 'Carlito': 'Carlito',
'Comic Sans MS': 'Roboto-Medium', 'Comic Sans MS': 'LiberationSans',
'Courier New': 'Roboto-Medium', 'Courier New': 'LiberationSans',
'DejaVu Sans Condensed': 'Roboto-Medium', 'DejaVu Sans': 'DejaVuSans',
'DejaVu Sans ExtraLight': 'Roboto-Medium', 'DejaVu Sans Condensed': 'LiberationSans',
'DejaVu Sans Mono': 'Roboto-Medium', 'DejaVu Sans ExtraLight': 'LiberationSans',
'DejaVu Sans': 'Roboto-Medium', 'DejaVu Sans Mono': 'DejaVuSansMono',
'DejaVu Serif Condensed': 'Roboto-Medium', 'DejaVu Serif': 'DejaVuSerif',
'DejaVu Serif': 'Roboto-Medium', 'DejaVu Serif Condensed': 'LiberationSans',
'Garamond': 'Roboto-Medium', 'Garamond': 'LiberationSans',
'Gentium Basic': 'Roboto-Medium', 'Gentium Basic': 'GentiumBasic',
'Gentium Book Basic': 'Roboto-Medium', 'Gentium Book Basic': 'GentiumBookBasic',
'Georgia': 'Roboto-Medium', 'Georgia': 'LiberationSans',
'Helvetica': 'Roboto-Medium', 'Helvetica': 'LiberationSans',
'Impact': 'Roboto-Medium', 'IPAex Gothic': 'LiberationSans',
'IPAex Gothic': 'Roboto-Medium', 'IPAex Mincho': 'LiberationSans',
'IPAex Mincho': 'Roboto-Medium', 'Impact': 'LiberationSans',
'Liberation Mono': 'LiberationMono', 'Liberation Mono': 'LiberationMono',
'Liberation Sans Narrow': 'Roboto-Medium',
'Liberation Sans': 'LiberationSans', 'Liberation Sans': 'LiberationSans',
'Liberation Sans Narrow': 'LiberationSansNarrow',
'Liberation Serif': 'LiberationSerif', 'Liberation Serif': 'LiberationSerif',
'Linux LibertineG': 'Roboto-Medium', 'Linux LibertineG': 'LiberationSans',
'OpenSymbol': 'Roboto-Medium', 'OpenSymbol': set(['DejaVuSans', 'OpenSymbol']),
'Palatino': 'Roboto-Medium', 'Palatino': 'LiberationSans',
'Roboto Black': 'Roboto-Medium', 'Roboto Black': 'LiberationSans',
'Roboto Condensed Light': 'Roboto-Medium', 'Roboto Condensed Light': 'LiberationSans',
'Roboto Condensed Regular': 'Roboto-Medium', 'Roboto Condensed Regular': 'LiberationSans',
'Roboto Light': 'Roboto-Medium', 'Roboto Light': 'LiberationSans',
'Roboto Medium': 'Roboto-Medium', 'Roboto Medium': 'LiberationSans',
'Roboto Thin': 'Roboto-Medium', 'Roboto Thin': 'LiberationSans',
'Times New Roman': 'Roboto-Medium', 'Times New Roman': 'LiberationSans',
'Trebuchet MS': 'Roboto-Medium', 'Trebuchet MS': 'LiberationSans',
'Verdana': 'Roboto-Medium', 'Verdana': 'LiberationSans',
'ZZZdefault fonts when no match': 'Roboto-Medium', 'ZZZdefault fonts when no match': 'LiberationSans'
} }
def _convert_html_to_pdf(self, src_html): def _convert_html_to_pdf(self, src_html):
...@@ -191,44 +190,44 @@ class TestLibreoffice(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase): ...@@ -191,44 +190,44 @@ class TestLibreoffice(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
__partition_reference__ = 'lo' __partition_reference__ = 'lo'
pdf_producer = 'LibreOffice 5.2' pdf_producer = 'LibreOffice 5.2'
expected_font_mapping = { expected_font_mapping = {
'Arial Black': 'LinuxLibertineG', 'Arial': 'LiberationSans',
'Arial': 'LinuxLibertineG', 'Arial Black': 'DejaVuSans',
'Avant Garde': 'LinuxLibertineG', 'Avant Garde': 'DejaVuSans',
'Bookman': 'LinuxLibertineG', 'Bookman': 'DejaVuSans',
'Carlito': 'Carlito', 'Carlito': 'Carlito',
'Comic Sans MS': 'LinuxLibertineG', 'Comic Sans MS': 'DejaVuSans',
'Courier New': 'LinuxLibertineG', 'Courier New': 'LiberationMono',
'DejaVu Sans': 'DejaVuSans',
'DejaVu Sans Condensed': 'DejaVuSansCondensed', 'DejaVu Sans Condensed': 'DejaVuSansCondensed',
'DejaVu Sans ExtraLight': 'LinuxLibertineG', 'DejaVu Sans ExtraLight': 'DejaVuSans',
'DejaVu Sans Mono': 'DejaVuSansMono', 'DejaVu Sans Mono': 'DejaVuSansMono',
'DejaVu Sans': 'DejaVuSans',
'DejaVu Serif Condensed': 'DejaVuSerifCondensed',
'DejaVu Serif': 'DejaVuSerif', 'DejaVu Serif': 'DejaVuSerif',
'Garamond': 'LinuxLibertineG', 'DejaVu Serif Condensed': 'DejaVuSerifCondensed',
'Garamond': 'DejaVuSerif',
'Gentium Basic': 'GentiumBasic', 'Gentium Basic': 'GentiumBasic',
'Gentium Book Basic': 'GentiumBookBasic', 'Gentium Book Basic': 'GentiumBookBasic',
'Georgia': 'LinuxLibertineG', 'Georgia': 'DejaVuSerif',
'Helvetica': 'LinuxLibertineG', 'Helvetica': 'LiberationSans',
'Impact': 'LinuxLibertineG',
'IPAex Gothic': 'IPAexGothic', 'IPAex Gothic': 'IPAexGothic',
'IPAex Mincho': 'IPAexMincho', 'IPAex Mincho': 'IPAexMincho',
'Impact': 'DejaVuSans',
'Liberation Mono': 'LiberationMono', 'Liberation Mono': 'LiberationMono',
'Liberation Sans Narrow': 'LiberationSansNarrow',
'Liberation Sans': 'LiberationSans', 'Liberation Sans': 'LiberationSans',
'Liberation Sans Narrow': 'LiberationSansNarrow',
'Liberation Serif': 'LiberationSerif', 'Liberation Serif': 'LiberationSerif',
'Linux LibertineG': 'LinuxLibertineG', 'Linux LibertineG': 'LinuxLibertineG',
'OpenSymbol': 'OpenSymbol', 'OpenSymbol': 'OpenSymbol',
'Palatino': 'LinuxLibertineG', 'Palatino': 'DejaVuSerif',
'Roboto Black': 'Roboto-Black', 'Roboto Black': 'Roboto-Black',
'Roboto Condensed Light': 'RobotoCondensed-Light', 'Roboto Condensed Light': 'RobotoCondensed-Light',
'Roboto Condensed Regular': 'LinuxLibertineG', 'Roboto Condensed Regular': 'DejaVuSans',
'Roboto Light': 'Roboto-Light', 'Roboto Light': 'Roboto-Light',
'Roboto Medium': 'Roboto-Medium', 'Roboto Medium': 'Roboto-Medium',
'Roboto Thin': 'Roboto-Thin', 'Roboto Thin': 'Roboto-Thin',
'Times New Roman': 'LinuxLibertineG', 'Times New Roman': 'LiberationSerif',
'Trebuchet MS': 'LinuxLibertineG', 'Trebuchet MS': 'DejaVuSans',
'Verdana': 'LinuxLibertineG', 'Verdana': 'DejaVuSans',
'ZZZdefault fonts when no match': 'LinuxLibertineG', 'ZZZdefault fonts when no match': 'DejaVuSans'
} }
def _convert_html_to_pdf(self, src_html): def _convert_html_to_pdf(self, src_html):
......
software/erp5/test/test/__init__.py
View file @ 33b957f1
...@@ -30,11 +30,21 @@ import os ...@@ -30,11 +30,21 @@ import os
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
_setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
os.path.abspath( os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', 'software.cfg'))) os.path.join(os.path.dirname(__file__), '..', '..', 'software.cfg')))
setup_module_executed = False
def setUpModule():
# slapos.testing.testcase's only need to be executed once
global setup_module_executed
if not setup_module_executed:
_setUpModule()
setup_module_executed = True
class ERP5InstanceTestCase(SlapOSInstanceTestCase): class ERP5InstanceTestCase(SlapOSInstanceTestCase):
"""ERP5 base test case """ERP5 base test case
""" """
......
software/kvm/buildout.hash.cfg
View file @ 33b957f1
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 092405e2fba77c22d4dc8cefcab677d8 md5sum = 1edb1e8d7cab32c29504a23fd3046838
[template-kvm] [template-kvm]
filename = instance-kvm.cfg.jinja2 filename = instance-kvm.cfg.jinja2
md5sum = 4e2aecca03c64d0bcff669652b581dba md5sum = f015c14f34dc9f5290188db11f11b4df
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
......
software/kvm/instance-kvm.cfg.jinja2
View file @ 33b957f1
...@@ -539,7 +539,7 @@ recipe = plone.recipe.command ...@@ -539,7 +539,7 @@ recipe = plone.recipe.command
filename = netconfig.sh filename = netconfig.sh
path = ${directory:public}/${:filename} path = ${directory:public}/${:filename}
ipv4-add-address = ip -4 address add {{ slap_configuration.get('tap-ipv4-addr') }}/{{ slap_configuration.get('tap-ipv4-netmask') }} dev \$IFACE noprefixroute ipv4-add-address = ip -4 address add {{ slap_configuration.get('tap-ipv4-addr') }}/{{ slap_configuration.get('tap-ipv4-netmask') }} dev \$IFACE noprefixroute
ipv4-add-gateway-route = ip -4 address add {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE ipv4-add-gateway-route = ip route add {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE
{% if nat_restrict -%} {% if nat_restrict -%}
ipv4-add-default-route = ip route add default via {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE ipv4-add-default-route = ip route add default via {{ slap_configuration.get('tap-ipv4-gateway') }} dev \$IFACE
{% elif global_ipv4_prefix -%} {% elif global_ipv4_prefix -%}
......
software/kvm/instance.cfg.in
View file @ 33b957f1
...@@ -88,8 +88,8 @@ extra-context = ...@@ -88,8 +88,8 @@ extra-context =
raw netcat_bin ${netcat:location}/bin/netcat raw netcat_bin ${netcat:location}/bin/netcat
raw python_executable ${buildout:executable} raw python_executable ${buildout:executable}
raw python_eggs_executable ${buildout:bin-directory}/${python-with-eggs:interpreter} raw python_eggs_executable ${buildout:bin-directory}/${python-with-eggs:interpreter}
raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64 raw qemu_executable_location ${qemu:location}/bin/qemu-system-x86_64
raw qemu_img_executable_location ${kvm:location}/bin/qemu-img raw qemu_img_executable_location ${qemu:location}/bin/qemu-img
raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename} raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
raw template_httpd_cfg ${template-httpd:rendered} raw template_httpd_cfg ${template-httpd:rendered}
...@@ -144,7 +144,7 @@ extensions = jinja2.ext.do ...@@ -144,7 +144,7 @@ extensions = jinja2.ext.do
context = context =
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
raw qemu_location ${kvm:location} key qemu_location qemu:location
raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename} raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
key pbsready_import_template template-pbsready-import:rendered key pbsready_import_template template-pbsready-import:rendered
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
...@@ -161,7 +161,7 @@ context = ...@@ -161,7 +161,7 @@ context =
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
raw qemu_nbd_executable_location ${kvm:location}/bin/qemu-nbd raw qemu_nbd_executable_location ${qemu:location}/bin/qemu-nbd
raw dash_executable_location ${dash:location}/bin/dash raw dash_executable_location ${dash:location}/bin/dash
raw onetimeupload_executable_location ${buildout:bin-directory}/onetimeupload raw onetimeupload_executable_location ${buildout:bin-directory}/onetimeupload
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
software/theia/buildout.hash.cfg
View file @ 33b957f1
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 99dfaa031e58518326b731e9218aa425 md5sum = 42d21dc3f5d3e57e142eea8e016195f0
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
......
software/theia/instance.cfg.in
View file @ 33b957f1
...@@ -121,7 +121,7 @@ recipe = slapos.cookbook:userinfo ...@@ -121,7 +121,7 @@ recipe = slapos.cookbook:userinfo
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:services}/$${:_buildout_section_name_} wrapper-path = $${directory:services}/$${:_buildout_section_name_}
command-line = command-line =
env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_SHELL=$${theia-shell:wrapper-path} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project} env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}' THEIA_SHELL=$${theia-shell:wrapper-path} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project}
ip = $${instance-parameter:ipv4-random} ip = $${instance-parameter:ipv4-random}
hostname = $${:ip} hostname = $${:ip}
......
software/theia/software.cfg
View file @ 33b957f1
...@@ -287,7 +287,7 @@ template = ...@@ -287,7 +287,7 @@ template =
"vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix", "vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix",
"vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.54.2/redhat.java-0.54.2.vsix", "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.54.2/redhat.java-0.54.2.vsix",
"vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix", "vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix",
"vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.4.74986/ms-python-release.vsix", "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
"vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix", "vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix",
"vscode-zc-buildout": "https://github.com/perrinjerome/vscode-zc-buildout/releases/download/v0.2.0/vscode-zc-buildout-0.2.0.vsix" "vscode-zc-buildout": "https://github.com/perrinjerome/vscode-zc-buildout/releases/download/v0.2.0/vscode-zc-buildout-0.2.0.vsix"
} }
......
stack/erp5/buildout.hash.cfg
View file @ 33b957f1
...@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 939522bb26bf2109d7db818585a46f7a md5sum = 82dc695e212be124d60ceb1143e56b0d
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
......
stack/erp5/instance-erp5.cfg.in
View file @ 33b957f1
...@@ -204,6 +204,7 @@ config-smtp-url = ${request-smtp:connection-url} ...@@ -204,6 +204,7 @@ config-smtp-url = ${request-smtp:connection-url}
config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }} config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }} config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }}
config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }} config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
config-zodb-dict = {{ dumps(zodb_dict) }} config-zodb-dict = {{ dumps(zodb_dict) }}
config-test-runner-enabled = {{ dumps(test_runner_enabled) }} config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
config-test-runner-node-count = {{ dumps(test_runner_node_count) }} config-test-runner-node-count = {{ dumps(test_runner_node_count) }}
...@@ -254,7 +255,6 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques ...@@ -254,7 +255,6 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques
config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }} config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }} config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }} config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
{% if test_runner_enabled -%} {% if test_runner_enabled -%}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list} config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
{% endif -%} {% endif -%}
......
stack/slapos.cfg
View file @ 33b957f1
...@@ -118,7 +118,7 @@ eggs = ...@@ -118,7 +118,7 @@ eggs =
[versions] [versions]
setuptools = 44.0.0 setuptools = 44.0.0
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 2.7.1+slapos005 zc.buildout = 2.7.1+slapos007
# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2) # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
zc.recipe.egg = 2.0.3+slapos003 zc.recipe.egg = 2.0.3+slapos003
# Use own version of h.r.download to be able to open .xz and .lz archives # Use own version of h.r.download to be able to open .xz and .lz archives
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7