]> git.proxmox.com Git - pmg-docs.git/commitdiff
update generated docs
authorDietmar Maurer <dietmar@proxmox.com>
Wed, 17 Jan 2018 12:16:46 +0000 (13:16 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Wed, 17 Jan 2018 12:16:46 +0000 (13:16 +0100)
api-viewer/apidata.js
pmg.conf.5-opts.adoc
pmg.mail-ports-conf-opts.adoc
pmgcm.1-synopsis.adoc

index f67d189809dbc1c93a61f2366df9e8f78365ec62..e66f13d703094a77a0101b31db62a3eaed23258c 100644 (file)
@@ -1124,8 +1124,8 @@ var pmgapi = [
                                           "value" : {
                                              "description" : "The Value",
                                              "maxLength" : 1024,
-                                             "pattern" : "[0-9a-zA-Z\\/\\\\[\\]\\+\\-\\.\\*\\_]+",
-                                             "type" : "string"
+                                             "type" : "string",
+                                             "typetext" : "<string>"
                                           }
                                        }
                                     },
@@ -1176,8 +1176,8 @@ var pmgapi = [
                                     "value" : {
                                        "description" : "The Value",
                                        "maxLength" : 1024,
-                                       "pattern" : "[0-9a-zA-Z\\/\\\\[\\]\\+\\-\\.\\*\\_]+",
-                                       "type" : "string"
+                                       "type" : "string",
+                                       "typetext" : "<string>"
                                     }
                                  }
                               },
@@ -2012,8 +2012,8 @@ var pmgapi = [
                                                 "value" : {
                                                    "description" : "The Value",
                                                    "maxLength" : 1024,
-                                                   "pattern" : "[0-9a-zA-Z\\/\\\\[\\]\\+\\-\\.\\*\\_]+",
-                                                   "type" : "string"
+                                                   "type" : "string",
+                                                   "typetext" : "<string>"
                                                 }
                                              }
                                           },
@@ -2051,8 +2051,8 @@ var pmgapi = [
                                           "value" : {
                                              "description" : "The Value",
                                              "maxLength" : 1024,
-                                             "pattern" : "[0-9a-zA-Z\\/\\\\[\\]\\+\\-\\.\\*\\_]+",
-                                             "type" : "string"
+                                             "type" : "string",
+                                             "typetext" : "<string>"
                                           }
                                        }
                                     },
