slapos:6b2b58000244c294bb1e581b45abe26d5396adae commitshttps://lab.nexedi.com/nexedi/slapos/-/commits/6b2b58000244c294bb1e581b45abe26d5396adae2018-11-26T12:59:46+09:00https://lab.nexedi.com/nexedi/slapos/-/commit/6b2b58000244c294bb1e581b45abe26d5396adaestack/erp5: Improve clone startup script.2018-11-26T12:59:46+09:00Vincent Pelletiervincent@nexedi.com
Always running SQL_CHANGE_MASTER breaks GTID setup (at least on 10.1.24)
as it resets MASTER_USE_GTID. So only run it when not using GTID.
Also, fold SQL_SET_GTID into the existing "if" bloc for simplicity.https://lab.nexedi.com/nexedi/slapos/-/commit/0d30255958dadb7593f58f37841f5357abc4a35bUpdate to jsonschema to support Draft 7 and fix some invalid json2018-11-26T03:15:23+01:00Jérome Perrinjerome@nexedi.com
Update jsonschema eggs and some dependent eggs (including setuptools - but it looks OK) so that we can validate draft7 of json schema.
Because jsonschema now bundles some schemas for json schemas, we don't need to include it here.
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/425" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/425" data-link="false" data-link-reference="true" data-project="15" data-merge-request="2447" data-project-path="nexedi/slapos" data-iid="425" data-mr-title="Update to jsonschema to support Draft 7 and fix some invalid json" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">!425</a>https://lab.nexedi.com/nexedi/slapos/-/commit/90be61207b33567ac8ff1b7288dbff5863bf12d2software/jstestnode: move selenium configuration in test-runner key2018-11-26T02:25:29+01:00Jérome Perrinjerome@nexedi.com
Also fix JSON schema, that was just invalid.
Now we have a schema that renders properly on
<a href="https://lab.nexedi.com/bk/rjs_json_form">https://lab.nexedi.com/bk/rjs_json_form</a> and is similar to the one from
erp5, so maybe one day we can have a convention on erp5 testnode to push
the URL of a selenium server as test-runner.server-url . In any case,
it's good for now to have consistency.
Most of this work comes from Boris Kocherov from <a href="https://www.raskon.org/" rel="nofollow noreferrer noopener" target="_blank">https://www.raskon.org/</a>
Thanks !https://lab.nexedi.com/nexedi/slapos/-/commit/f1ffe8f0fd5eafcedba1753d368bce7d4fb59adesoftware/kvm: fix json schemas2018-11-26T02:25:28+01:00Jérome Perrinjerome@nexedi.com
string.format must be a string according to
<a href="https://json-schema.org/understanding-json-schema/reference/string.html#format" rel="nofollow noreferrer noopener" target="_blank">https://json-schema.org/understanding-json-schema/reference/string.html#format</a>
We were using our own version of metaschema with a patch for this. Now
we are back to using official schema, but with a custom format
`internet-address` that should be equivalent to:
"oneOf": [
{
"format": "hostname"
},
{
"format": "ipv4"
},
{
"format": "ipv6"
}
],https://lab.nexedi.com/nexedi/slapos/-/commit/0529cb7309e9cb6458776f7858e287113a3e1283software/erp5: fix schema definition of test-runner key2018-11-26T02:18:54+01:00Jérome Perrinjerome@nexedi.com
The schema was not matching implementation (it was not even correct
schema)https://lab.nexedi.com/nexedi/slapos/-/commit/ff6cd56fbb03c38b0e479a26b26d3ded6d7c13dftest: suport Draft 3,4,6 & 7 of jsonschema2018-11-26T02:18:53+01:00Jérome Perrinjerome@nexedi.com
Using
<a href="https://python-jsonschema.readthedocs.io/en/latest/validate/#versioned-validators" rel="nofollow noreferrer noopener" target="_blank">https://python-jsonschema.readthedocs.io/en/latest/validate/#versioned-validators</a>
instead of a local copy of json schemahttps://lab.nexedi.com/nexedi/slapos/-/commit/0272cb2114ab7d6fe04ec22d9fa5ac25816d2d57stack/slapos: version ↑ slapos.libnetworkcache 0.162018-11-26T02:18:53+01:00Jérome Perrinjerome@nexedi.com
( not needed for the current work on jsonschema draft 7 support, but
done at the same time, to merge together two unrelated changes which
cause recompilation so that we recompile only once )https://lab.nexedi.com/nexedi/slapos/-/commit/0dec8251016c3b657689c526484b93ff2d00a9a4stack/slapos: version ↑ setuptools 40.4.32018-11-26T02:18:53+01:00Jérome Perrinjerome@nexedi.com
jsonschema = 3.0.0a3 needs a recent setuptools, probably because it uses
setuptools_scmhttps://lab.nexedi.com/nexedi/slapos/-/commit/70f88d2c9f254056ad0b3f79cf598da47c0662cdstack/slapos: version ↑ six 1.11.02018-11-26T02:18:52+01:00Jérome Perrinjerome@nexedi.com
jsonschema needs six>=1.11.0
Version and requirements information containing six:
[versions] constraint on six: 1.10.0
Requirement of mock==2.0.0: six>=1.9
Requirement of slapos.core==1.4.11: six
Requirement of bcrypt==3.1.4: six>=1.4.1
Requirement of cryptography==2.3.1: six>=1.4.1
Requirement of jsonschema: six>=1.11.0
Requirement of manuel: six
Requirement of cliff: six>=1.9.0
Requirement of pyOpenSSL>=18.0.0: six>=1.5.2https://lab.nexedi.com/nexedi/slapos/-/commit/b3394953fdb837945f9f0e8855e5c4719a8347f0stack/slapos: version ↑ jsonschema 3.0.0a32018-11-26T02:18:52+01:00Jérome Perrinjerome@nexedi.com
with support for draft7 of json schemahttps://lab.nexedi.com/nexedi/slapos/-/commit/158d9e54e29bfce650187c8e77baf3703b6f675dsoftware/erp5: fix json schema formatting2018-11-26T02:18:51+01:00Jérome Perrinjerome@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/100c2963e906050c59689ad936998aac86841886PlantUML2018-11-26T02:17:54+01:00Jérome Perrinjerome@nexedi.com
SlapOS instance for a self hosted version of <a href="http://www.plantuml.com/" rel="nofollow noreferrer noopener" target="_blank">http://www.plantuml.com/</a>
README for this slapos software:
# PlantUML
<a href="http://plantuml.com/" rel="nofollow noreferrer noopener" target="_blank">http://plantuml.com/</a>
PlantUML is a service rendering UML diagrams defined in a simple and intuitive
language.
Each diagram has a unique URL which is made of an encoded version of the
diagram code.
Diagrams can be rendered as png, svg or ascii art text.
See <a href="http://plantuml.com/PlantUML_Language_Reference_Guide.pdf" rel="nofollow noreferrer noopener" target="_blank">http://plantuml.com/PlantUML_Language_Reference_Guide.pdf</a> for a full
reference on the diagram language.
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/435" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/435" data-link="false" data-link-reference="true" data-project="15" data-merge-request="2469" data-project-path="nexedi/slapos" data-iid="435" data-mr-title="PlantUML" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">!435</a>https://lab.nexedi.com/nexedi/slapos/-/commit/5486d8c6fb2bdffc3f5210bf4c0ab0abbaa59785caddy-frontend/test: Disable DEBUG mode2018-11-23T20:52:40+01:00Lukasz Nowakluke@nexedi.com
Problem has been found, and as this mode emits a lot of data with test result
disable it.https://lab.nexedi.com/nexedi/slapos/-/commit/3b41b8aca8ff3b4a186bb44ddf8f3254e35ee1b6component/slapos: OpenSSL can be download from https now2018-11-23T20:13:38+01:00Rafael Monneratrafael@nexedi.com
The support to debian 6 was dropped, so this compatibility layer is not needed anymore.https://lab.nexedi.com/nexedi/slapos/-/commit/bea2bd6632f0b19103d277b1b91697dbe2e91a82component/slapos: Take BUILD_DIRECTORY from buildout section2018-11-23T17:58:59+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/721a043e3522c97c94fa6b4590f8ee0c441e4f8dslapos: Include specific obs.cfg destinated to be used to build packages2018-11-23T17:23:08+01:00Rafael Monneratrafael@nexedi.com
On OBS the build system is quite particular and it has to work in a specific way,
This file handles the difference between build from source and prepare things to OBS.https://lab.nexedi.com/nexedi/slapos/-/commit/aad9885889101822ac99140478fcc2cbfada7b3ecaddy-frontend: Control cp runs2018-11-23T17:05:12+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/8134da571dbe2dcf92816278887bf2eaa698983bcaddy-frontend/test: Enable DEBUG mode2018-11-23T13:37:11+01:00Lukasz Nowakluke@nexedi.com
It will allow to track behaviour of the test on various test nodes.https://lab.nexedi.com/nexedi/slapos/-/commit/0a4da595f5159b8f81ef98636f7c2ec4fca893c9component/python-cryptography: Fix egg compilation2018-11-23T11:43:57+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/8e03de68c5ecf8e2d7f347d5e9a543f67ac2f9d3caddy-frontend: Add some TODOs found during recent work2018-11-22T09:38:53+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/099c32e8395e0ed0a2c5b2e5a6db859e947b4801caddy-frontend: Test ssl_ca_crt cases2018-11-22T09:36:27+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/7b82b2fd106a9a01f4fab37a3b84bb267634bff7clean "caddy-frontend: Fix incorrect ssl_ca_crt configuration"2018-11-22T09:36:27+01:00Lukasz Nowakluke@nexedi.com
Drop not needed references and logic for ssl_ca_crt old implementation.https://lab.nexedi.com/nexedi/slapos/-/commit/2427d4eb9a8ec26b9649fd80247595769674bd4acaddy-frontend: ssl_ca_crt requires ssl_crt and ssl_key2018-11-22T09:36:27+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/49433038b0e8a507fb3368b1f1dc1716da056585kvm: Include a simplified version for KVM Cluster parameters2018-11-21T17:27:48+01:00Rafael Monneratrafael@nexedi.com
This version only display informations to change keyboard and set a NDB.https://lab.nexedi.com/nexedi/slapos/-/commit/867f7b8554865ce899680d1676d31f4ae31ee5c9fixup! caddy-frontend: Deduplicate local host names2018-11-21T15:46:39+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/d2391b0ede12f8d456746e1e82a12a7e81eee0d8caddy-frontend: Fix incorrect ssl_ca_crt configuration2018-11-21T11:40:41+01:00Lukasz Nowakluke@nexedi.com
In "caddy-frontend: Improve generated files" ssl_ca_crt was mistakenly used
for client authentication, which is in reality not supported nor needed.
It came from misunderstanding of apache configuration.https://lab.nexedi.com/nexedi/slapos/-/commit/0925449a0d68a7616bdd2dc097c205f464244655caddy-frontend: Deduplicate local host names2018-11-21T08:24:34+01:00Lukasz Nowakluke@nexedi.com
custom_domain and server-alias on given slave do not have to clash, and
can be deduplicated during request parameter analysis.
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/444" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/444" data-link="false" data-link-reference="true" data-project="15" data-merge-request="2510" data-project-path="nexedi/slapos" data-iid="444" data-mr-title="caddy-frontend: Deduplicate local host names" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos!444</a>https://lab.nexedi.com/nexedi/slapos/-/commit/4d1c91aa28f776e6e1a51c3204b633b6b1687179software/erp5testnode/plantuml: SR to run plantuml tests2018-11-21T07:07:13+01:00Jérome Perrinjerome@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/2a6d87b3971186b8f8657875426b537467a3f403plantuml: test for software release2018-11-21T07:07:12+01:00Jérome Perrinjerome@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/fdbfc49e7b37f543235c29b6d676d5b9f1c07becfixup! caddy-frontend: Implement ssl_ca_crt2018-11-20T23:48:06+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/cb3dd3a62388447465de0e4a0842da84ac3489f1fixup! caddy-frontend: Implement ssl_ca_crt2018-11-20T23:41:43+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/0a0bc7421c1b8ea421214fad0b6c8055de22fc04caddy-frontend: Explain how to workaround apache-ca-certificate2018-11-20T23:00:55+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/2c6aa92b56ba68565c8566e5de64a9b5e60f348ecaddy-frontend: Implement ssl_ca_crt2018-11-20T23:00:55+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/80a311fc6373b7b0804e73fac239c7d7aaae6d4ecaddy-frontend: Mark TODO entry done2018-11-20T16:49:16+01:00Lukasz Nowakluke@nexedi.com
Since caddy-frontend: Support wildcards the wildcards are supported.https://lab.nexedi.com/nexedi/slapos/-/commit/086734e9a4b9a08d969f63aaa9d7565c562f6b86caddy-frontend: Support wildcards2018-11-20T16:36:18+01:00Lukasz Nowakluke@nexedi.com
server-alias and custom_domain can be wildcards, so support such case.
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos/merge_requests/446" data-original="https://lab.nexedi.com/nexedi/slapos/merge_requests/446" data-link="false" data-link-reference="true" data-project="15" data-merge-request="2512" data-project-path="nexedi/slapos" data-iid="446" data-mr-title="caddy-frontend: Support wildcards" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos!446</a>https://lab.nexedi.com/nexedi/slapos/-/commit/37c0bd3c60330458b3952015c07ce0deb6a131fecaddy-frontend: Important TODOs2018-11-20T14:29:25+01:00Lukasz Nowakluke@nexedi.comhttps://lab.nexedi.com/nexedi/slapos/-/commit/7318f3258c90697cfcdbdc337da8086c94fc317esquash! caddy-frontend: Fix slave authorization2018-11-20T11:54:46+01:00Lukasz Nowakluke@nexedi.com
The assertion was fixed incorrectly.https://lab.nexedi.com/nexedi/slapos/-/commit/11dceeb688b02003a349c90062999cd9b4b52999caddy-frontend: Show diffs on test failures2018-11-20T11:54:11+01:00Lukasz Nowakluke@nexedi.com
By setting maxDiff to None the test failures are more explanatory.https://lab.nexedi.com/nexedi/slapos/-/commit/7ec20d5c39e1e1ef24c39cae58e4965a83208c2dcaddy-frontend: Fix typo2018-11-20T09:46:27+01:00Lukasz Nowakluke@nexedi.com
authorised --> authorizedhttps://lab.nexedi.com/nexedi/slapos/-/commit/ce7de156f84ad3d96f27d36ad275c77ba7314734caddy-frontend: Fix slave authorization2018-11-20T09:46:27+01:00Lukasz Nowakluke@nexedi.com
Because of checking slave id in a whole string, slaves which shall not be
authorized has been put on authorized list.
Example: -frontend-authorized-slave-string == "custom_http",
slave_id = "custom" has been authorized.