Commit 6e62c95b authored by Jérome Perrin's avatar Jérome Perrin

Improvements to ERP5 instance json schemas

- make profiles for software-types "self contained"
- add default ports ( because port is marked required )

/reviewed-on nexedi/slapos!664
parents dc777bc1 92d29865
......@@ -4,9 +4,7 @@
"additionalProperties": false,
"definitions": {
"tcpv4port": {
"minimum": 0,
"maximum": 65535,
"type": "integer"
"$ref": "./schemas-definitions.json#/tcpv4port"
}
},
"properties": {
......@@ -194,16 +192,34 @@
},
"kumofs": {
"description": "Persistent memcached service",
"additionalProperties": {
"allOf": [
{
"$ref": "./instance-kumofs-schema.json"
},
{
"properties": {
"tcpv4-port": {
"default": 2000
}
}
}
],
"type": "object"
},
"memcached": {
"description": "Volatile memcached service",
"additionalProperties": {
"allOf": [
{
"$ref": "./instance-kumofs-schema.json"
},
{
"properties": {
"tcpv4-port": {
"default": 2010
}
}
}
],
"type": "object"
},
"cloudooo-url": {
......@@ -218,16 +234,34 @@
},
"smtp": {
"description": "Mail queuing and relay service",
"additionalProperties": {
"allOf": [
{
"$ref": "./instance-smtp-schema.json"
},
{
"properties": {
"tcpv4-port": {
"default": 2010
}
}
}
],
"type": "object"
},
"mariadb": {
"description": "Relational database service",
"additionalProperties": {
"allOf": [
{
"$ref": "./instance-mariadb-schema.json"
},
{
"properties": {
"tcpv4-port": {
"default": 2099
}
}
}
],
"type": "object"
},
"zodb-zeo": {
......
......@@ -8,7 +8,7 @@
"tcpv4-port": {
"allOf": [
{
"$ref": "#/definitions/tcpv4port"
"$ref": "./schemas-definitions.json#/tcpv4port"
},
{
"description": "Start allocating ports at this value, going upward"
......
......@@ -5,7 +5,7 @@
"tcpv4-port": {
"allOf": [
{
"$ref": "#/definitions/tcpv4port"
"$ref": "./schemas-definitions.json#/tcpv4port"
},
{
"description": "Start allocating ports at this value, going downward"
......
{
"$schema": "http://json-schema.org/draft-04/schema#",
"extends": "./schema-definitions.json#",
"required": [
"tcpv4-port"
],
......@@ -9,7 +8,7 @@
"tcpv4-port": {
"allOf": [
{
"$ref": "#/definitions/tcpv4port"
"$ref": "./schemas-definitions.json#/tcpv4port"
},
{
"description": "Start allocating ports at this value, going upward"
......
{
"$schema": "http://json-schema.org/draft-07/schema#",
"tcpv4port": {
"minimum": 0,
"maximum": 65535,
"type": "integer"
}
}
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