[pbs-devel] [PATCH proxmox-backup 1/4] docs: fix wrong user in repository explanation

[pbs-devel] [PATCH proxmox-backup 1/4] docs: fix wrong user in repository explanation

[Dominik Csapak]

we use 'root@pam' by default, not 'root'

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 docs/administration-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/administration-guide.rst b/docs/administration-guide.rst
index f7cd6ddf..1b1155a5 100644
--- a/docs/administration-guide.rst
+++ b/docs/administration-guide.rst
@@ -734,7 +734,7 @@ on the backup server.
 
   [[username@]server:]datastore
 
-The default value for ``username`` ist ``root``.  If no server is specified,
+The default value for ``username`` ist ``root@pam``.  If no server is specified,
 the default is the local host (``localhost``).
 
 You can pass the repository with the ``--repository`` command
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 2/4] require square brackets for ipv6 addresses

[Dominik Csapak]

we need this, because we append the port to this to get a target url
e.g. we print

format!("https://{}:8007/", address)

if address is now an ipv6 (e.g. fe80::1) it would become

https://fe80::1:8007/ which is a valid ipv6 on its own

by using square brackets we get:

https://[fe80::1]:8007/ which now connects to the correct ip/port

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 docs/administration-guide.rst | 3 +++
 src/api2/types/mod.rs         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/administration-guide.rst b/docs/administration-guide.rst
index 1b1155a5..c270bdb1 100644
--- a/docs/administration-guide.rst
+++ b/docs/administration-guide.rst
@@ -737,6 +737,9 @@ on the backup server.
 The default value for ``username`` ist ``root@pam``.  If no server is specified,
 the default is the local host (``localhost``).
 
+Note that if the server is an IPv6 address, you have to write it with
+square brackets (e.g. [fe80::01]).
+
 You can pass the repository with the ``--repository`` command
 line option, or by setting the ``PBS_REPOSITORY`` environment
 variable.
diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs
index aba307e2..6ad67607 100644
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 use proxmox::api::{api, schema::*};
 use proxmox::const_regex;
-use proxmox::{IPRE, IPV4RE, IPV6RE, IPV4OCTET, IPV6H16, IPV6LS32};
+use proxmox::{IPRE, IPRE_BRACKET, IPV4RE, IPV6RE, IPV4OCTET, IPV6H16, IPV6LS32};
 
 use crate::backup::CryptMode;
 use crate::server::UPID;
@@ -65,7 +65,7 @@ const_regex!{
 
     pub DNS_NAME_OR_IP_REGEX = concat!(r"^", DNS_NAME!(), "|",  IPRE!(), r"$");
 
-    pub BACKUP_REPO_URL_REGEX = concat!(r"^^(?:(?:(", USER_ID_REGEX_STR!(), ")@)?(", DNS_NAME!(), "|",  IPRE!() ,"):)?(", PROXMOX_SAFE_ID_REGEX_STR!(), r")$");
+    pub BACKUP_REPO_URL_REGEX = concat!(r"^^(?:(?:(", USER_ID_REGEX_STR!(), ")@)?(", DNS_NAME!(), "|",  IPRE_BRACKET!() ,"):)?(", PROXMOX_SAFE_ID_REGEX_STR!(), r")$");
 
     pub CERT_FINGERPRINT_SHA256_REGEX = r"^(?:[0-9a-fA-F][0-9a-fA-F])(?::[0-9a-fA-F][0-9a-fA-F]){31}$";
 
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 3/4] ui: RemoteEdit: make comment and fingerprint deletable

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/window/RemoteEdit.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/window/RemoteEdit.js b/www/window/RemoteEdit.js
index b7645af8..cbfbe1d9 100644
--- a/www/window/RemoteEdit.js
+++ b/www/window/RemoteEdit.js
@@ -73,11 +73,13 @@ Ext.define('PBS.window.RemoteEdit', {
 	    {
 		xtype: 'proxmoxtextfield',
 		name: 'fingerprint',
+		deleteEmpty: true,
 		fieldLabel: gettext('Fingerprint'),
 	    },
 	    {
 		xtype: 'proxmoxtextfield',
 		name: 'comment',
+		deleteEmpty: true,
 		fieldLabel: gettext('Comment'),
 	    },
 	],
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 4/4] ui: add task description for logrotation

[Dominik Csapak]

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/Utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/Utils.js b/www/Utils.js
index 27e7a24c..8ad332eb 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -96,6 +96,7 @@ Ext.define('PBS.Utils', {
 	    verify: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Verify')),
 	    backup: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Backup')),
 	    reader: (type, id) => PBS.Utils.render_datastore_worker_id(id, gettext('Read objects')),
+	    logrotate: [gettext('Log'), gettext('Rotation')],
 	});
     },
 });
-- 
2.20.1