@@ -4136,6 +4136,11 @@ var pmgapi = [
                   "parameters" : {
                      "additionalProperties" : 0
                   },
+                  "permissions" : {
+                     "check" : [
+                        "admin"
+                     ]
+                  },
                   "protected" : 1,
                   "returns" : {
                      "type" : "null"
@@ -4986,7 +4991,8 @@ var pmgapi = [
                               },
                               "permissions" : {
                                  "check" : [
-                                    "admin"
+                                    "admin",
+                                    "audit"
                                  ]
                               },
                               "proxyto" : "master",
@@ -5200,7 +5206,8 @@ var pmgapi = [
                                     },
                                     "permissions" : {
                                        "check" : [
-                                          "admin"
+                                          "admin",
+                                          "audit"
                                        ]
                                     },
                                     "protected" : 1,
@@ -5244,7 +5251,8 @@ var pmgapi = [
                               },
                               "permissions" : {
                                  "check" : [
-                                    "admin"
+                                    "admin",
+                                    "audit"
                                  ]
                               },
                               "protected" : 1,
@@ -5304,7 +5312,8 @@ var pmgapi = [
                                     },
                                     "permissions" : {
                                        "check" : [
-                                          "admin"
+                                          "admin",
+                                          "audit"
                                        ]
                                     },
                                     "protected" : 1,
@@ -5351,7 +5360,8 @@ var pmgapi = [
                               },
                               "permissions" : {
                                  "check" : [
-                                    "admin"
+                                    "admin",
+                                    "audit"
                                  ]
                               },
                               "protected" : 1,
@@ -5462,7 +5472,8 @@ var pmgapi = [
                   },
                   "permissions" : {
                      "check" : [
-                        "admin"
+                        "admin",
+                        "audit"
                      ]
                   },
                   "proxyto" : "master",
@@ -7279,7 +7290,7 @@ var pmgapi = [
                            "typetext" : "<integer> (0 - N)"
                         },
                         "ext_port" : {
-                           "default" : 26,
+                           "default" : 25,
                            "description" : "SMTP port number for incoming mail (untrusted). This must be a different number than 'int_port'.",
                            "maximum" : 65535,
                            "minimum" : 1,
@@ -7309,7 +7320,7 @@ var pmgapi = [
                            "typetext" : "<boolean>"
                         },
                         "int_port" : {
-                           "default" : 25,
+                           "default" : 26,
                            "description" : "SMTP port number for outgoing mail (trusted).",
                            "maximum" : 65535,
                            "minimum" : 1,
@@ -11232,6 +11243,13 @@ var pmgapi = [
                               }
                            }
                         },
+                        "permissions" : {
+                           "check" : [
+                              "admin",
+                              "qmanager",
+                              "audit"
+                           ]
+                        },
                         "protected" : 1,
                         "proxyto" : "master",
                         "returns" : {
@@ -11360,7 +11378,9 @@ var pmgapi = [
                   },
                   "permissions" : {
                      "check" : [
-                        "admin"
+                        "admin",
+                        "qmanager",
+                        "audit"
                      ]
                   },
                   "protected" : 1,
@@ -11394,7 +11414,7 @@ var pmgapi = [
                   }
                },
                "POST" : {
-                  "description" : "Creat new user",
+                  "description" : "Create new user",
                   "method" : "POST",
                   "name" : "create",
                   "parameters" : {
index 71a6338cd46c4d727959d07cafcc7763a20558d0..aad109ffe17c80b3f3a5e6bdcc696ac9b00388b8 100644 (file)
@@ -80,7 +80,7 @@ Optional list of DNS white/blacklist domains (see postscreen_dnsbl_sites paramet
 
 SMTP delay warning time (in hours).
 
-`ext_port`: `<integer> (1 - 65535)` ('default =' `26`)::
+`ext_port`: `<integer> (1 - 65535)` ('default =' `25`)::
 
 SMTP port number for incoming mail (untrusted). This must be a different number than 'int_port'.
 
@@ -96,7 +96,7 @@ Use SMTP HELO tests.
 
 Hide received header in outgoing mails.
 
-`int_port`: `<integer> (1 - 65535)` ('default =' `25`)::
+`int_port`: `<integer> (1 - 65535)` ('default =' `26`)::
 
 SMTP port number for outgoing mail (trusted).
 
index 14f8860b5c2dfbc283416872f9cf3a19f43de7df..8971fc42eb51aeb6956c803e65e1a69feaae55e6 100644 (file)
@@ -1,8 +1,8 @@
-`ext_port`: `<integer> (1 - 65535)` ('default =' `26`)::
+`ext_port`: `<integer> (1 - 65535)` ('default =' `25`)::
 
 SMTP port number for incoming mail (untrusted). This must be a different number than 'int_port'.
 
-`int_port`: `<integer> (1 - 65535)` ('default =' `25`)::
+`int_port`: `<integer> (1 - 65535)` ('default =' `26`)::
 
 SMTP port number for outgoing mail (trusted).
 
index 492fe45cc06564e2f78201b8781e6a5737a3630b..3e748a0c3338b28e178ba8613e2f0e99fbab8172 100644 (file)
@@ -7,6 +7,17 @@ Create initial cluster config with current node as master.
 
 
 
+*pmgcm delete* `<cid>`
+
+Remove a node from the cluster.
+
+`<cid>`: `<integer> (1 - N)` ::
+
+Cluster Node ID.
+
+
+
+
 *pmgcm help* `[<cmd>]` `[OPTIONS]`
 
 Get help about specified command.
@@ -43,6 +54,12 @@ execute the command on the new node.
 
 
 
+*pmgcm promote*
+
+Promote current node to become the new master.
+
+
+
 
 *pmgcm status* `[OPTIONS]`