baculum: Add new directives support

diff --git a/gui/baculum/protected/Web/Data/data_deps.json b/gui/baculum/protected/Web/Data/data_deps.json
index c56a5f25dcd2351e6c76f2644dfc6380b21e4a03..4eaa0a803a2bc056a0fd62c2535caa3a49ca0841 100644 (file)
--- a/gui/baculum/protected/Web/Data/data_deps.json
+++ b/gui/baculum/protected/Web/Data/data_deps.json
@@ -58,6 +58,12 @@
        "fd": {
                "Messages": {
                        "FileDaemon": ["Messages"]
+               },
+               "Schedule": {
+                       "Director": ["Schedule"]
+               },
+               "Console": {
+                       "Director": ["Console"]
                }
        },
        "bcons": {

diff --git a/gui/baculum/protected/Web/Data/data_desc.json b/gui/baculum/protected/Web/Data/data_desc.json
index f457cb9600b8144293bdc5800e65e851485c0fb8..027fb844b95d639f95735bcb935989174da6c616 100644 (file)
--- a/gui/baculum/protected/Web/Data/data_desc.json
+++ b/gui/baculum/protected/Web/Data/data_desc.json
@@ -89,6 +89,20 @@
                                "FieldType": "CheckBox",
                                "Section": "General"
                        },
+                       "EventsRetention": {
+                               "Required": false,
+                               "ValueType": "time",
+                               "DefaultValue": 2592000,
+                               "FieldType": "TimePeriod",
+                               "Section": "General"
+                       },
+                       "Catalog": {
+                               "Required": false,
+                               "ValueType": "res",
+                               "DefaultValue": 0,
+                               "FieldType": "ComboBox",
+                               "Section": "General"
+                       },
                        "MaximumReloadRequests": {
                                "Required": false,
                                "ValueType": "pint32",
@@ -159,6 +173,13 @@
                                "FieldType": "TimePeriod",
                                "Section": "Networking"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -229,6 +250,13 @@
                                "FieldType": "TextBox",
                                "Section": "Communications encryption"
                        },
+                       "AutoPrune": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Pruning"
+                       },
                        "StatisticsRetention": {
                                "Required": false,
                                "ValueType": "time",
@@ -253,7 +281,7 @@
                                "Section": "General"
                        },
                        "Address": {
-                               "Required": true,
+                               "Required": false,
                                "ValueType": "str",
                                "DefaultValue": 0,
                                "FieldType": "TextBox",
@@ -307,6 +335,13 @@
                                "FieldType": "CheckBox",
                                "Section": "Networking"
                        },
+                       "AllowFDConnections": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 0,
+                               "FieldType": "CheckBox",
+                               "Section": "Networking"
+                       },
                        "MaximumConcurrentJobs": {
                                "Required": false,
                                "ValueType": "pint32",
@@ -349,6 +384,13 @@
                                "FieldType": "TimePeriod",
                                "Section": "Pruning"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -398,6 +440,13 @@
                                "FieldType": "TextBox",
                                "Section": "Communications encryption"
                        },
+                       "TlsVerifyPeer": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsAllowedCn": {
                                "Required": false,
                                "ValueType": "alist_str",
@@ -648,6 +697,13 @@
                                "FieldType": "TextBox",
                                "Section": "Backup"
                        },
+                       "AllowIncompleteJobs": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Backup"
+                       },
                        "VirtualFullBackupPool": {
                                "Required": false,
                                "ValueType": "res",
@@ -1078,6 +1134,13 @@
                                "FieldType": "Integer",
                                "Section": "Limitations"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -1941,6 +2004,13 @@
                                "Resource": "Client",
                                "Section": "Access-control list"
                        },
+                       "UserIdAcl": {
+                               "Required": false,
+                               "ValueType": "acl",
+                               "DefaultValue": 0,
+                               "FieldType": "MultiTextBox",
+                               "Section": "Access-control list"
+                       },
                        "DirectoryAcl": {
                                "Required": false,
                                "ValueType": "acl",
@@ -1948,6 +2018,13 @@
                                "FieldType": "MultiTextBox",
                                "Section": "Access-control list"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -2261,6 +2338,13 @@
                                "FieldType": "TextBox",
                                "Section": "Backup"
                        },
+                       "AllowIncompleteJobs": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Backup"
+                       },
                        "VirtualFullBackupPool": {
                                "Required": false,
                                "ValueType": "res",
@@ -2696,6 +2780,13 @@
                                "FieldType": "CheckBox",
                                "Section": "Communications encryption"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsRequire": {
                                "Required": false,
                                "ValueType": "bool",
@@ -2880,6 +2971,13 @@
                                "FieldType": "Integer",
                                "Section": "Limitations"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -3065,6 +3163,13 @@
                                "FieldType": "Size",
                                "Section": "General"
                        },
+                       "MaximumFileIndex": {
+                               "Required": false,
+                               "ValueType": "size64",
+                               "DefaultValue": 100000000,
+                               "FieldType": "Size",
+                               "Section": "General"
+                       },
                        "VolumeCapacity": {
                                "Required": false,
                                "ValueType": "size64",
@@ -3569,14 +3674,14 @@
                                "Section": "General"
                        },
                        "AccessKey": {
-                               "Required": true,
+                               "Required": false,
                                "ValueType": "str",
                                "DefaultValue": 0,
                                "FieldType": "TextBox",
                                "Section": "General"
                        },
                        "SecretKey": {
-                               "Required": true,
+                               "Required": false,
                                "ValueType": "str",
                                "DefaultValue": 0,
                                "FieldType": "Password",
@@ -3597,6 +3702,41 @@
                                "Data": ["HTTP", "HTTPS"],
                                "Section": "General"
                        },
