Commit f533afad authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[2066] Add default values to ACL rules

It otherwise complained during config add somewhere/acl, that there's no
value. The defaults differ from module to module.

Also, some reindentation and removal of tabs is added.
parent 1bcbd2ee
......@@ -12,8 +12,8 @@
"item_type": "map",
"item_optional": true,
"item_default": {
"origin": "",
"class": "IN",
"origin": "",
"class": "IN",
"update_acl": []
},
"map_item_spec": [
......@@ -33,11 +33,12 @@
"item_name": "update_acl",
"item_type": "list",
"item_optional": false,
"item_default": [],
"item_default": [],
"list_item_spec": {
"item_name": "acl_element",
"item_type": "any",
"item_optional": true
"item_optional": true,
"item_default": {"action": "REJECT"}
}
}
]
......
......@@ -116,37 +116,23 @@
},
{
"item_name": "query_acl",
"item_type": "list",
"item_optional": false,
"item_default": [
{
"action": "ACCEPT",
"from": "127.0.0.1"
},
{
"action": "ACCEPT",
"from": "::1"
}
],
"list_item_spec": {
"item_name": "rule",
"item_type": "map",
"item_optional": false,
"item_default": {},
"map_item_spec": [
{
"item_name": "action",
"item_type": "string",
"item_optional": false,
"item_default": ""
},
{
"item_name": "from",
"item_type": "string",
"item_optional": false,
"item_default": ""
}
]
"item_type": "list",
"item_optional": false,
"item_default": [
{
"action": "ACCEPT",
"from": "127.0.0.1"
},
{
"action": "ACCEPT",
"from": "::1"
}
],
"list_item_spec": {
"item_name": "rule",
"item_type": "any",
"item_optional": false,
"item_default": {"action": "REJECT"}
}
}
],
......
......@@ -17,7 +17,8 @@
{
"item_name": "acl_element",
"item_type": "any",
"item_optional": true
"item_optional": true,
"item_default": {"action": "ACCEPT"}
}
},
{
......@@ -80,7 +81,8 @@
{
"item_name": "acl_element",
"item_type": "any",
"item_optional": true
"item_optional": true,
"item_default": {"action": "ACCEPT"}
}
}
]
......
Supports Markdown
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