From 287a95cfb2b521b2c00489ec6a9aa34d353eceaf Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 18 May 2023 13:30:43 +0200 Subject: [PATCH] update static/schema information Signed-off-by: Thomas Lamprecht --- api-viewer/apidata.js | 45 ++++++++++++++++++------------------ pve-firewall-rules-opts.adoc | 2 +- pveum.1-synopsis.adoc | 12 +++++----- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js index 2b55291..7068f24 100644 --- a/api-viewer/apidata.js +++ b/api-viewer/apidata.js @@ -1498,7 +1498,7 @@ const apiSchema = [ "type" : "string" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -1741,7 +1741,7 @@ const apiSchema = [ "type" : "string" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -2145,7 +2145,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -2341,7 +2341,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -8727,6 +8727,7 @@ const apiSchema = [ "type" : "string" }, "id" : { + "description" : "Resource id.", "type" : "string" }, "level" : { @@ -9719,7 +9720,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -9943,7 +9944,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -28232,7 +28233,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -28456,7 +28457,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -43131,7 +43132,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -43341,7 +43342,7 @@ const apiSchema = [ "typetext" : " (0 - N)" }, "icmp-type" : { - "description" : "Specify icmp-type. Only valid if proto equals 'icmp'.", + "description" : "Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'.", "format" : "pve-fw-icmp-type-spec", "optional" : 1, "type" : "string", @@ -45692,9 +45693,9 @@ const apiSchema = [ "default" : "login", "description" : "Run specific command or default to login.", "enum" : [ - "ceph_install", + "login", "upgrade", - "login" + "ceph_install" ], "optional" : 1, "type" : "string" @@ -45788,9 +45789,9 @@ const apiSchema = [ "default" : "login", "description" : "Run specific command or default to login.", "enum" : [ - "ceph_install", + "login", "upgrade", - "login" + "ceph_install" ], "optional" : 1, "type" : "string" @@ -45914,9 +45915,9 @@ const apiSchema = [ "default" : "login", "description" : "Run specific command or default to login.", "enum" : [ - "ceph_install", + "login", "upgrade", - "login" + "ceph_install" ], "optional" : 1, "type" : "string" @@ -49590,14 +49591,14 @@ const apiSchema = [ "description" : "LDAP base domain name", "maxLength" : 256, "optional" : 1, - "pattern" : "(?^:\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+)(,\\s*\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+))*)", + "pattern" : "(?^:\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#]))(,\\s*\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#])))*)", "type" : "string" }, "bind_dn" : { "description" : "LDAP bind domain name", "maxLength" : 256, "optional" : 1, - "pattern" : "(?^:\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+)(,\\s*\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+))*)", + "pattern" : "(?^:\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#]))(,\\s*\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#])))*)", "type" : "string" }, "capath" : { @@ -49694,7 +49695,7 @@ const apiSchema = [ "description" : "LDAP base domain name for group sync. If not set, the base_dn will be used.", "maxLength" : 256, "optional" : 1, - "pattern" : "(?^:\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+)(,\\s*\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+))*)", + "pattern" : "(?^:\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#]))(,\\s*\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#])))*)", "type" : "string" }, "group_filter" : { @@ -49936,14 +49937,14 @@ const apiSchema = [ "description" : "LDAP base domain name", "maxLength" : 256, "optional" : 1, - "pattern" : "(?^:\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+)(,\\s*\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+))*)", + "pattern" : "(?^:\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#]))(,\\s*\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#])))*)", "type" : "string" }, "bind_dn" : { "description" : "LDAP bind domain name", "maxLength" : 256, "optional" : 1, - "pattern" : "(?^:\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+)(,\\s*\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+))*)", + "pattern" : "(?^:\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#]))(,\\s*\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#])))*)", "type" : "string" }, "capath" : { @@ -50025,7 +50026,7 @@ const apiSchema = [ "description" : "LDAP base domain name for group sync. If not set, the base_dn will be used.", "maxLength" : 256, "optional" : 1, - "pattern" : "(?^:\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+)(,\\s*\\w+=(\"[\\w ,+/<>;=]+\"|[^ ,+\"/<>;=]+))*)", + "pattern" : "(?^:\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#]))(,\\s*\\w+=(?^:(\"[^\"]+\"|[^ ,+\"/<>;=#][^,+\"/<>;=]*[^ ,+\"/<>;=]|[^ ,+\"/<>;=#])))*)", "type" : "string" }, "group_filter" : { diff --git a/pve-firewall-rules-opts.adoc b/pve-firewall-rules-opts.adoc index 4e674af..21193d2 100644 --- a/pve-firewall-rules-opts.adoc +++ b/pve-firewall-rules-opts.adoc @@ -8,7 +8,7 @@ Restrict TCP/UDP destination port. You can use service names or simple numbers ( `--icmp-type` `` :: -Specify icmp-type. Only valid if proto equals 'icmp'. +Specify icmp-type. Only valid if proto equals 'icmp' or 'icmpv6'/'ipv6-icmp'. `--iface` `` :: diff --git a/pveum.1-synopsis.adoc b/pveum.1-synopsis.adoc index 086b947..9a354ae 100644 --- a/pveum.1-synopsis.adoc +++ b/pveum.1-synopsis.adoc @@ -200,11 +200,11 @@ Specifies the Authentication Context Class Reference values that theAuthorizatio Automatically create users if they do not exist. -`--base_dn` `(?^:\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*)` :: +`--base_dn` `(?^:\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#]))(,\s*\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])))*)` :: LDAP base domain name -`--bind_dn` `(?^:\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*)` :: +`--bind_dn` `(?^:\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#]))(,\s*\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])))*)` :: LDAP bind domain name @@ -252,7 +252,7 @@ LDAP filter for user sync. The objectclasses for groups. -`--group_dn` `(?^:\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*)` :: +`--group_dn` `(?^:\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#]))(,\s*\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])))*)` :: LDAP base domain name for group sync. If not set, the base_dn will be used. @@ -364,11 +364,11 @@ Specifies the Authentication Context Class Reference values that theAuthorizatio Automatically create users if they do not exist. -`--base_dn` `(?^:\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*)` :: +`--base_dn` `(?^:\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#]))(,\s*\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])))*)` :: LDAP base domain name -`--bind_dn` `(?^:\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*)` :: +`--bind_dn` `(?^:\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#]))(,\s*\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])))*)` :: LDAP bind domain name @@ -424,7 +424,7 @@ LDAP filter for user sync. The objectclasses for groups. -`--group_dn` `(?^:\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+)(,\s*\w+=("[\w ,+/<>;=]+"|[^ ,+"/<>;=]+))*)` :: +`--group_dn` `(?^:\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#]))(,\s*\w+=(?^:("[^"]+"|[^ ,+"/<>;=#][^,+"/<>;=]*[^ ,+"/<>;=]|[^ ,+"/<>;=#])))*)` :: LDAP base domain name for group sync. If not set, the base_dn will be used. -- 2.39.2