- 07 Dec, 2020 1 commit
-
-
Jérome Perrin authored
Two main differences of haproxy are file format for certificates and logs. HAProxy also uses certificates in PEM format, but it expect its own server certificate and the key to be in the same file (although recent version seems to accept separate files, we don't use this now) and the CRL and CA certificates also all together in the same file. We change to use the same file for certificate and key and for CA and CRL, in the updater script we we build PEM files by containing all CA certificates and all CRL together. Also, since haproxy needs to be reloaded when certificate change, we run it in master-worker mode, with a pid file so that we can signal it to reload. For the logs, since haproxy does not log to file, we introduce a rsyslogd to log to a file. The log format is same as with httpd, except that timing are not in microseconds but in milliseconds - this did not seem to be configurable. This is a problem for apachedex reports on log, for that we plan to use an updated version of apachedex with support for `%{ms}T` for durations. HAProxy is configured with same timeouts, except: - "connect" timeout has been increased a bit (from 5 to 10s), because the comment "The connection should be immediate on LAN" was no longer true, now that haproxy is accessed from frontend. - the server entries for testrunner are a very long timeout (8h) because some ERP5 functional tests exceeed the 305s timeout. The SSL configuration is with current "modern" config from https://ssl-config.mozilla.org/ Tests have been modified a bit, because haproxy uses HTTP/2.0 and not 1.1 like httpd was doing several haproxy features (keep alive and gzip compression) are only available when backend uses HTTP/1.1, so we adjusted tests to use a 1.1 backend. There was also differences with logs, because of the time being in milliseconds. TestPublishedURLIsReachableMixin._checkERP5IsReachable was also updated, it was working by chance because when accessed behind httpd->haproxy->zope, zope was producing a redirect URL that was the URL of haproxy, which could be resolved by chance. This test was updated to access zope with a path that contains VirtualHostMonster magic, as the shared frontend ( with "zope" software type) is supposed to set. This should hopefuly solve the "502 Proxy Error" that we are observing with httpd.
-
- 03 Dec, 2020 10 commits
-
-
Jérome Perrin authored
This profile will change in stack/erp5 and in erp5 haproxy will also play the role of apache, but in slapos-master we will keep both apache and haproxy for a while.
-
Jérome Perrin authored
-
Jérome Perrin authored
There can be a short delay after the request until the request is logged, so wait a bit more before inspecting the log. There can be lines from requests made in previous tests, so make sure to only read the last line.
-
Jérome Perrin authored
Since haproxy checks backend is up at an inteval or 3 seconds with a timeout of 3 seconds, it can happen that the server reply in a bit more of 3 seconds and haproxy mark it as down. By using a shorter response time in test, we can achieve the same test coverage without this race condition and test runs a bit faster.
-
Jérome Perrin authored
Since we don't use caucase yet, it's necessary to make sure this feature is not lost.
-
Jérome Perrin authored
This resource is just a certificate, not necessary a certificate to use as client.
-
Jérome Perrin authored
The test expecting that X-Forwarded-For is empty can also accept the case where X-Forwarded-For header is not present.
-
Nicolas Wavrant authored
Further work by Vincent Pelletier: - do not enable openldap dependency, we do not need such advanced features (yet ?) - refresh noroot.patch - if we this component is to reference m4, then it should extend it
-
Vincent Pelletier authored
Fixes FTBFS on gcc 10.
-
Vincent Pelletier authored
-
- 02 Dec, 2020 10 commits
-
-
Thomas Gambier authored
-
Xavier Thompson authored
-
Thomas Gambier authored
-
Thomas Gambier authored
See merge request nexedi/slapos!872
-
Léo-Paul Géneau authored
-
Kirill Smelkov authored
This upgrade mainly fixes gpython and pymain to be more compatible with CPython when handling command line. In particular it moves sys.executable setup and -O handling into pymain: nexedi/pygolang!10 nexedi/pygolang@21756bd3 nexedi/pygolang@11b367c6 nexedi/pygolang@8564dfdd
-
Jérome Perrin authored
in ceb063a4 (software/repman: tests python3 compliance, 2020-10-23), test profile was changed to run on python3 only but this was accidentally reverted in 3a1e5628 (software/slapos-sr-testing: use nxdtest, 2020-10-28), by running repman also on python2. Restore the situation where we run repman only on python3
-
Jérome Perrin authored
The initial intent was to use an interpreter named `python_for_test` and not `python`, so that software do not accidentally pick up this python during compilation. 6033e4fa (software/slapos-sr-testing: fix python3 profile, 2020-12-01) was a quick fix for some python3 compatibility issues discovered after merge, but it was not correct, because by using ${python-interpreter:eggs}, it was installing the default python-interpreter section, which has an interpreter named `python`. This caused issues while building proxysql, which assumes /usr/bin/env python is python2. The fix is to override python-interpreter directly, we don't need another section eggs here.
-
Vincent Pelletier authored
-
Jérome Perrin authored
This code seems not used, before nexedi/slapos@51c3773e and nexedi/slapos@b77d7bae it was not possible to import. See merge request nexedi/slapos!869
-
- 01 Dec, 2020 11 commits
-
-
Thomas Gambier authored
See merge request nexedi/slapos!870
-
Thomas Gambier authored
the version up is needed to support more CPU architectures. For example, version 0.2.18 was failing with Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz
-
Xavier Thompson authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
-
Jérome Perrin authored
This code error when it's imported, because it imports from a non existing, slapos.tool module. This is an "emergency commit" to repair the tests on python 3 after 3a1e5628 (software/slapos-sr-testing: use nxdtest, 2020-10-28)
-
Jérome Perrin authored
This code error when it's imported, because `install` does not exist on this class, so the assignment caused NamError. This is an "emergency commit" to repair the tests on python 3 after 3a1e5628 (software/slapos-sr-testing: use nxdtest, 2020-10-28)
-
Jérome Perrin authored
It got broken in 3a1e5628 (software/slapos-sr-testing: use nxdtest, 2020-10-28)
-
- 30 Nov, 2020 8 commits
-
-
Thomas Gambier authored
See merge request !865
-
Xavier Thompson authored
This is to match Theia file hierarchy
-
Xavier Thompson authored
-
Xavier Thompson authored
-
Thomas Gambier authored
See merge request nexedi/slapos!866
-
Jérome Perrin authored
Until now, standalone subsystem was started as a daemon first time a terminal was openned and since it was running as daemon, stopping the theia instance did not stop any of the services running in the embedded slapos. Before slapos.core!265 there was two supervisor running as daemon: - ~/srv/slapos/etc/supervisord.conf which runs slapos proxy etc - ~/srv/slapos/inst/etc/supervisord.conf with runs instances in the embedded slapos After, the second one runs as a service in the first one, but the first one was still running as daemon. This changes so that the first supervisor runs as a service managed by the Theia instance, so stopping Theia instance will effectively stop the services. When upgrading, running instances should continue to run as detached. To attach them to the new service, procedure could be something like this Stop supervisors inside Theia instance: supervisorctl -c ~/srv/slapos/etc/supervisord.conf shutdown supervisorctl -c ~/srv/slapos/inst/etc/supervisord.conf shutdown Restart slappartX:slapos-standalone-instance-XXX-on-watch from host slapos
-
Jérome Perrin authored
-