+                       "BlobEndpoint": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "FileEndpoint": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "QueueEndpoint": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "TableEndpoint": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "EndpointSuffix": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
                        "UriStyle": {
                                "Required": false,
                                "ValueType": "str",
@@ -3610,7 +3750,7 @@
                                "ValueType": "str",
                                "DefaultValue": "No",
                                "FieldType": "ComboBox",
-                               "Data": ["No", "AfterUpload", "AtEndOfJob"],
+                               "Data": ["No", "AfterUpload", "AtEndOfJob", "ConfDefault"],
                                "Section": "General"
                        },
                        "Upload": {
@@ -3618,20 +3758,42 @@
                                "ValueType": "str",
                                "DefaultValue": "No",
                                "FieldType": "ComboBox",
-                               "Data": ["No", "EachPart", "AtEndOfJob"],
+                               "Data": ["No", "Manual", "EachPart", "AtEndOfJob"],
+                               "Section": "General"
+                       },
+                       "DriverCommand": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "TransferPriority": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": "High",
+                               "FieldType": "ComboBox",
+                               "Data": ["High", "Medium", "Low"],
+                               "Section": "General"
+                       },
+                       "TransferRetention": {
+                               "Required": false,
+                               "ValueType": "time",
+                               "DefaultValue": 432000,
+                               "FieldType": "TimePeriod",
                                "Section": "General"
                        },
                        "MaximumConcurrentUploads": {
                                "Required": false,
                                "ValueType": "pint32",
-                               "DefaultValue": 0,
+                               "DefaultValue": 3,
                                "FieldType": "Integer",
                                "Section": "Limitations"
                        },
                        "MaximumConcurrentDownloads": {
                                "Required": false,
                                "ValueType": "pint32",
-                               "DefaultValue": 0,
+                               "DefaultValue": 3,
                                "FieldType": "Integer",
                                "Section": "Limitations"
                        },
@@ -3681,6 +3843,35 @@
                                "FieldType": "TextBox",
                                "Section": "General"
                        },
+                       "DirPort": {
+                               "Required": false,
+                               "ValueType": "pint32",
+                               "DefaultValue": 9101,
+                               "FieldType": "Integer",
+                               "Section": "General"
+                       },
+                       "ConnectToDirector": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 0,
+                               "FieldType": "CheckBox",
+                               "Section": "General"
+                       },
+                       "Schedule": {
+                               "Required": false,
+                               "ValueType": "res",
+                               "DefaultValue": 0,
+                               "FieldType": "ComboBox",
+                               "Resource": "Schedule",
+                               "Section": "General"
+                       },
+                       "ReconnectionTime": {
+                               "Required": false,
+                               "ValueType": "time",
+                               "DefaultValue": 2700,
+                               "FieldType": "TimePeriod",
+                               "Section": "General"
+                       },
                        "Monitor": {
                                "Required": false,
                                "ValueType": "bool",
@@ -3709,6 +3900,13 @@
                                "FieldType": "ComboBox",
                                "Section": "General"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -3956,6 +4154,13 @@
                                "FieldType": "TextBox",
                                "Section": "Data encryption"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -4093,6 +4298,13 @@
                                "FieldType": "Integer",
                                "Section": "General"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -4333,6 +4545,13 @@
                                "FieldType": "TextBox",
                                "Section": "Data encryption"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -4469,10 +4688,8 @@
                                "FieldType": "Integer",
                                "Section": "Graphite"
                        }
-               }
-       },
-       "bcons": {
-               "Console": {
+               },
+               "Schedule": {
                        "Name": {
                                "Required": true,
                                "ValueType": "name",
@@ -4487,14 +4704,39 @@
                                "FieldType": "TextBox",
                                "Section": "General"
                        },
-                       "RCFile": {
+                       "Connect": {
                                "Required": false,
-                               "ValueType": "dir",
+                               "ValueType": "run",
+                               "DefaultValue": 0,
+                               "FieldType": "Schedule",
+                               "Section": "General"
+                       },
+                       "Enabled": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "General"
+                       }
+               }
+       },
+       "bcons": {
+               "Console": {
+                       "Name": {
+                               "Required": true,
+                               "ValueType": "name",
                                "DefaultValue": 0,
                                "FieldType": "TextBox",
                                "Section": "General"
                        },
-                       "HistoryFile": {
+                       "Description": {
+                               "Required": false,
+                               "ValueType": "str",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "RCFile": {
                                "Required": false,
                                "ValueType": "dir",
                                "DefaultValue": 0,
@@ -4522,6 +4764,13 @@
                                "FieldType": "CheckBox",
                                "Section": "General"
                        },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",
@@ -4602,7 +4851,7 @@
                                "Section": "General"
                        },
                        "Address": {
-                               "Required": false,
+                               "Required": true,
                                "ValueType": "str",
                                "DefaultValue": 0,
                                "FieldType": "TextBox",
@@ -4615,6 +4864,27 @@
                                "FieldType": "Password",
                                "Section": "General"
                        },
+                       "HistoryFile": {
+                               "Required": false,
+                               "ValueType": "dir",
+                               "DefaultValue": 0,
+                               "FieldType": "TextBox",
+                               "Section": "General"
+                       },
+                       "HistoryFileSize": {
+                               "Required": false,
+                               "ValueType": "size32",
+                               "DefaultValue": 0,
+                               "FieldType": "Size",
+                               "Section": "General"
+                       },
+                       "TlsPskEnable": {
+                               "Required": false,
+                               "ValueType": "bool",
+                               "DefaultValue": 1,
+                               "FieldType": "CheckBox",
+                               "Section": "Communications encryption"
+                       },
                        "TlsEnable": {
                                "Required": false,
                                "ValueType": "bool",