.cargo/config

@@ -3,6 +3,3 @@
 directory = "/usr/share/cargo/registry"
 [source.crates-io]
 replace-with = "debian-packages"
-
-[profile.release]
-debug=true

.gitignore

@@ -1,32 +1,16 @@
+local.mak
+/target
 **/*.rs.bk
-*.5
-*.7
+*~
 *.backup
 *.backup[0-9]
 *.backup[0-9][0-9]
 *.old
 *.old[0-9]
 *.old[0-9][0-9]
-*~
-/*.build
-/*.buildinfo
-/*.changes
-/*.deb
-/*.dsc
-/*.tar*
-/.do-cargo-build
-/Cargo.lock
-/docs/*/synopsis.rst
-/docs/config/*/config.rst
-/docs/config/acl/roles.rst
-/docs/output
-/docs/proxmox-backup-client/catalog-shell-synopsis.rst
-# all services are generated from a .in file to set the libexec path
-/etc/*.service
-/proxmox-backup-server-dpkg-contents.txt
-/www/.lint-incremental
-/www/js/
+*.5
+*.7
 __pycache__/
+/etc/proxmox-backup.service
+/etc/proxmox-backup-proxy.service
 build/
-local.mak
-target/

Cargo.toml

@@ -1,5 +1,6 @@
-[workspace.package]
-version = "3.4.1"
+[package]
+name = "proxmox-backup"
+version = "2.2.1"
 authors = [
     "Dietmar Maurer <dietmar@proxmox.com>",
     "Dominik Csapak <d.csapak@proxmox.com>",
@@ -10,21 +11,11 @@ authors = [
     "Wolfgang Bumiller <w.bumiller@proxmox.com>",
     "Proxmox Support Team <support@proxmox.com>",
 ]
-edition = "2021"
+edition = "2018"
 license = "AGPL-3"
-repository = "https://git.proxmox.com/?p=proxmox-backup.git"
-rust-version = "1.81"
-
-[package]
-name = "proxmox-backup"
 description = "Proxmox Backup"
 homepage = "https://www.proxmox.com"
 
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
-
 exclude = [ "build", "debian", "tests/catar_data/test_symlink/symlink1"]
 
 [workspace]
@@ -34,8 +25,8 @@ members = [
     "pbs-config",
     "pbs-datastore",
     "pbs-fuse-loop",
-    "pbs-key-config",
-    "pbs-pxar-fuse",
+    "proxmox-rest-server",
+    "proxmox-rrd",
     "pbs-tape",
     "pbs-tools",
 
@@ -43,7 +34,6 @@ members = [
     "proxmox-backup-client",
     "proxmox-file-restore",
     "proxmox-restore-daemon",
-
     "pxar-bin",
 ]
 
@@ -51,246 +41,106 @@ members = [
 name = "proxmox_backup"
 path = "src/lib.rs"
 
-[workspace.dependencies]
-# proxmox workspace
-proxmox-apt = { version = "0.11", features = [ "cache" ] }
-proxmox-apt-api-types = "1.0.1"
-proxmox-async = "0.4"
-proxmox-auth-api = "0.4"
-proxmox-borrow = "1"
-proxmox-compression = "0.2"
-proxmox-config-digest = "0.1.0"
-proxmox-daemon = "0.1.0"
-proxmox-fuse = "0.1.3"
-proxmox-http = { version = "0.9.5", features = [ "client", "http-helpers", "websocket" ] } # see below
-proxmox-human-byte = "0.1"
-proxmox-io = "1.0.1" # tools and client use "tokio" feature
+[dependencies]
+apt-pkg-native = "0.3.2"
+base64 = "0.13"
+bitflags = "1.2.1"
+bytes = "1.0"
+cidr = "0.2.1"
+crc32fast = "1"
+endian_trait = { version = "0.6", features = ["arrays"] }
+flate2 = "1.0"
+anyhow = "1.0"
+thiserror = "1.0"
+futures = "0.3"
+h2 = { version = "0.3", features = [ "stream" ] }
+handlebars = "3.0"
+hex = "0.4.3"
+http = "0.2"
+hyper = { version = "0.14", features = [ "full" ] }
+lazy_static = "1.4"
+libc = "0.2"
+log = "0.4.17"
+nix = "0.19.1"
+num-traits = "0.2"
+once_cell = "1.3.1"
+openssl = "0.10.38" # currently patched!
+pam = "0.7"
+pam-sys = "0.5"
+percent-encoding = "2.1"
+regex = "1.5.5"
+rustyline = "7"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+siphasher = "0.3"
+syslog = "4.0"
+tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
+tokio-openssl = "0.6.1"
+tokio-stream = "0.1.0"
+tokio-util = { version = "0.6", features = [ "codec", "io" ] }
+tower-service = "0.3.0"
+udev = "0.4"
+url = "2.1"
+#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
+walkdir = "2"
+xdg = "2.2"
+nom = "5.1"
+crossbeam-channel = "0.5"
+
+# Used only by examples currently:
+zstd = { version = "0.6", features = [ "bindgen" ] }
+
+pathpatterns = "0.1.2"
+pxar = { version = "0.10.1", features = [ "tokio-io" ] }
+
+proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] }
+proxmox-io = "1"
 proxmox-lang = "1.1"
-proxmox-log = "0.2.6"
-proxmox-ldap = "0.2.1"
-proxmox-metrics = "0.3.1"
-proxmox-notify = "0.5.1"
-proxmox-openid = "0.10.0"
-proxmox-rest-server = { version = "0.8.9", features = [ "templates" ] }
-# some use "cli", some use "cli" and "server", pbs-config uses nothing
-proxmox-router = { version = "3.0.0", default-features = false }
-proxmox-rrd = "0.4"
-proxmox-rrd-api-types = "1.0.2"
-# everything but pbs-config and pbs-client use "api-macro"
-proxmox-schema = "4"
-proxmox-section-config = "2"
-proxmox-serde = "0.1.1"
-proxmox-shared-cache = "0.1"
-proxmox-shared-memory = "0.3.0"
-proxmox-sortable-macro = "0.1.2"
-proxmox-subscription = { version = "0.5.0", features = [ "api-types" ] }
-proxmox-sys = "0.6.7"
-proxmox-systemd = "0.1"
-proxmox-tfa = { version = "5", features = [ "api", "api-types" ] }
-proxmox-time = "2"
-proxmox-uuid = { version = "1", features = [ "serde" ] }
-proxmox-worker-task = "0.1"
-pbs-api-types = "0.2.2"
+proxmox-router = { version = "1.2.2", features = [ "cli" ] }
+proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
+proxmox-section-config = "1"
+proxmox-tfa = { version = "2", features = [ "api", "api-types" ] }
+proxmox-time = "1.1.2"
+proxmox-uuid = "1"
+proxmox-serde = "0.1"
+proxmox-shared-memory = "0.2"
+proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
+proxmox-compression = "0.1"
 
-# other proxmox crates
-pathpatterns = "0.3"
-proxmox-acme = "0.5.3"
-pxar = "0.12.1"
 
-# PBS workspace
+proxmox-acme-rs = "0.4"
+proxmox-apt = "0.8.0"
+proxmox-async = "0.4"
+proxmox-openid = "0.9.0"
+
+pbs-api-types = { path = "pbs-api-types" }
 pbs-buildcfg = { path = "pbs-buildcfg" }
 pbs-client = { path = "pbs-client" }
 pbs-config = { path = "pbs-config" }
 pbs-datastore = { path = "pbs-datastore" }
-pbs-fuse-loop = { path = "pbs-fuse-loop" }
-pbs-key-config = { path = "pbs-key-config" }
-pbs-pxar-fuse = { path = "pbs-pxar-fuse" }
-pbs-tape = { path = "pbs-tape" }
+proxmox-rest-server = { path = "proxmox-rest-server" }
+proxmox-rrd = { path = "proxmox-rrd" }
 pbs-tools = { path = "pbs-tools" }
-
-# regular crates
-anyhow = "1.0"
-async-trait = "0.1.56"
-apt-pkg-native = "0.3.2"
-base64 = "0.13"
-bitflags = "2.4"
-bytes = "1.0"
-cidr = "0.2.1"
-crc32fast = "1"
-const_format = "0.2"
-crossbeam-channel = "0.5"
-endian_trait = { version = "0.6", features = ["arrays"] }
-env_logger = "0.11"
-flate2 = "1.0"
-foreign-types = "0.3"
-futures = "0.3"
-h2 = { version = "0.4", features = [ "legacy", "stream" ] }
-handlebars = "3.0"
-hex = "0.4.3"
-hickory-resolver = { version = "0.24.1", default-features = false, features = [ "system-config", "tokio-runtime" ] }
-hyper = { version = "0.14", features = [ "backports", "deprecated", "full" ] }
-libc = "0.2"
-log = "0.4.17"
-nix = "0.26.1"
-nom = "7"
-num-traits = "0.2"
-once_cell = "1.3.1"
-openssl = "0.10.40"
-percent-encoding = "2.1"
-pin-project-lite = "0.2"
-regex = "1.5.5"
-rustyline = "9"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-siphasher = "0.3"
-syslog = "6"
-tar = "0.4"
-termcolor = "1.1.2"
-thiserror = "1.0"
-tokio = "1.6"
-tokio-openssl = "0.6.1"
-tokio-stream = "0.1.0"
-tokio-util = { version = "0.7", features = [ "io" ] }
-tracing = "0.1"
-tower-service = "0.3.0"
-udev = "0.4"
-url = "2.1"
-walkdir = "2"
-xdg = "2.2"
-zstd = { version = "0.12", features = [ "bindgen" ] }
-zstd-safe = "6.0"
-
-[dependencies]
-anyhow.workspace = true
-async-trait.workspace = true
-base64.workspace = true
-bytes.workspace = true
-cidr.workspace = true
-const_format.workspace = true
-crc32fast.workspace = true
-crossbeam-channel.workspace = true
-endian_trait.workspace = true
-futures.workspace = true
-h2.workspace = true
-hex.workspace = true
-hyper.workspace = true
-libc.workspace = true
-log.workspace = true
-nix.workspace = true
-nom.workspace = true
-num-traits.workspace = true
-once_cell.workspace = true
-openssl.workspace = true
-percent-encoding.workspace = true
-regex.workspace = true
-rustyline.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-syslog.workspace = true
-termcolor.workspace = true
-thiserror.workspace = true
-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
-tokio-openssl.workspace = true
-tokio-stream.workspace = true
-tokio-util = { workspace = true, features = [ "codec" ] }
-tracing.workspace = true
-udev.workspace = true
-url.workspace = true
-walkdir.workspace = true
-zstd.workspace = true
-
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
-
-# proxmox workspace
-proxmox-apt.workspace = true
-proxmox-apt-api-types.workspace = true
-proxmox-async.workspace = true
-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] }
-proxmox-compression.workspace = true
-proxmox-config-digest.workspace = true
-proxmox-daemon.workspace = true
-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these
-proxmox-human-byte.workspace = true
-proxmox-io.workspace = true
-proxmox-lang.workspace = true
-proxmox-log.workspace = true
-proxmox-ldap.workspace = true
-proxmox-metrics.workspace = true
-proxmox-notify = { workspace = true, features = [ "pbs-context" ] }
-proxmox-openid.workspace = true
-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
-proxmox-router = { workspace = true, features = [ "cli", "server"] }
-proxmox-schema = { workspace = true, features = [ "api-macro" ] }
-proxmox-section-config.workspace = true
-proxmox-serde = { workspace = true, features = [ "serde_json" ] }
-proxmox-shared-cache.workspace = true
-proxmox-shared-memory.workspace = true
-proxmox-sortable-macro.workspace = true
-proxmox-subscription.workspace = true
-proxmox-sys = { workspace = true, features = [ "timer" ] }
-proxmox-systemd.workspace = true
-proxmox-tfa.workspace = true
-proxmox-time.workspace = true
-proxmox-uuid.workspace = true
-proxmox-worker-task.workspace = true
-pbs-api-types.workspace = true
-
-# in their respective repo
-proxmox-acme.workspace = true
-pxar.workspace = true
-
-# proxmox-backup workspace/internal crates
-pbs-buildcfg.workspace = true
-pbs-client.workspace = true
-pbs-config.workspace = true
-pbs-datastore.workspace = true
-pbs-key-config.workspace = true
-pbs-tape.workspace = true
-pbs-tools.workspace = true
-proxmox-rrd.workspace = true
-proxmox-rrd-api-types.workspace = true
+pbs-tape = { path = "pbs-tape" }
 
 # Local path overrides
 # NOTE: You must run `cargo update` after changing this for it to take effect!
 [patch.crates-io]
-#pbs-api-types = { path = "../proxmox/pbs-api-types" }
-#proxmox-acme = { path = "../proxmox/proxmox-acme" }
-#proxmox-apt = { path = "../proxmox/proxmox-apt" }
-#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
+#proxmox = { path = "../proxmox/proxmox" }
 #proxmox-async = { path = "../proxmox/proxmox-async" }
-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
 #proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
-#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
-#proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
 #proxmox-fuse = { path = "../proxmox-fuse" }
 #proxmox-http = { path = "../proxmox/proxmox-http" }
-#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
 #proxmox-io = { path = "../proxmox/proxmox-io" }
 #proxmox-lang = { path = "../proxmox/proxmox-lang" }
-#proxmox-log = { path = "../proxmox/proxmox-log" }
-#proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
-#proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
-#proxmox-notify = { path = "../proxmox/proxmox-notify" }
-#proxmox-openid = { path = "../proxmox/proxmox-openid" }
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
 #proxmox-router = { path = "../proxmox/proxmox-router" }
-#proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
-#proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
 #proxmox-schema = { path = "../proxmox/proxmox-schema" }
 #proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
 #proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
-#proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
 #proxmox-sys = { path = "../proxmox/proxmox-sys" }
-#proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
 #proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
 #proxmox-time = { path = "../proxmox/proxmox-time" }
 #proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
-#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
-
-#pathpatterns = {path = "../pathpatterns" }
 #pxar = { path = "../pxar" }
 
 [features]

Makefile

@@ -1,12 +1,10 @@
 include /usr/share/dpkg/default.mk
-include /usr/share/rustc/architecture.mk
 include defines.mk
 
 PACKAGE := proxmox-backup
 ARCH := $(DEB_BUILD_ARCH)
-export DEB_HOST_RUST_TYPE
 
-SUBDIRS := etc www docs templates
+SUBDIRS := etc www docs
 
 # Binaries usable by users
 USR_BIN := \
@@ -20,7 +18,7 @@ USR_BIN := \
 # Binaries usable by admins
 USR_SBIN := \
 	proxmox-backup-manager \
-	proxmox-backup-debug
+	proxmox-backup-debug \
 
 # Binaries for services:
 SERVICE_BIN := \
@@ -33,25 +31,30 @@ SERVICE_BIN := \
 RESTORE_BIN := \
 	proxmox-restore-daemon
 
-SUBCRATES != cargo metadata --no-deps --format-version=1 \
-	| jq -r .workspace_members'[]' \
-	| grep "$$PWD/" \
-	| sed -e "s!.*$$PWD/!!g" -e 's/\#.*$$//g' -e 's/)$$//g'
-
-STATIC_TARGET_DIR := target/static-build
+SUBCRATES := \
+	pbs-api-types \
+	pbs-buildcfg \
+	pbs-client \
+	pbs-config \
+	pbs-datastore \
+	pbs-fuse-loop \
+	proxmox-rest-server \
+	proxmox-rrd \
+	pbs-tape \
+	pbs-tools \
+	proxmox-backup-banner \
+	proxmox-backup-client \
+	proxmox-file-restore \
+	proxmox-restore-daemon \
+	pxar-bin
 
 ifeq ($(BUILD_MODE), release)
-CARGO_BUILD_ARGS += --release --target $(DEB_HOST_RUST_TYPE)
-COMPILEDIR := target/$(DEB_HOST_RUST_TYPE)/release
-STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/release
+CARGO_BUILD_ARGS += --release
+COMPILEDIR := target/release
 else
-CARGO_BUILD_ARGS += --target $(DEB_HOST_RUST_TYPE)
-COMPILEDIR := target/$(DEB_HOST_RUST_TYPE)/debug
-STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/debug
+COMPILEDIR := target/debug
 endif
 
-STATIC_RUSTC_FLAGS := -C target-feature=+crt-static -L $(STATIC_COMPILEDIR)/deps-stubs/
-
 ifeq ($(valgrind), yes)
 CARGO_BUILD_ARGS += --features valgrind
 endif
@@ -61,31 +64,26 @@ CARGO ?= cargo
 COMPILED_BINS := \
 	$(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN) $(RESTORE_BIN))
 
-STATIC_BINS := \
-	$(addprefix $(STATIC_COMPILEDIR)/,proxmox-backup-client-static pxar-static)
-
 export DEB_VERSION DEB_VERSION_UPSTREAM
 
-SERVER_DEB=$(PACKAGE)-server_$(DEB_VERSION)_$(ARCH).deb
-SERVER_DBG_DEB=$(PACKAGE)-server-dbgsym_$(DEB_VERSION)_$(ARCH).deb
-CLIENT_DEB=$(PACKAGE)-client_$(DEB_VERSION)_$(ARCH).deb
-CLIENT_DBG_DEB=$(PACKAGE)-client-dbgsym_$(DEB_VERSION)_$(ARCH).deb
-RESTORE_DEB=proxmox-backup-file-restore_$(DEB_VERSION)_$(ARCH).deb
-RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_$(DEB_VERSION)_$(ARCH).deb
-STATIC_CLIENT_DEB=$(PACKAGE)-client-static_$(DEB_VERSION)_$(ARCH).deb
-STATIC_CLIENT_DBG_DEB=$(PACKAGE)-client-static-dbgsym_$(DEB_VERSION)_$(ARCH).deb
-DOC_DEB=$(PACKAGE)-docs_$(DEB_VERSION)_all.deb
+SERVER_DEB=${PACKAGE}-server_${DEB_VERSION}_${ARCH}.deb
+SERVER_DBG_DEB=${PACKAGE}-server-dbgsym_${DEB_VERSION}_${ARCH}.deb
+CLIENT_DEB=${PACKAGE}-client_${DEB_VERSION}_${ARCH}.deb
+CLIENT_DBG_DEB=${PACKAGE}-client-dbgsym_${DEB_VERSION}_${ARCH}.deb
+RESTORE_DEB=proxmox-backup-file-restore_${DEB_VERSION}_${ARCH}.deb
+RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_${DEB_VERSION}_${ARCH}.deb
+DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
 
-DEBS=$(SERVER_DEB) $(SERVER_DBG_DEB) $(CLIENT_DEB) $(CLIENT_DBG_DEB) \
-     $(RESTORE_DEB) $(RESTORE_DBG_DEB) $(STATIC_CLIENT_DEB) $(STATIC_CLIENT_DBG_DEB)
+DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
+     ${RESTORE_DEB} ${RESTORE_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB}
 
-DSC = rust-$(PACKAGE)_$(DEB_VERSION).dsc
+DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
 
 DESTDIR=
 
 tests ?= --workspace
 
-all: proxmox-backup-client-static $(SUBDIRS)
+all: $(SUBDIRS)
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS):
@@ -102,13 +100,15 @@ doc:
 # always re-create this dir
 .PHONY: build
 build:
+	@echo "Setting pkg-buildcfg version to: $(DEB_VERSION_UPSTREAM)"
+	sed -i -e 's/^version =.*$$/version = "$(DEB_VERSION_UPSTREAM)"/' \
+	  pbs-buildcfg/Cargo.toml
 	rm -rf build
 	mkdir build
-	git rev-parse HEAD > build/.repoid
 	cp -a debian \
 	  Cargo.toml src \
 	  $(SUBCRATES) \
-	  docs etc examples tests www zsh-completions templates \
+	  docs etc examples tests www zsh-completions \
 	  defines.mk Makefile \
 	  ./build/
 	rm -f build/Cargo.lock
@@ -123,31 +123,23 @@ proxmox-backup-docs: build
 	cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
 	lintian $(DOC_DEB)
 
-.PHONY: deb dsc deb-nodoc deb-nostrip
-deb-nodoc: build
+# copy the local target/ dir as a build-cache
+.PHONY: deb
+$(DEBS): deb
+deb: build
 	cd build; dpkg-buildpackage -b -us -uc --no-pre-clean --build-profiles=nodoc
 	lintian $(DEBS)
 
-deb-nostrip: build
-	cd build; DEB_BUILD_OPTIONS=nostrip dpkg-buildpackage -b -us -uc
-	lintian $(DEBS) $(DOC_DEB)
-
-$(DEBS): deb
-deb: build
-	cd build; dpkg-buildpackage -b -us -uc
+.PHONY: deb-all
+deb-all: build
+	cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
 	lintian $(DEBS) $(DOC_DEB)
 
 .PHONY: dsc
-dsc:
-	rm -rf $(DSC) build/
-	$(MAKE) $(DSC)
-	lintian $(DSC)
-
+dsc: $(DSC)
 $(DSC): build
-	cd build; dpkg-buildpackage -S -us -uc -d
-
-sbuild: $(DSC)
-	sbuild $<
+	cd build; dpkg-buildpackage -S -us -uc -d -nc
+	lintian $(DSC)
 
 .PHONY: clean distclean deb clean
 distclean: clean
@@ -155,15 +147,16 @@ clean: clean-deb
 	$(foreach i,$(SUBDIRS), \
 	    $(MAKE) -C $(i) clean ;)
 	$(CARGO) clean
-	rm -f .do-cargo-build .do-static-cargo-build
+	rm -f .do-cargo-build
+	find . -name '*~' -exec rm {} ';'
 
-# allows one to avoid running cargo clean when one just wants to tidy up after a package build
+# allows one to avoid running cargo clean when one just wants to tidy up after a packgae build
 clean-deb:
-	rm -rf build/
-	rm -f *.deb *.dsc *.tar.* *.buildinfo *.build *.changes
+	rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build/
 
 .PHONY: dinstall
-dinstall: $(SERVER_DEB) $(SERVER_DBG_DEB) $(CLIENT_DEB) $(CLIENT_DBG_DEB)
+dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
+  ${DEBUG_DEB} ${DEBUG_DBG_DEB}
 	dpkg -i $^
 
 # make sure we build binaries before docs
@@ -194,7 +187,6 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
 	    --bin proxmox-restore-daemon \
 	    --package proxmox-backup \
 	    --bin docgen \
-	    --bin pbs2to3 \
 	    --bin proxmox-backup-api \
 	    --bin proxmox-backup-manager \
 	    --bin proxmox-backup-proxy \
@@ -204,25 +196,12 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
 	    --bin sg-tape-cmd
 	touch "$@"
 
-.PHONY: proxmox-backup-client-static
-proxmox-backup-client-static:
-	rm -f .do-static-cargo-build
-	$(MAKE) $(STATIC_BINS)
-
-$(STATIC_BINS): .do-static-cargo-build
-.do-static-cargo-build:
-	mkdir -p $(STATIC_COMPILEDIR)/deps-stubs/ && \
-          echo '!<arch>' > $(STATIC_COMPILEDIR)/deps-stubs/libsystemd.a # workaround for to greedy linkage and proxmox-systemd
-	$(CARGO) rustc $(CARGO_BUILD_ARGS) --package pxar-bin --bin pxar \
-	  --target-dir $(STATIC_TARGET_DIR) -- $(STATIC_RUSTC_FLAGS)
-	$(CARGO) rustc $(CARGO_BUILD_ARGS) --package proxmox-backup-client --bin proxmox-backup-client \
-	  --target-dir $(STATIC_TARGET_DIR) -- $(STATIC_RUSTC_FLAGS)
 
 .PHONY: lint
 lint:
 	cargo clippy -- -A clippy::all -D clippy::correctness
 
-install: $(COMPILED_BINS) $(STATIC_BINS)
+install: $(COMPILED_BINS)
 	install -dm755 $(DESTDIR)$(BINDIR)
 	install -dm755 $(DESTDIR)$(ZSH_COMPL_DEST)
 	$(foreach i,$(USR_BIN), \
@@ -232,7 +211,6 @@ install: $(COMPILED_BINS) $(STATIC_BINS)
 	$(foreach i,$(USR_SBIN), \
 	    install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \
 	    install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
-	install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/
 	install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
 	install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore
 	$(foreach i,$(RESTORE_BIN), \
@@ -241,19 +219,15 @@ install: $(COMPILED_BINS) $(STATIC_BINS)
 	install -m4755 -o root -g root $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd
 	$(foreach i,$(SERVICE_BIN), \
 	    install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
-	install -m755 $(STATIC_COMPILEDIR)/proxmox-backup-client $(DESTDIR)$(BINDIR)/proxmox-backup-client-static
-	install -m755 $(STATIC_COMPILEDIR)/pxar $(DESTDIR)$(BINDIR)/pxar-static
 	$(MAKE) -C www install
 	$(MAKE) -C docs install
-	$(MAKE) -C templates install
 
 .PHONY: upload
-upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: $(SERVER_DEB) $(CLIENT_DEB) $(RESTORE_DEB) $(DOC_DEB) $(STATIC_CLIENT_DEB)
+upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB}
 	# check if working directory is clean
 	git diff --exit-code --stat && git diff --exit-code --stat --staged
-	tar cf - $(SERVER_DEB) $(SERVER_DBG_DEB) $(DOC_DEB) $(CLIENT_DEB) $(CLIENT_DBG_DEB) \
-	  | ssh -X repoman@repo.proxmox.com upload --product pbs --dist $(UPLOAD_DIST)
-	tar cf - $(CLIENT_DEB) $(CLIENT_DBG_DEB) | ssh -X repoman@repo.proxmox.com upload --product "pve,pmg,pbs-client" --dist $(UPLOAD_DIST)
-	tar cf - $(STATIC_CLIENT_DEB) $(STATIC_CLIENT_DBG_DEB) | ssh -X repoman@repo.proxmox.com upload --product "pbs-client" --dist $(UPLOAD_DIST)
-	tar cf - $(RESTORE_DEB) $(RESTORE_DBG_DEB) | ssh -X repoman@repo.proxmox.com upload --product "pve" --dist $(UPLOAD_DIST)
+	tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} ${CLIENT_DEB} \
+	    ${CLIENT_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB} \
+	  | ssh -X repoman@repo.proxmox.com upload --product pbs --dist bullseye
+	tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve,pmg,pbs-client" --dist bullseye
+	tar cf - ${RESTORE_DEB} ${RESTORE_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve" --dist bullseye

README.rst

@@ -5,11 +5,8 @@ Build & Release Notes
 ``rustup`` Toolchain
 ====================
 
-We normally want to build with the ``rustc`` Debian package (see below). If you
-still want to use ``rustup`` for other reasons (e.g. to easily switch between
-the official stable, beta, and nightly compilers), you should set the following
-``rustup`` configuration to use the Debian-provided ``rustc`` compiler
-by default:
+We normally want to build with the ``rustc`` Debian package. To do that
+you can set the following ``rustup`` configuration:
 
     # rustup toolchain link system /usr
     # rustup default system
@@ -33,7 +30,7 @@ pre-release version number (e.g., "0.1.1-dev.1" instead of "0.1.0").
 Local cargo config
 ==================
 
-This repository ships with a ``.cargo/config.toml`` that replaces the crates.io
+This repository ships with a ``.cargo/config`` that replaces the crates.io
 registry with packaged crates located in ``/usr/share/cargo/registry``.
 
 A similar config is also applied building with dh_cargo. Cargo.lock needs to be
@@ -47,11 +44,11 @@ example for proxmox crate above).
 
 Build
 =====
-on Debian 12 Bookworm
+on Debian 11 Bullseye
 
 Setup:
-  1. # echo 'deb http://download.proxmox.com/debian/devel/ bookworm main' | sudo tee /etc/apt/sources.list.d/proxmox-devel.list
-  2. # sudo wget https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
+  1. # echo 'deb http://download.proxmox.com/debian/devel/ bullseye main' | sudo tee /etc/apt/sources.list.d/proxmox-devel.list
+  2. # sudo wget https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
   3. # sudo apt update
   4. # sudo apt install devscripts debcargo clang
   5. # git clone git://git.proxmox.com/git/proxmox-backup.git
@@ -61,7 +58,7 @@ Note: 2. may be skipped if you already added the PVE or PBS package repository
 
 You are now able to build using the Makefile or cargo itself, e.g.::
 
-  # make deb
+  # make deb-all
   # # or for a non-package build
   # cargo build --all --release
 

debian/compat

@@ -0,0 +1 @@
+12

debian/control

@@ -1,123 +1,86 @@
 Source: rust-proxmox-backup
 Section: admin
 Priority: optional
-Build-Depends: bash-completion,
-               cargo:native (>= 0.65.0~),
-               debhelper (>= 12~),
-               debhelper-compat (= 13),
+Build-Depends: debhelper (>= 12),
  dh-cargo (>= 24),
-               fonts-dejavu-core <!nodoc>,
-               fonts-lato <!nodoc>,
-               fonts-open-sans <!nodoc>,
-               graphviz <!nodoc>,
-               jq,
-               latexmk <!nodoc>,
-               libacl1-dev,
-               libfuse3-dev,
+ cargo:native,
+ rustc:native,
+ libstd-rust-dev,
  librust-anyhow-1+default-dev,
-               librust-async-trait-0.1+default-dev (>= 0.1.56-~~),
+ librust-apt-pkg-native-0.3+default-dev (>= 0.3.2-~~),
  librust-base64-0.13+default-dev,
-               librust-bitflags-2+default-dev (>= 2.4-~~),
+ librust-bitflags-1+default-dev (>= 1.2.1-~~),
  librust-bytes-1+default-dev,
  librust-cidr-0.2+default-dev (>= 0.2.1-~~),
-               librust-const-format-0.2+default-dev,
  librust-crc32fast-1+default-dev,
  librust-crossbeam-channel-0.5+default-dev,
  librust-endian-trait-0.6+arrays-dev,
  librust-endian-trait-0.6+default-dev,
-               librust-env-logger-0.11+default-dev,
+ librust-env-logger-0.9+default-dev,
+ librust-flate2-1+default-dev,
  librust-foreign-types-0.3+default-dev,
  librust-futures-0.3+default-dev,
-               librust-h2-0.4+default-dev,
-               librust-h2-0.4+legacy-dev,
-               librust-h2-0.4+stream-dev,
+ librust-h2-0.3+default-dev,
+ librust-h2-0.3+stream-dev,
+ librust-handlebars-3+default-dev,
  librust-hex-0.4+default-dev (>= 0.4.3-~~),
  librust-hex-0.4+serde-dev (>= 0.4.3-~~),
-               librust-hyper-0.14+backports-dev,
-               librust-hyper-0.14+default-dev,
-               librust-hyper-0.14+deprecated-dev,
-               librust-hyper-0.14+full-dev,
+ librust-http-0.2+default-dev,
+ librust-hyper-0.14+default-dev (>= 0.14.5-~~),
+ librust-hyper-0.14+full-dev (>= 0.14.5-~~),
+ librust-lazy-static-1+default-dev (>= 1.4-~~),
  librust-libc-0.2+default-dev,
-               librust-log-0.4+default-dev (>= 0.4.17-~~),
-               librust-nix-0.26+default-dev (>= 0.26.1-~~),
-               librust-nom-7+default-dev,
+ librust-log-0.4+default-dev (>= 0.4.17-~~) <!nocheck>,
+ librust-nix-0.19+default-dev (>= 0.19.1-~~),
+ librust-nom-5+default-dev (>= 5.1-~~),
  librust-num-traits-0.2+default-dev,
  librust-once-cell-1+default-dev (>= 1.3.1-~~),
-               librust-openssl-0.10+default-dev (>= 0.10.40-~~),
-               librust-pathpatterns-0.3+default-dev,
-               librust-pbs-api-types-0.2+default-dev (>= 0.2.2),
+ librust-openssl-0.10+default-dev (>= 0.10.38-~~),
+ librust-pam-0.7+default-dev,
+ librust-pam-sys-0.5+default-dev,
+ librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~),
  librust-percent-encoding-2+default-dev (>= 2.1-~~),
  librust-pin-project-lite-0.2+default-dev,
-               librust-proxmox-acme-0.5+default-dev (>= 0.5.3-~~),
-               librust-proxmox-apt-0.11+cache-dev,
-               librust-proxmox-apt-0.11+default-dev,
-               librust-proxmox-apt-api-types-1+default-dev (>= 1.0.1-~~),
+ librust-proxmox-acme-rs-0.4+default-dev,
+ librust-proxmox-apt-0.8+default-dev,
  librust-proxmox-async-0.4+default-dev,
-               librust-proxmox-auth-api-0.4+api-dev,
-               librust-proxmox-auth-api-0.4+default-dev,
-               librust-proxmox-auth-api-0.4+pam-authenticator-dev,
  librust-proxmox-borrow-1+default-dev,
-               librust-proxmox-compression-0.2+default-dev,
-               librust-proxmox-config-digest-0.1+default-dev,
-               librust-proxmox-daemon-0.1+default-dev,
-               librust-proxmox-fuse-0.1+default-dev (>= 0.1.3-~~),
-               librust-proxmox-http-0.9+client-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+client-trait-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+default-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+http-helpers-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+proxmox-async-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+rate-limited-stream-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+rate-limiter-dev (>= 0.9.5-~~),
-               librust-proxmox-http-0.9+websocket-dev (>= 0.9.5-~~),
-               librust-proxmox-human-byte-0.1+default-dev,
+ librust-proxmox-compression-0.1+default-dev (>= 0.1.1-~~),
+ librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~),
+ librust-proxmox-http-0.6.1+client-dev,
+ librust-proxmox-http-0.6.1+default-dev,
+ librust-proxmox-http-0.6.1+http-helpers-dev,
+ librust-proxmox-http-0.6.1+websocket-dev,
  librust-proxmox-io-1+default-dev (>= 1.0.1-~~),
  librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~),
  librust-proxmox-lang-1+default-dev (>= 1.1-~~),
-               librust-proxmox-ldap-0.2+default-dev (>= 0.2.1-~~),
-               librust-proxmox-log-0.2+default-dev (>= 0.2.6-~~),
-               librust-proxmox-metrics-0.3+default-dev (>= 0.3.1-~~),
-               librust-proxmox-notify-0.5+default-dev (>= 0.5.1-~~),
-               librust-proxmox-notify-0.5+pbs-context-dev (>= 0.5.1-~~),
-               librust-proxmox-openid-0.10+default-dev,
-               librust-proxmox-rest-server-0.8+default-dev (>= 0.8.9-~~),
-               librust-proxmox-rest-server-0.8+rate-limited-stream-dev (>= 0.8.9-~~),
-               librust-proxmox-rest-server-0.8+templates-dev (>= 0.8.9-~~),
-               librust-proxmox-router-3+cli-dev,
-               librust-proxmox-router-3+server-dev,
-               librust-proxmox-rrd-0.4+default-dev,
-               librust-proxmox-rrd-api-types-1+default-dev (>= 1.0.2-~~),
-               librust-proxmox-schema-4+api-macro-dev,
-               librust-proxmox-schema-4+default-dev,
-               librust-proxmox-section-config-2+default-dev,
-               librust-proxmox-serde-0.1+default-dev (>= 0.1.1-~~),
-               librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~),
-               librust-proxmox-shared-cache-0.1+default-dev,
-               librust-proxmox-shared-memory-0.3+default-dev,
-               librust-proxmox-sortable-macro-0.1+default-dev (>= 0.1.2-~~),
-               librust-proxmox-subscription-0.5+api-types-dev,
-               librust-proxmox-subscription-0.5+default-dev,
-               librust-proxmox-sys-0.6+acl-dev (>= 0.6.5-~~),
-               librust-proxmox-sys-0.6+crypt-dev (>= 0.6.5-~~),
-               librust-proxmox-sys-0.6+default-dev (>= 0.6.7-~~),
-               librust-proxmox-sys-0.6+logrotate-dev (>= 0.6.5-~~),
-               librust-proxmox-sys-0.6+timer-dev (>= 0.6.5-~~),
-               librust-proxmox-systemd-0.1+default-dev,
-               librust-proxmox-tfa-5+api-dev,
-               librust-proxmox-tfa-5+api-types-dev,
-               librust-proxmox-tfa-5+default-dev,
-               librust-proxmox-time-2+default-dev,
+ librust-proxmox-openid-0.9+default-dev,
+ librust-proxmox-router-1+cli-dev (>= 1.2-~~),
+ librust-proxmox-router-1+default-dev (>= 1.2.2-~~),
+ librust-proxmox-schema-1+api-macro-dev (>= 1.3.1-~~),
+ librust-proxmox-schema-1+default-dev (>= 1.3.1-~~),
+ librust-proxmox-schema-1+upid-api-impl-dev (>= 1.3.1-~~),
+ librust-proxmox-section-config-1+default-dev,
+ librust-proxmox-serde-0.1+default-dev,
+ librust-proxmox-shared-memory-0.2+default-dev,
+ librust-proxmox-sys-0.2+default-dev (>= 0.2.1-~~),
+ librust-proxmox-sys-0.2+sortable-macro-dev (>= 0.2.1-~~),
+ librust-proxmox-tfa-2+api-dev,
+ librust-proxmox-tfa-2+api-types-dev,
+ librust-proxmox-tfa-2+default-dev,
+ librust-proxmox-time-1+default-dev (>= 1.1.2-~~),
  librust-proxmox-uuid-1+default-dev,
  librust-proxmox-uuid-1+serde-dev,
-               librust-proxmox-worker-task-0.1+default-dev,
-               librust-pxar-0.12+default-dev (>= 0.12.1-~~),
+ librust-pxar-0.10+default-dev (>= 0.10.1-~~),
+ librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~),
  librust-regex-1+default-dev (>= 1.5.5-~~),
-               librust-rustyline-9+default-dev,
+ librust-rustyline-7+default-dev,
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
+ librust-serde-cbor-0.11+default-dev (>= 0.11.1-~~),
  librust-serde-json-1+default-dev,
-               librust-syslog-6+default-dev,
-               librust-tar-0.4+default-dev,
-               librust-termcolor-1+default-dev (>= 1.1.2-~~),
+ librust-siphasher-0.3+default-dev,
+ librust-syslog-4+default-dev,
  librust-thiserror-1+default-dev,
  librust-tokio-1+default-dev (>= 1.6-~~),
  librust-tokio-1+fs-dev (>= 1.6-~~),
@@ -134,34 +97,39 @@ Build-Depends: bash-completion,
  librust-tokio-1+time-dev (>= 1.6-~~),
  librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~),
  librust-tokio-stream-0.1+default-dev,
-               librust-tokio-util-0.7+codec-dev,
-               librust-tokio-util-0.7+default-dev,
-               librust-tokio-util-0.7+io-dev,
+ librust-tokio-util-0.6+codec-dev,
+ librust-tokio-util-0.6+default-dev,
+ librust-tokio-util-0.6+io-dev,
  librust-tower-service-0.3+default-dev,
-               librust-tracing-0.1+default-dev,
  librust-udev-0.4+default-dev,
  librust-url-2+default-dev (>= 2.1-~~),
  librust-walkdir-2+default-dev,
  librust-xdg-2+default-dev (>= 2.2-~~),
-               librust-zstd-0.12+bindgen-dev,
-               librust-zstd-0.12+default-dev,
-               librust-zstd-safe-6+default-dev,
-               libsgutils2-dev,
-               libstd-rust-dev,
+ librust-zstd-0.6+bindgen-dev,
+ librust-zstd-0.6+default-dev,
+ libacl1-dev,
+ libfuse3-dev,
  libsystemd-dev (>= 246-~~),
+ uuid-dev,
+ libsgutils2-dev,
+ bash-completion,
+ debhelper (>= 12~),
+ fonts-dejavu-core <!nodoc>,
+ fonts-lato <!nodoc>,
+ fonts-open-sans <!nodoc>,
+ graphviz <!nodoc>,
+ latexmk <!nodoc>,
  patchelf,
  proxmox-widget-toolkit-dev <!nodoc>,
-               pve-eslint (>= 7.18.0~),
+ pve-eslint (>= 7.18.0-1),
  python3-docutils,
  python3-pygments,
  python3-sphinx <!nodoc>,
  rsync,
-               rustc:native,
  texlive-fonts-extra <!nodoc>,
  texlive-fonts-recommended <!nodoc>,
  texlive-xetex <!nodoc>,
-               uuid-dev,
-               xindy <!nodoc>,
+ xindy <!nodoc>
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Standards-Version: 4.5.1
 Vcs-Git: git://git.proxmox.com/git/proxmox-backup.git
@@ -172,11 +140,10 @@ Rules-Requires-Root: binary-targets
 Package: proxmox-backup-server
 Architecture: any
 Depends: fonts-font-awesome,
-         gdisk,
          libjs-extjs (>= 7~),
          libjs-qrcodejs (>= 1.20201119),
          libproxmox-acme-plugins,
-         libsgutils2-1.46-2,
+         libsgutils2-2,
          libzstd1 (>= 1.3.8),
          lvm2,
          openssh-server,
@@ -184,48 +151,45 @@ Depends: fonts-font-awesome,
          postfix | mail-transport-agent,
          proxmox-backup-docs,
          proxmox-mini-journalreader,
-         proxmox-widget-toolkit (>= 4.3.3),
+         proxmox-widget-toolkit (>= 3.4-3),
          pve-xtermjs (>= 4.7.0-1),
          sg3-utils,
          smartmontools,
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: ifupdown2,
-            proxmox-mail-forward,
-            proxmox-offline-mirror-helper,
-            zfsutils-linux,
+Recommends: zfsutils-linux,
+            ifupdown2,
 Description: Proxmox Backup Server daemon with tools and GUI
  This package contains the Proxmox Backup Server daemons and related
  tools. This includes a web-based graphical user interface.
 
 Package: proxmox-backup-client
 Architecture: any
-Depends: qrencode, ${misc:Depends}, ${shlibs:Depends},
+Depends: qrencode,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Proxmox Backup Client tools
  This package contains the Proxmox Backup client, which provides a
  simple command line tool to create and restore backups.
 
-Package: proxmox-backup-client-static
-Architecture: any
-Depends: qrencode, ${misc:Depends},
-Conflicts: proxmox-backup-client,
-Description: Proxmox Backup Client tools (statically linked)
- This package contains the Proxmox Backup client, which provides a
- simple command line tool to create and restore backups.
-
 Package: proxmox-backup-docs
 Build-Profiles: <!nodoc>
 Section: doc
-Depends: fonts-font-awesome, libjs-extjs, libjs-mathjax, ${misc:Depends},
+Depends: fonts-font-awesome,
+         libjs-extjs,
+         libjs-mathjax,
+         ${misc:Depends},
 Architecture: all
 Description: Proxmox Backup Documentation
  This package contains the Proxmox Backup Documentation files.
 
 Package: proxmox-backup-file-restore
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: proxmox-backup-restore-image, pve-qemu-kvm (>= 5.0.0-9),
-Breaks: proxmox-backup-restore-image (<< 0.3.1),
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: pve-qemu-kvm (>= 5.0.0-9),
+            proxmox-backup-restore-image,
+Breaks: proxmox-backup-restore-image (<< 0.3.1)
 Description: Proxmox Backup single file restore tools for pxar and block device backups
  This package contains the Proxmox Backup single file restore client for
  restoring individual files and folders from both host/container and VM/block

debian/copyright

@@ -1,4 +1,4 @@
-Copyright (C) 2019 - 2025 Proxmox Server Solutions GmbH
+Copyright (C) 2019 - 2021 Proxmox Server Solutions GmbH
 
 This software is written by Proxmox Server Solutions GmbH <support@proxmox.com>
 

debian/lintian-overrides

@@ -1,8 +1,2 @@
-proxmox-backup-server: mail-transport-agent-dependency-does-not-specify-default-mta
-proxmox-backup-server: package-installs-apt-sources [etc/apt/sources.list.d/pbs-enterprise.list]
-proxmox-backup-server: elevated-privileges 4755 root/root [usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd]
-proxmox-backup-server: systemd-service-file-refers-to-unusual-wantedby-target getty.target [lib/systemd/system/proxmox-backup-banner.service]
-proxmox-backup-server: uses-dpkg-database-directly [usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api]
-proxmox-backup-server: uses-dpkg-database-directly [usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy]
-proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/pbs2to3]
-proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/proxmox-backup-debug]
+proxmox-backup-server: package-installs-apt-sources etc/apt/sources.list.d/pbs-enterprise.list
+proxmox-backup-server: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/proxmox-backup-banner.service getty.target

debian/postinst

@@ -20,7 +20,15 @@ case "$1" in
 	# modeled after dh_systemd_start output
 	systemctl --system daemon-reload >/dev/null || true
 	if [ -n "$2" ]; then
+		if dpkg --compare-versions "$2" 'lt' '1.0.7-1'; then
+			# there was an issue with reloading and systemd being confused in older daemon versions
+			# so restart instead of reload if upgrading from there, see commit 0ec79339f7aebf9
+			# FIXME: remove with PBS 2.1
+			echo "Upgrading from older proxmox-backup-server: restart (not reload) daemons"
+			_dh_action=try-restart
+		else
 			_dh_action=try-reload-or-restart
+		fi
 	else
 		_dh_action=start
 	fi
@@ -33,24 +41,7 @@ case "$1" in
 			flock -w 30 /var/log/proxmox-backup/tasks/active.lock sed -i 's/:termproxy::\([^@]\+\): /:termproxy::\1@pam: /' /var/log/proxmox-backup/tasks/active || true
 		fi
 
-		if dpkg --compare-versions "$2" 'lt' '2.2.2~'; then
-			echo "moving prune schedule from datacenter config to new prune job config"
-			proxmox-backup-manager update-to-prune-jobs-config \
-			    || echo "Failed to move prune jobs, please check manually"
-			true
-		fi
-
-		if dpkg --compare-versions "$2" 'lt' '2.3.1~' && test -e /etc/proxmox-backup/.datastore.lck; then
-			lock_user="$(stat --format '%U' /etc/proxmox-backup/.datastore.lck)"
-			if [ "${lock_user}" != "backup" ]; then
-				echo "updating /etc/proxmox-backup/.datastore.lck from wrong user '${lock_user}' to 'backup'"
-				chown backup:backup /etc/proxmox-backup/.datastore.lck \
-				    || printf "Failed to fix datastore.lck user, please retry manually with:\n\n\t%s\n\n" \
-				        "chown backup:backup /etc/proxmox-backup/.datastore.lck"
-			fi
-		fi
-
-		if dpkg --compare-versions "$2" 'lt' '2.1.3~' && test -e /etc/proxmox-backup/sync.cfg; then
+		if dpkg --compare-versions "$2" 'lt' '7.1-1' && test -e /etc/proxmox-backup/sync.cfg; then
 			prev_job=""
 
 			# read from HERE doc because POSIX sh limitations
@@ -72,11 +63,6 @@ EOF
 				update_sync_job "$prev_job"
 			fi
 		fi
-
-		if dpkg --compare-versions "$2" 'lt' '3.3.5~'; then
-			# ensure old locking is used by the daemon until a reboot happened
-			touch "/run/proxmox-backup/old-locking"
-		fi
 	fi
     ;;
 

debian/proxmox-backup-client-static.bash-completion

@@ -1,2 +0,0 @@
-debian/proxmox-backup-client.bc proxmox-backup-client
-debian/pxar.bc pxar

debian/proxmox-backup-client-static.install

@@ -1,4 +0,0 @@
-usr/share/man/man1/proxmox-backup-client.1
-usr/share/man/man1/pxar.1
-usr/share/zsh/vendor-completions/_proxmox-backup-client
-usr/share/zsh/vendor-completions/_pxar

debian/proxmox-backup-docs.links

@@ -1,6 +1,6 @@
 /usr/share/doc/proxmox-backup/proxmox-backup.pdf /usr/share/doc/proxmox-backup/html/proxmox-backup.pdf
+/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/prune-simulator/extjs
+/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/lto-barcode/extjs
 /usr/share/fonts-font-awesome/ /usr/share/doc/proxmox-backup/html/lto-barcode/font-awesome
 /usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/api-viewer/extjs
-/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/lto-barcode/extjs
-/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/prune-simulator/extjs
 /usr/share/javascript/mathjax /usr/share/doc/proxmox-backup/html/_static/mathjax

debian/proxmox-backup-docs.lintian-overrides

@@ -1 +0,0 @@
-proxmox-backup-docs: embedded-javascript-library please use * [usr/share/doc/proxmox-backup/html/_static/*.js]

debian/proxmox-backup-file-restore.install

@@ -1,4 +1,4 @@
 usr/bin/proxmox-file-restore
-usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon
 usr/share/man/man1/proxmox-file-restore.1
 usr/share/zsh/vendor-completions/_proxmox-file-restore
+usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon

debian/proxmox-backup-file-restore.postinst

@@ -9,7 +9,7 @@ update_initramfs() {
     CACHE_PATH_DBG="/var/cache/proxmox-backup/file-restore-initramfs-debug.img"
 
     # cleanup first, in case proxmox-file-restore was uninstalled since we do
-    # not want an unusable image lying around
+    # not want an unuseable image lying around
     rm -f "$CACHE_PATH"
 
     if [ ! -f "$INST_PATH/initramfs.img" ]; then
@@ -71,6 +71,4 @@ case "$1" in
     ;;
 esac
 
-#DEBHELPER#
-
 exit 0

debian/proxmox-backup-server.install

@@ -1,76 +1,40 @@
-etc/pbs-enterprise.list /etc/apt/sources.list.d/
+etc/proxmox-backup-proxy.service /lib/systemd/system/
+etc/proxmox-backup.service /lib/systemd/system/
 etc/proxmox-backup-banner.service /lib/systemd/system/
 etc/proxmox-backup-daily-update.service /lib/systemd/system/
 etc/proxmox-backup-daily-update.timer /lib/systemd/system/
-etc/proxmox-backup-proxy.service /lib/systemd/system/
-etc/proxmox-backup.service /lib/systemd/system/
-etc/removable-device-attach@.service /lib/systemd/system/
-usr/bin/pmt
-usr/bin/pmtx
-usr/bin/proxmox-tape
+etc/pbs-enterprise.list /etc/apt/sources.list.d/
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api
-usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy
+usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-daily-update
 usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd
-usr/sbin/pbs2to3
 usr/sbin/proxmox-backup-debug
 usr/sbin/proxmox-backup-manager
+usr/bin/pmtx
+usr/bin/pmt
+usr/bin/proxmox-tape
+usr/share/javascript/proxmox-backup/index.hbs
 usr/share/javascript/proxmox-backup/css/ext6-pbs.css
 usr/share/javascript/proxmox-backup/images
-usr/share/javascript/proxmox-backup/index.hbs
 usr/share/javascript/proxmox-backup/js/proxmox-backup-gui.js
-usr/share/man/man1/pbs2to3.1
-usr/share/man/man1/pmt.1
-usr/share/man/man1/pmtx.1
 usr/share/man/man1/proxmox-backup-debug.1
 usr/share/man/man1/proxmox-backup-manager.1
 usr/share/man/man1/proxmox-backup-proxy.1
 usr/share/man/man1/proxmox-tape.1
+usr/share/man/man1/pmtx.1
+usr/share/man/man1/pmt.1
 usr/share/man/man5/acl.cfg.5
 usr/share/man/man5/datastore.cfg.5
-usr/share/man/man5/domains.cfg.5
-usr/share/man/man5/media-pool.cfg.5
-usr/share/man/man5/notifications-priv.cfg.5
-usr/share/man/man5/notifications.cfg.5
-usr/share/man/man5/proxmox-backup.node.cfg.5
-usr/share/man/man5/prune.cfg.5
+usr/share/man/man5/user.cfg.5
 usr/share/man/man5/remote.cfg.5
 usr/share/man/man5/sync.cfg.5
-usr/share/man/man5/tape-job.cfg.5
-usr/share/man/man5/tape.cfg.5
-usr/share/man/man5/user.cfg.5
 usr/share/man/man5/verification.cfg.5
-usr/share/proxmox-backup/templates/default/acme-err-body.txt.hbs
-usr/share/proxmox-backup/templates/default/acme-err-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/gc-err-body.txt.hbs
-usr/share/proxmox-backup/templates/default/gc-err-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/gc-ok-body.txt.hbs
-usr/share/proxmox-backup/templates/default/gc-ok-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/package-updates-body.txt.hbs
-usr/share/proxmox-backup/templates/default/package-updates-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/prune-err-body.txt.hbs
-usr/share/proxmox-backup/templates/default/prune-err-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/prune-ok-body.txt.hbs
-usr/share/proxmox-backup/templates/default/prune-ok-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/sync-err-body.txt.hbs
-usr/share/proxmox-backup/templates/default/sync-err-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/sync-ok-body.txt.hbs
-usr/share/proxmox-backup/templates/default/sync-ok-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/tape-backup-err-body.txt.hbs
-usr/share/proxmox-backup/templates/default/tape-backup-err-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/tape-backup-ok-body.txt.hbs
-usr/share/proxmox-backup/templates/default/tape-backup-ok-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/tape-load-body.txt.hbs
-usr/share/proxmox-backup/templates/default/tape-load-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/test-body.txt.hbs
-usr/share/proxmox-backup/templates/default/test-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/verify-err-body.txt.hbs
-usr/share/proxmox-backup/templates/default/verify-err-subject.txt.hbs
-usr/share/proxmox-backup/templates/default/verify-ok-body.txt.hbs
-usr/share/proxmox-backup/templates/default/verify-ok-subject.txt.hbs
-usr/share/zsh/vendor-completions/_pmt
-usr/share/zsh/vendor-completions/_pmtx
+usr/share/man/man5/media-pool.cfg.5
+usr/share/man/man5/tape.cfg.5
+usr/share/man/man5/tape-job.cfg.5
 usr/share/zsh/vendor-completions/_proxmox-backup-debug
 usr/share/zsh/vendor-completions/_proxmox-backup-manager
 usr/share/zsh/vendor-completions/_proxmox-tape
+usr/share/zsh/vendor-completions/_pmtx
+usr/share/zsh/vendor-completions/_pmt

debian/proxmox-backup-server.udev

@@ -16,6 +16,3 @@ SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="1", ENV{ID_SCSI_SER
   SYMLINK+="tape/by-id/scsi-$env{ID_SCSI_SERIAL}-sg"
 
 LABEL="persistent_storage_tape_end"
-
-# triggers the mounting of a removable device
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_UUID}!="", TAG+="systemd", ENV{SYSTEMD_WANTS}="removable-device-attach@$env{ID_FS_UUID}"

debian/rules

@@ -8,7 +8,7 @@ include /usr/share/rustc/architecture.mk
 
 export BUILD_MODE=release
 
-export CARGO=/usr/share/cargo/bin/cargo
+CARGO=/usr/share/cargo/bin/cargo
 
 export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE
@@ -17,22 +17,11 @@ export CARGO_HOME = $(CURDIR)/debian/cargo_home
 export DEB_CARGO_CRATE=proxmox-backup_$(DEB_VERSION_UPSTREAM)
 export DEB_CARGO_PACKAGE=proxmox-backup
 
-ifneq ("$(wildcard .repoid)","")
-	export REPOID=$(shell cat .repoid)
-endif
-
 %:
 	dh $@ --with=bash-completion
 
 override_dh_auto_configure:
-	@perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \
-	    die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml
 	$(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
-	# `cargo build` and `cargo install` have different config precedence, symlink
-	# the wrapper config into a place where `build` picks it up as well..
-	# https://doc.rust-lang.org/cargo/commands/cargo-install.html#configuration-discovery
-	mkdir -p .cargo
-	ln -s $(CARGO_HOME)/config.toml $(CURDIR)/.cargo/config.toml
 	dh_auto_configure
 
 override_dh_auto_build:
@@ -47,14 +36,11 @@ override_dh_auto_install:
 	dh_auto_install -- \
 	    PROXY_USER=backup \
 	    LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	mkdir -p debian/proxmox-backup-client-static/usr/bin
-	mv debian/tmp/usr/bin/proxmox-backup-client-static debian/proxmox-backup-client-static/usr/bin/proxmox-backup-client
-	mv debian/tmp/usr/bin/pxar-static debian/proxmox-backup-client-static/usr/bin/pxar
 
 override_dh_installsystemd:
 	dh_installsystemd -pproxmox-backup-server  proxmox-backup-daily-update.timer
 	# note: we start/try-reload-restart services manually in postinst
-	dh_installsystemd --no-start --no-restart-after-upgrade --no-stop-on-upgrade
+	dh_installsystemd --no-start --no-restart-after-upgrade
 
 override_dh_fixperms:
 	dh_fixperms --exclude sg-tape-cmd

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-rust-proxmox-backup source: field-too-long Build-Depends (* chars > 5000)
-rust-proxmox-backup source: absolute-symbolic-link-target-in-source /link/to/somewhere [tests/catar_data/test_symlink/symlink1]

docs/Makefile

@@ -1,65 +1,52 @@
 include ../defines.mk
 
 GENERATED_SYNOPSIS := 						\
-	config/acl/roles.rst					\
-	config/datastore/config.rst				\
-	config/domains/config.rst				\
+	proxmox-tape/synopsis.rst				\
+	proxmox-backup-client/synopsis.rst			\
+	proxmox-backup-client/catalog-shell-synopsis.rst 	\
+	proxmox-backup-manager/synopsis.rst			\
+	proxmox-backup-debug/synopsis.rst			\
+	proxmox-file-restore/synopsis.rst			\
+	pxar/synopsis.rst					\
+	pmtx/synopsis.rst					\
+	pmt/synopsis.rst					\
 	config/media-pool/config.rst				\
-	config/notifications-priv/config.rst			\
-	config/notifications/config.rst				\
+	config/tape/config.rst					\
+	config/tape-job/config.rst				\
+	config/user/config.rst					\
 	config/remote/config.rst				\
 	config/sync/config.rst					\
-	config/tape-job/config.rst				\
-	config/tape/config.rst					\
-	config/user/config.rst					\
 	config/verification/config.rst				\
-	config/prune/config.rst				\
-	pmt/synopsis.rst					\
-	pmtx/synopsis.rst					\
-	proxmox-backup-client/catalog-shell-synopsis.rst 	\
-	proxmox-backup-client/synopsis.rst			\
-	proxmox-backup-debug/synopsis.rst			\
-	proxmox-backup-manager/synopsis.rst			\
-	proxmox-file-restore/synopsis.rst			\
-	proxmox-tape/synopsis.rst				\
-	pxar/synopsis.rst					\
+	config/acl/roles.rst					\
+	config/datastore/config.rst
 
 MAN1_PAGES := 				\
-	pbs2to3.1			\
-	pmt.1				\
-	pmtx.1				\
-	proxmox-backup-client.1		\
-	proxmox-backup-debug.1		\
-	proxmox-backup-manager.1	\
-	proxmox-backup-proxy.1		\
-	proxmox-file-restore.1		\
-	proxmox-tape.1			\
 	pxar.1				\
+	pmtx.1				\
+	pmt.1				\
+	proxmox-tape.1			\
+	proxmox-backup-proxy.1		\
+	proxmox-backup-client.1		\
+	proxmox-backup-manager.1	\
+	proxmox-file-restore.1		\
+	proxmox-backup-debug.1
 
-# FIXME: prefix all man pages that are not directly relating to an existing executable with
-# `proxmox-backup.`, like the newer added proxmox-backup.node.cfg but add backwards compatible
-# symlinks, e.g. with a "5pbs" man page "suffix section".
 MAN5_PAGES :=				\
-	acl.cfg.5			\
-	datastore.cfg.5			\
-	domains.cfg.5			\
 	media-pool.cfg.5		\
-	proxmox-backup.node.cfg.5	\
-	notifications-priv.cfg.5	\
-	notifications.cfg.5		\
+	tape.cfg.5			\
+	tape-job.cfg.5			\
+	acl.cfg.5			\
+	user.cfg.5			\
 	remote.cfg.5			\
 	sync.cfg.5			\
-	tape-job.cfg.5			\
-	tape.cfg.5			\
-	user.cfg.5			\
 	verification.cfg.5		\
-	prune.cfg.5				\
+	datastore.cfg.5
 
 PRUNE_SIMULATOR_FILES := 					\
 	prune-simulator/index.html				\
-	prune-simulator/clear-trigger.png			\
 	prune-simulator/documentation.html			\
-	prune-simulator/prune-simulator.js			\
+	prune-simulator/clear-trigger.png			\
+	prune-simulator/prune-simulator.js
 
 PRUNE_SIMULATOR_JS_SOURCE :=						\
 	/usr/share/javascript/proxmox-widget-toolkit-dev/Toolkit.js	\
@@ -91,15 +78,15 @@ API_VIEWER_FILES :=							\
 	/usr/share/javascript/proxmox-widget-toolkit-dev/APIViewer.js	\
 
 # Sphinx documentation setup
-SPHINXOPTS    = -E
+SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 BUILDDIR      = output
 
 ifeq ($(BUILD_MODE), release)
-COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release
+COMPILEDIR := ../target/release
 SPHINXOPTS    += -t release
 else
-COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/debug
+COMPILEDIR := ../target/debug
 SPHINXOPTS    += -t devbuild
 endif
 
@@ -108,23 +95,117 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
 
 all: ${MAN1_PAGES} ${MAN5_PAGES}
 
-config/%/config.rst: ${COMPILEDIR}/docgen
-	${COMPILEDIR}/docgen $*.cfg >$@
+# Build manual pages using rst2man
+
+pxar/synopsis.rst: ${COMPILEDIR}/pxar
+	${COMPILEDIR}/pxar printdoc > pxar/synopsis.rst
+
+pxar.1: pxar/man1.rst  pxar/description.rst pxar/synopsis.rst
+	rst2man $< >$@
+
+
+pmtx/synopsis.rst: ${COMPILEDIR}/pmtx
+	${COMPILEDIR}/pmtx printdoc > pmtx/synopsis.rst
+
+pmtx.1: pmtx/man1.rst  pmtx/description.rst pmtx/synopsis.rst
+	rst2man $< >$@
+
+
+pmt/synopsis.rst: ${COMPILEDIR}/pmt
+	${COMPILEDIR}/pmt printdoc > pmt/synopsis.rst
+
+pmt.1: pmt/man1.rst  pmt/description.rst pmt/options.rst pmt/synopsis.rst
+	rst2man $< >$@
+
+config/datastore/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen datastore.cfg >$@
+
+datastore.cfg.5: config/datastore/man5.rst config/datastore/config.rst config/datastore/format.rst
+	rst2man $< >$@
+
+config/user/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen user.cfg >$@
+
+user.cfg.5: config/user/man5.rst config/user/config.rst config/user/format.rst
+	rst2man $< >$@
+
+config/remote/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen remote.cfg >$@
+
+remote.cfg.5: config/remote/man5.rst config/remote/config.rst config/remote/format.rst
+	rst2man $< >$@
+
+config/sync/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen sync.cfg >$@
+
+sync.cfg.5: config/sync/man5.rst config/sync/config.rst config/sync/format.rst
+	rst2man $< >$@
+
+config/verification/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen verification.cfg >$@
+
+verification.cfg.5: config/verification/man5.rst config/verification/config.rst config/verification/format.rst
+	rst2man $< >$@
 
 config/acl/roles.rst: ${COMPILEDIR}/docgen
 	${COMPILEDIR}/docgen "config::acl::Role" >$@
 
-%/synopsis.rst: ${COMPILEDIR}/%
-	$< printdoc > $@
+acl.cfg.5: config/acl/man5.rst config/acl/roles.rst config/acl/format.rst
+	rst2man $< >$@
+
+config/media-pool/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen media-pool.cfg >$@
+
+media-pool.cfg.5: config/media-pool/man5.rst config/media-pool/config.rst config/media-pool/format.rst
+	rst2man $< >$@
+
+config/tape/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen tape.cfg >$@
+
+tape.cfg.5: config/tape/man5.rst config/tape/config.rst config/tape/format.rst
+	rst2man $< >$@
+
+config/tape-job/config.rst: ${COMPILEDIR}/docgen
+	${COMPILEDIR}/docgen tape-job.cfg >$@
+
+tape-job.cfg.5: config/tape-job/man5.rst config/tape-job/config.rst config/tape-job/format.rst
+	rst2man $< >$@
+
+proxmox-tape/synopsis.rst: ${COMPILEDIR}/proxmox-tape
+	${COMPILEDIR}/proxmox-tape printdoc > proxmox-tape/synopsis.rst
+
+proxmox-tape.1: proxmox-tape/man1.rst proxmox-tape/description.rst proxmox-tape/synopsis.rst
+	rst2man $< >$@
+
+proxmox-backup-client/synopsis.rst: ${COMPILEDIR}/proxmox-backup-client
+	${COMPILEDIR}/proxmox-backup-client printdoc > proxmox-backup-client/synopsis.rst
 
 proxmox-backup-client/catalog-shell-synopsis.rst: ${COMPILEDIR}/dump-catalog-shell-cli
 	${COMPILEDIR}/dump-catalog-shell-cli > proxmox-backup-client/catalog-shell-synopsis.rst
 
-${MAN1_PAGES} ${MAN5_PAGES}: man-pages
+proxmox-backup-client.1: proxmox-backup-client/man1.rst  proxmox-backup-client/description.rst proxmox-backup-client/synopsis.rst  proxmox-backup-client/catalog-shell-synopsis.rst
+	rst2man $< >$@
 
-.PHONY: man-pages
-man-pages: ${GENERATED_SYNOPSIS}
-	${SPHINXBUILD} ${SPHINXOPTS} -b man ./ ${BUILDDIR}/man
+proxmox-backup-manager/synopsis.rst: ${COMPILEDIR}/proxmox-backup-manager
+	${COMPILEDIR}/proxmox-backup-manager printdoc > proxmox-backup-manager/synopsis.rst
+
+proxmox-backup-manager.1: proxmox-backup-manager/man1.rst  proxmox-backup-manager/description.rst proxmox-backup-manager/synopsis.rst
+	rst2man $< >$@
+
+proxmox-backup-proxy.1: proxmox-backup-proxy/man1.rst  proxmox-backup-proxy/description.rst
+	rst2man $< >$@
+
+proxmox-file-restore/synopsis.rst: ${COMPILEDIR}/proxmox-file-restore
+	${COMPILEDIR}/proxmox-file-restore printdoc > proxmox-file-restore/synopsis.rst
+
+proxmox-file-restore.1: proxmox-file-restore/man1.rst  proxmox-file-restore/description.rst proxmox-file-restore/synopsis.rst
+	rst2man $< >$@
+
+proxmox-backup-debug/synopsis.rst: ${COMPILEDIR}/proxmox-backup-debug
+	${COMPILEDIR}/proxmox-backup-debug printdoc > proxmox-backup-debug/synopsis.rst
+
+proxmox-backup-debug.1: proxmox-backup-debug/man1.rst  proxmox-backup-debug/description.rst proxmox-backup-debug/synopsis.rst
+	rst2man $< >$@
 
 .PHONY: onlinehelpinfo
 onlinehelpinfo:
@@ -148,9 +229,9 @@ lto-barcode/lto-barcode-generator.js: ${LTO_BARCODE_JS_SOURCE}
 	mv $@.tmp $@
 
 .PHONY: html
-html: ${GENERATED_SYNOPSIS} images/proxmox-logo.svg _static/custom.css conf.py ${PRUNE_SIMULATOR_FILES} ${LTO_BARCODE_FILES} ${API_VIEWER_SOURCES}
+html: ${GENERATED_SYNOPSIS} images/proxmox-logo.svg custom.css conf.py ${PRUNE_SIMULATOR_FILES} ${LTO_BARCODE_FILES} ${API_VIEWER_SOURCES}
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	install -m 0644 _static/custom.js _static/custom.css images/proxmox-logo.svg $(BUILDDIR)/html/_static/
+	install -m 0644 custom.js custom.css images/proxmox-logo.svg $(BUILDDIR)/html/_static/
 	install -dm 0755 $(BUILDDIR)/html/prune-simulator
 	install -m 0644 ${PRUNE_SIMULATOR_FILES} $(BUILDDIR)/html/prune-simulator
 	install -dm 0755 $(BUILDDIR)/html/lto-barcode
@@ -178,11 +259,12 @@ clean:
 	rm -r -f *~ *.1 ${BUILDDIR} ${GENERATED_SYNOPSIS} api-viewer/apidata.js
 	rm -f api-viewer/apidoc.js lto-barcode/lto-barcode-generator.js prune-simulator/prune-simulator.js
 
-install_manual_pages: man-pages
+
+install_manual_pages: ${MAN1_PAGES} ${MAN5_PAGES}
 	install -dm755 $(DESTDIR)$(MAN1DIR)
-	for i in ${MAN1_PAGES}; do install -m755 ${BUILDDIR}/man/$$i $(DESTDIR)$(MAN1DIR)/ ; done
+	for i in ${MAN1_PAGES}; do install -m755 $$i $(DESTDIR)$(MAN1DIR)/ ; done
 	install -dm755 $(DESTDIR)$(MAN5DIR)
-	for i in ${MAN5_PAGES}; do install -m755 ${BUILDDIR}/man/$$i $(DESTDIR)$(MAN5DIR)/ ; done
+	for i in ${MAN5_PAGES}; do install -m755 $$i $(DESTDIR)$(MAN5DIR)/ ; done
 
 install_html: html
 	install -dm755 $(DESTDIR)$(DOCDIR)

docs/_static/custom.css

@@ -1,245 +0,0 @@
-div.sphinxsidebar {
-    height: calc(100% - 20px);
-    overflow: auto;
-}
-
-h1.logo-name {
-    font-size: 24px;
-}
-
-div.body img {
-    width: 250px;
-}
-pre {
-    padding: 5px 10px;
-}
-
-div.topic {
-    background-color: #FAFAFA;
-}
-
-li a.current {
-    font-weight: bold;
-    border-bottom: 1px solid #000;
-}
-ul li.toctree-l1 {
-    margin-top: 0.5em;
-}
-ul li.toctree-l1 > a {
-    color: #000;
-}
-
-div.sphinxsidebar ul {
-    color: #444;
-}
-div.sphinxsidebar ul ul {
-    list-style: circle;
-}
-div.sphinxsidebar ul ul ul {
-    list-style: square;
-}
-
-div.sphinxsidebar ul a code {
-    font-weight: normal;
-}
-div.sphinxsidebar ul ul a {
-    border-bottom: 1px dotted #CCC;
-}
-
-div.sphinxsidebar form.search {
-    margin-bottom: 5px;
-}
-
-div.sphinxsidebar h3 {
-    width: 100%;
-}
-
-div.sphinxsidebar h1.logo-name {
-    display: none;
-}
-
-div.document, div.footer {
-    width: min(100%, 1320px);
-}
-
-@media screen and (max-width: 875px) {
-    div.sphinxsidebar p.logo {
-        display: initial;
-    }
-    div.sphinxsidebar h1.logo-name {
-        display: block;
-    }
-    div.sphinxsidebar span {
-        color: #EEE;
-    }
-    .sphinxsidebar ul li.toctree-l1 > a, div.sphinxsidebar a {
-        color: #FFF;
-    }
-    div.sphinxsidebar {
-        background-color: #555;
-    }
-    div.body {
-        min-width: 300px;
-    }
-    div.footer {
-        display: block;
-        margin: 15px auto 0px auto;
-    }
-}
-
-@media screen and (prefers-color-scheme: dark) {
-    :root {
-        color-scheme: dark;
-        --pdt-grey-850: hsl(0deg, 0%, 85%);
-        --pdt-grey-500: hsl(0deg, 0%, 50%);
-        --pdt-grey-250: hsl(0deg, 0%, 25%);
-        --pdt-grey-200: hsl(0deg, 0%, 20%);
-        --pdt-grey-150: hsl(0deg, 0%, 15%);
-        --pdt-grey-100: hsl(0deg, 0%, 10%);
-        --pdt-primary-800: hsl(205deg, 100%, 80%);
-        --pdt-primary-700: hsl(205deg, 100%, 70%);
-        --pdt-red-200: hsl(360deg, 30%, 20%);
-        --pdt-red-350: hsl(360deg, 30%, 35%);
-        --pdt-yellow-250: hsl(40deg, 100%, 25%);
-        --pdt-body-background: var(--pdt-grey-150);
-        --pdt-text: var(--pdt-grey-850);
-        --pdt-border: var(--pdt-grey-500);
-        --pdt-shadow: var(--pdt-grey-100);
-        --pdt-headline: var(--pdt-primary-800);
-        --pdt-link: var(--pdt-primary-700);
-        --pdt-admonition-background: var(--pdt-grey-250);
-        --pdt-topic-background: var(--pdt-grey-200);
-        --pdt-warn: var(--pdt-yellow-250);
-        --pdt-crit: var(--pdt-red-200);
-        --pdt-crit-border: var(--pdt-red-350);
-    }
-
-    /* body and links */
-    body, div.body {
-        color: var(--pdt-text);
-        background-color: var(--pdt-body-background);
-    }
-
-    a,
-    a:hover,
-    a.reference:hover {
-        color: var(--pdt-link);
-        border-bottom-color: var(--pdt-link);
-    }
-
-    a.reference {
-        border-color: var(--pdt-border);
-    }
-
-    a.headerlink:hover {
-        color: var(--pdt-text);
-        background-color: var(--pdt-admonition-background)
-    }
-
-    div.sphinxsidebar ul ul a {
-        color: var(--pdt-text);
-        border-bottom-color: var(--pdt-border);
-    }
-
-    div.sphinxsidebar a,
-    ul li.toctree-l1 > a,
-    div.sphinxsidebar ul,
-    div.sphinxsidebar a:hover {
-        color: var(--pdt-text);
-        border-bottom-color: var(--pdt-border);
-    }
-
-    /* highlighting backgrounds */
-    div.admonition,
-    div.highlight,
-    a:hover code,
-    pre {
-        background-color: var(--pdt-admonition-background);
-    }
-
-    div.caution, div.warning {
-        background-color: var(--pdt-crit);
-        border-color: var(--pdt-crit-border);
-    }
-
-    div.topic {
-        background-color: var(--pdt-topic-background);
-        border-color: var(--pdt-border);
-    }
-
-    div.tip,
-    div.note,
-    div.important {
-        border-color: var(--pdt-border);
-    }
-
-    img.logo {
-        filter: invert(100%) hue-rotate(180deg) brightness(90%);
-    }
-
-    table.docutils {
-        box-shadow: 2px 2px 4px var(--pdt-shadow);
-    }
-
-    hr.docutils {
-        border-color: var(--pdt-border);
-    }
-
-    /* style headlines, titles etc. */
-    h1,
-    h2,
-    h3,
-    h4,
-    h5,
-    h6,
-    span.caption-text,
-    div.sphinxsidebar h3,
-    div.sphinxsidebar h4 {
-        color: var(--pdt-headline);
-    }
-
-    /* code */
-    code {
-        color: var(--pdt-text);
-        background-color: var(--pdt-admonition-background);
-    }
-
-
-    .highlight span {
-        filter: brightness(1.5);
-    }
-
-    .highlight .gh,
-    .highlight .nt {
-        color: var(--pdt-headline);
-        filter: none;
-    }
-
-    .highlight .go {
-        color: var(--pdt-text);
-        filter: none;
-    }
-
-    span.highlighted {
-        background-color: var(--pdt-warn);
-    }
-
-    .related.bottom {
-        border-color: var(--pdt-border);
-    }
-
-    /* sidebar */
-    div.sphinxsidebar hr {
-        border-color: var(--pdt-border);
-    }
-
-    div.sphinxsidebar input {
-        border-color: var(--pdt-border);
-    }
-}
-
-@media screen and (max-width: 875px) and (prefers-color-scheme: dark) {
-    div.documentwrapper {
-        background: initial;
-    }
-}

docs/_templates/sidebar-header.html

@@ -1,7 +1,7 @@
  <p class="logo">
-    <a href="/docs/index.html">
-        <img class="logo" src="/docs/_static/proxmox-logo.svg" alt="Logo">
+    <a href="index.html">
+        <img class="logo" src="_static/proxmox-logo.svg" alt="Logo">
     </a>
 </p>
-<h1 class="logo logo-name"><a href="/docs/index.html">Proxmox Backup</a></h1>
+<h1 class="logo logo-name"><a href="index.html">Proxmox Backup</a></h1>
 <hr style="width:100%;">

docs/api-viewer/index.html

@@ -6,7 +6,6 @@
     <title>Proxmox Backup Server API Documentation</title>
 
     <link rel="stylesheet" type="text/css" href="extjs/theme-crisp/resources/theme-crisp-all.css">
-    <link rel="stylesheet" type="text/css" media="(prefers-color-scheme: dark)" href="/widgettoolkit/themes/theme-proxmox-dark.css" />
     <script type="text/javascript" src="extjs/ext-all.js"></script>
     <script type="text/javascript" src="apidoc.js"></script>
 </head>

docs/backup-client.rst

@@ -1,9 +1,7 @@
-.. _client_usage:
-
 Backup Client Usage
 ===================
 
-The command-line client for `Proxmox Backup`_ Server is called
+The command line client for Proxmox Backup Server is called
 :command:`proxmox-backup-client`.
 
 .. _client_repository:
@@ -25,12 +23,9 @@ port (for example, with NAT and port forwarding configurations).
 Note that if the server uses an IPv6 address, you have to write it with square
 brackets (for example, `[fe80::01]`).
 
-You can pass the repository with the ``--repository`` command-line option, or
+You can pass the repository with the ``--repository`` command line option, or
 by setting the ``PBS_REPOSITORY`` environment variable.
 
-The web interface provides copyable repository text in the datastore summary
-with the `Show Connection Information` button.
-
 Below are some examples of valid repositories and their corresponding real
 values:
 
@@ -40,30 +35,12 @@ Example                          User               Host:Port          Datastore
 mydatastore                      ``root@pam``       localhost:8007     mydatastore
 myhostname:mydatastore           ``root@pam``       myhostname:8007    mydatastore
 user@pbs@myhostname:mydatastore  ``user@pbs``       myhostname:8007    mydatastore
-user\@pbs!token@host:store       ``user@pbs!token`` host:8007          store
+user\@pbs!token@host:store       ``user@pbs!token`` myhostname:8007    mydatastore
 192.168.55.55:1234:mydatastore   ``root@pam``       192.168.55.55:1234 mydatastore
 [ff80::51]:mydatastore           ``root@pam``       [ff80::51]:8007    mydatastore
 [ff80::51]:1234:mydatastore      ``root@pam``       [ff80::51]:1234    mydatastore
 ================================ ================== ================== ===========
 
-.. _statically_linked_client:
-
-Statically Linked Backup Client
--------------------------------
-
-A statically linked version of the Proxmox Backup client is available for Linux
-based systems where the regular client is not available. Please note that it is
-recommended to use the regular client when possible, as the statically linked
-client is not a full replacement. For example, name resolution will not be
-performed via the mechanisms provided by libc, but uses a resolver written
-purely in the Rust programming language. Therefore, features and modules
-provided by Name Service Switch cannot be used.
-
-The statically linked client is available via the ``pbs-client`` repository as
-described in the :ref:`installation <install_pbc>` section.
-
-.. _environment-variables:
-
 Environment Variables
 ---------------------
 
@@ -92,60 +69,12 @@ Environment Variables
   When set, this value is used to verify the server certificate (only used if
   the system CA certificates cannot validate the certificate).
 
-``ALL_PROXY``
-  When set, the client uses the specified HTTP proxy for all connections to the
-  backup server. Currently only HTTP proxies are supported. Valid proxy
-  configurations have the following format:
-  `[http://][user:password@]<host>[:port]`. Default `port` is 1080, if not
-  otherwise specified.
-
-
-.. Note:: The recommended solution for shielding hosts is using tunnels such as
-   wireguard, instead of using an HTTP proxy.
-
 
 .. Note:: Passwords must be valid UTF-8 and may not contain newlines. For your
    convenience, Proxmox Backup Server only uses the first line as password, so
    you can add arbitrary comments after the first newline.
 
 
-System and Service Credentials
-------------------------------
-
-Some of the :ref:`environment variables <environment-variables>` above can be
-set using `system and service credentials <https://systemd.io/CREDENTIALS/>`_
-instead.
-
-============================ ==============================================
-Environment Variable         Credential Name Equivalent
-============================ ==============================================
-``PBS_REPOSITORY``           ``proxmox-backup-client.repository``
-``PBS_PASSWORD``             ``proxmox-backup-client.password``
-``PBS_ENCRYPTION_PASSWORD``  ``proxmox-backup-client.encryption-password``
-``PBS_FINGERPRINT``          ``proxmox-backup-client.fingerprint``
-============================ ==============================================
-
-For example, the repository password can be stored in an encrypted file as
-follows:
-
-.. code-block:: console
-
-  # systemd-ask-password -n | systemd-creds encrypt --name=proxmox-backup-client.password - my-api-token.cred
-
-The credential can then be reused inside of unit files or in a transient scope
-unit as follows:
-
-.. code-block:: console
-
-  # systemd-run --pipe --wait \
-      --property=LoadCredentialEncrypted=proxmox-backup-client.password:/full/path/to/my-api-token.cred \
-      --property=SetCredential=proxmox-backup-client.repository:'my_default_repository' \
-      proxmox-backup-client ...
-
-Additionally, system credentials (e.g. passed down from the hypervisor to a
-virtual machine via SMBIOS type 11) can be loaded on a service via
-`LoadCredential=` as described in the manual page ``systemd.exec(5)``.
-
 Output Format
 -------------
 
@@ -213,7 +142,7 @@ you want to back up two disks mounted at ``/mnt/disk1`` and ``/mnt/disk2``:
 
 This creates a backup of both disks.
 
-If you want to use a namespace for the backup target, you can add the `--ns`
+If you want to use a namespace for the backup target you can add the `--ns`
 parameter:
 
 .. code-block:: console
@@ -226,7 +155,6 @@ the client. The format is:
 
     <archive-name>.<type>:<source-path>
 
-The ``archive-name`` must contain alphanumerics, hyphens and underscores only.
 Common types are ``.pxar`` for file archives and ``.img`` for block
 device images. To create a backup of a block device, run the following command:
 
@@ -315,7 +243,7 @@ Restoring this backup will result in:
 
 .. code-block:: console
 
-    # ls -aR restored
+    ls -aR restored
     restored/:
     .  ..  .pxarexclude  subfolder0  subfolder1
 
@@ -325,69 +253,6 @@ Restoring this backup will result in:
     restored/subfolder1:
     .  ..  file2
 
-The same syntax can also be used directly in the cli with the ``--exclude``
-parameter. For example:
-
-.. code-block:: console
-
-    # proxmox-backup-client backup archive-name.pxar:./linux --exclude /usr
-
-Multiple paths can be excluded like this:
-
-.. code-block:: console
-
-    # proxmox-backup-client backup archive-name.pxar:./linux --exclude=/usr --exclude=/rust
-
-.. _client_change_detection_mode:
-
-Change Detection Mode
-~~~~~~~~~~~~~~~~~~~~~
-
-File-based backups containing a lot of data can take a long time, as the default
-behavior for the Proxmox backup client is to read all data and encode it into a
-pxar archive.
-The encoded stream is split into variable sized chunks. For each chunk, a digest
-is calculated and used to decide whether the chunk needs to be uploaded or can
-be indexed without upload, as it is already available on the server (and
-therefore deduplicated). If the backed up files are largely unchanged,
-re-reading and then detecting the corresponding chunks don't need to be uploaded
-after all is time consuming and undesired.
-
-The backup client's ``change-detection-mode`` can be switched from default to
-``metadata`` based detection to reduce limitations as described above,
-instructing the client to avoid re-reading files with unchanged metadata
-whenever possible.
-When using this mode, instead of the regular pxar archive, the backup snapshot
-is stored into two separate files: the ``mpxar`` containing the archive's
-metadata and the ``ppxar`` containing a concatenation of the file contents. This
-splitting allows for efficient metadata lookups. When creating the backup
-archives, the current file metadata is compared to the one looked up in the
-previous ``mpxar`` archive. The operational details are explained more in depth
-in the :ref:`technical documentation <change-detection-mode-metadata>`.
-
-Using the ``change-detection-mode`` set to ``data`` allows to create the same
-split archive as when using the ``metadata`` mode, but without using a previous
-reference and therefore reencoding all file payloads. For details of this mode
-please see the :ref:`technical documentation <change-detection-mode-data>`.
-
-.. _client_change_detection_mode_table:
-
-============ ===================================================================
-Mode         Description
-============ ===================================================================
-``legacy``   (current default): Encode all files into a self contained pxar
-             archive.
-``data``     Encode all files into a split data and metadata pxar archive.
-``metadata`` Encode changed files, reuse unchanged from previous snapshot,
-             creating a split archive.
-============ ===================================================================
-
-The following shows an example for the client invocation with the `metadata`
-mode:
-
-.. code-block:: console
-
-    # proxmox-backup-client backup archive-name.pxar:./linux --change-detection-mode=metadata
 
 .. _client_encryption:
 
@@ -515,7 +380,7 @@ To set up a master key:
 It is recommended that you keep your master key safe, but easily accessible, in
 order for quick disaster recovery. For this reason, the best place to store it
 is in your password manager, where it is immediately recoverable. As a backup to
-this, you should also save the key to a USB flash drive and store that in a secure
+this, you should also save the key to a USB drive and store that in a secure
 place. This way, it is detached from any system, but is still easy to recover
 from, in case of emergency. Finally, in preparation for the worst case scenario,
 you should also consider keeping a paper copy of your master key locked away in
@@ -528,8 +393,6 @@ version of your master key. The following command sends the output of the
   proxmox-backup-client key paperkey --output-format text > qrkey.txt
 
 
-.. _client_restoring_data:
-
 Restoring Data
 --------------
 
@@ -598,7 +461,7 @@ to use the interactive recovery shell.
   bin        boot       dev        etc        home       lib        lib32
   ...
 
-The interactive recovery shell is a minimal command-line interface that
+The interactive recovery shell is a minimal command line interface that
 utilizes the metadata stored in the catalog to quickly list, navigate and
 search for files in a file archive.
 To restore files, you can select them individually or match them with a glob
@@ -755,28 +618,28 @@ following retention options are available:
   Keep the last ``<N>`` backup snapshots.
 
 ``--keep-hourly <N>``
-  Keep backups for the last ``<N>`` hours. If there is more than one backup for
-  a single hour, only the latest is kept. Hours without backups do not count.
+  Keep backups for the last ``<N>`` hours. If there is more than one
+  backup for a single hour, only the latest is kept.
 
 ``--keep-daily <N>``
-  Keep backups for the last ``<N>`` days. If there is more than one backup for a
-  single day, only the latest is kept. Days without backups do not count.
+  Keep backups for the last ``<N>`` days. If there is more than one
+  backup for a single day, only the latest is kept.
 
 ``--keep-weekly <N>``
-  Keep backups for the last ``<N>`` weeks. If there is more than one backup for
-  a single week, only the latest is kept. Weeks without backup do not count.
+  Keep backups for the last ``<N>`` weeks. If there is more than one
+  backup for a single week, only the latest is kept.
 
   .. note:: Weeks start on Monday and end on Sunday. The software
      uses the `ISO week date`_ system and handles weeks at
      the end of the year correctly.
 
 ``--keep-monthly <N>``
-  Keep backups for the last ``<N>`` months. If there is more than one backup for
-  a single month, only the latest is kept. Months without backups do not count.
+  Keep backups for the last ``<N>`` months. If there is more than one
+  backup for a single month, only the latest is kept.
 
 ``--keep-yearly <N>``
-  Keep backups for the last ``<N>`` years. If there is more than one backup for
-  a single year, only the latest is kept. Years without backups do not count.
+  Keep backups for the last ``<N>`` years. If there is more than one
+  backup for a single year, only the latest is kept.
 
 The retention options are processed in the order given above. Each option
 only covers backups within its time period. The next option does not take care
@@ -828,11 +691,11 @@ deletion of this snapshot until the flag is removed again with:
 
   # proxmox-backup-client snapshot protected update <snapshot> false
 
-When a group with a protected snapshot is deleted, only the non-protected
-ones are removed, and the rest will remain.
+When a group is with a protected snapshot is deleted, only the non-protected
+ones are removed and the group will remain.
 
 .. note:: This flag will not be synced when using pull or sync jobs. If you
-   want to protect a synced snapshot, you have to do this again manually on
+   want to protect a synced snapshot, you have to manually to this again on
    the target backup server.
 
 .. _client_garbage-collection:
@@ -841,25 +704,29 @@ Garbage Collection
 ------------------
 
 The ``prune`` command removes only the backup index files, not the data
-from the datastore. Deletion of unused backup data from the datastore is done by
-:ref:`garbage collection<_maintenance_gc>`. It is therefore recommended to
-schedule garbage collection tasks on a regular basis. The working principle of
-garbage collection is described in more details in the related :ref:`background
-section <gc_background>`.
+from the datastore. This task is left to the garbage collection
+command. It is recommended to carry out garbage collection on a regular basis.
 
-To start garbage collection from the client side, run the following command:
-
-.. code-block:: console
-
-  # proxmox-backup-client garbage-collect
+The garbage collection works in two phases. In the first phase, all
+data blocks that are still in use are marked. In the second phase,
+unused data blocks are removed.
 
 .. note:: This command needs to read all existing backup index files
   and touches the complete chunk-store. This can take a long time
   depending on the number of chunks and the speed of the underlying
   disks.
 
-The progress of the garbage collection will be displayed as shown in the example
-below:
+.. note:: The garbage collection will only remove chunks that haven't been used
+   for at least one day (exactly 24h 5m). This grace period is necessary because
+   chunks in use are marked by touching the chunk which updates the ``atime``
+   (access time) property. Filesystems are mounted with the ``relatime`` option
+   by default. This results in a better performance by only updating the
+   ``atime`` property if the last access has been at least 24 hours ago. The
+   downside is that touching a chunk within these 24 hours will not always
+   update its ``atime`` property.
+
+   Chunks in the grace period will be logged at the end of the garbage
+   collection task as *Pending removals*.
 
 .. code-block:: console
 
@@ -879,7 +746,7 @@ below:
   Average chunk size: 2486565
   TASK OK
 
-Garbage collection can also be scheduled using ``proxmox-backup-manager`` or
+Garbage collection can also be scheduled using ``promxox-backup-manager`` or
 from the Proxmox Backup Server's web interface.
 
 Benchmarking

docs/backup-protocol.rst

@@ -1,7 +1,7 @@
 Backup Protocol
 ===============
 
-`Proxmox Backup`_ Server uses a REST-based API. While the management
+Proxmox Backup Server uses a REST-based API. While the management
 interface uses normal HTTP, the actual backup and restore interface uses
 HTTP/2 for improved performance. Both HTTP and HTTP/2 are well known
 standards, so the following section assumes that you are familiar with

docs/calendarevents.rst

@@ -7,7 +7,7 @@ Introduction and Format
 -----------------------
 
 Certain tasks, for example pruning and garbage collection, need to be
-performed on a regular basis. `Proxmox Backup`_ Server uses a format inspired
+performed on a regular basis. Proxmox Backup Server uses a format inspired
 by the systemd Time and Date Specification (see `systemd.time manpage`_)
 called `calendar events` for its schedules.
 
@@ -89,11 +89,11 @@ Not all features of systemd calendar events are implemented:
 Notes on Scheduling
 -------------------
 
-In Proxmox Backup, scheduling for most tasks is done in the
+In `Proxmox Backup`_, scheduling for most tasks is done in the
 `proxmox-backup-proxy`. This daemon checks all job schedules
 every minute, to see if any are due. This means that even though
 `calendar events` can contain seconds, it will only be checked
 once per minute.
 
 Also, all schedules will be checked against the timezone set
-in the Proxmox Backup Server.
+in the `Proxmox Backup`_ server.

docs/certificate-management.rst

@@ -9,7 +9,7 @@ own (self-signed) certificate. This certificate is used for encrypted
 communication with the host’s ``proxmox-backup-proxy`` service, for any API
 call between a user or backup-client and the web-interface.
 
-Certificate verification when sending backups to a Proxmox Backup Server
+Certificate verification when sending backups to a `Proxmox Backup`_ server
 is either done based on pinning the certificate fingerprints in the storage/remote
 configuration, or by using certificates, signed by a trusted certificate authority.
 
@@ -18,7 +18,7 @@ configuration, or by using certificates, signed by a trusted certificate authori
 Certificates for the API and SMTP
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Proxmox Backup stores its certificate and key in:
+`Proxmox Backup`_ stores it certificate and key in:
 
 -  ``/etc/proxmox-backup/proxy.pem``
 
@@ -33,22 +33,23 @@ You have the following options for the certificate:
    commercial Certificate Authority (CA)).
 
 3. Use an ACME provider like Let’s Encrypt to get a trusted certificate
-   with automatic renewal; this is also integrated in the Proxmox Backup
+   with automatic renewal; this is also integrated in the `Proxmox Backup`_
    API and web interface.
 
-Certificates are managed through the Proxmox Backup
-web-interface/API or using the ``proxmox-backup-manager`` CLI tool.
+Certificates are managed through the `Proxmox Backup`_
+web-interface/API or using the the ``proxmox-backup-manager`` CLI tool.
 
 .. _sysadmin_certs_upload_custom:
 
 Upload Custom Certificate
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you already have a certificate which you want to use for a `Proxmox Backup`_
-host, you can simply upload that certificate over the web interface.
+If you already have a certificate which you want to use for a Proxmox
+Mail Gateway host, you can simply upload that certificate over the web
+interface.
+
 
 .. image:: images/screenshots/pbs-gui-certs-upload-custom.png
-  :target: _images/pbs-gui-certs-upload-custom.png
   :align: right
   :alt: Upload a custom certificate
 
@@ -59,9 +60,9 @@ Note that any certificate key files must not be password protected.
 Trusted certificates via Let’s Encrypt (ACME)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Proxmox Backup includes an implementation of the **A**\ utomatic
+`Proxmox Backup`_ includes an implementation of the **A**\ utomatic
 **C**\ ertificate **M**\ anagement **E**\ nvironment (**ACME**)
-protocol, allowing Proxmox Backup admins to use an ACME provider
+protocol, allowing `Proxmox Backup`_ admins to use an ACME provider
 like Let’s Encrypt for easy setup of TLS certificates, which are
 accepted and trusted by modern operating systems and web browsers out of
 the box.
@@ -79,7 +80,6 @@ ACME Account
 ^^^^^^^^^^^^
 
 .. image:: images/screenshots/pbs-gui-acme-create-account.png
-  :target: _images/pbs-gui-acme-create-account.png
   :align: right
   :alt: Create ACME Account
 
@@ -89,8 +89,8 @@ contact point for renewal-due or similar notifications from the ACME
 endpoint.
 
 You can register or deactivate ACME accounts over the web interface
-``Certificates -> ACME Accounts`` or using the ``proxmox-backup-manager``
-command-line tool.
+``Certificates -> ACME Accounts`` or using the ``proxmox-backup-manager`` command
+line tool.
 
 ::
 
@@ -110,7 +110,7 @@ ACME Plugins
 ^^^^^^^^^^^^
 
 The ACME plugin’s role is to provide automatic verification that you,
-and thus the Proxmox Backup Server under your operation, are the
+and thus the `Proxmox Backup`_ server under your operation, are the
 real owner of a domain. This is the basic building block of automatic
 certificate management.
 
@@ -123,11 +123,10 @@ used in such cases. This challenge is fulfilled by creating a certain
 DNS record in the domain’s zone.
 
 .. image:: images/screenshots/pbs-gui-acme-create-challenge-plugin.png
-  :target: _images/pbs-gui-acme-create-challenge-plugin.png
   :align: right
   :alt: Create ACME Account
 
-Proxmox Backup supports both of those challenge types out of the
+`Proxmox Backup`_ supports both of those challenge types out of the
 box, you can configure plugins either over the web interface under
 ``Certificates -> ACME Challenges``, or using the
 ``proxmox-backup-manager acme plugin add`` command.
@@ -143,7 +142,6 @@ You can add new or manage existing domain entries under
 ``Certificates``, or using the ``proxmox-backup-manager`` command.
 
 .. image:: images/screenshots/pbs-gui-acme-add-domain.png
-  :target: _images/pbs-gui-acme-add-domain.png
   :align: right
   :alt: Add a Domain for ACME verification
 
@@ -178,7 +176,7 @@ with Let’s Encrypts ACME.
 -  There **must** be no other listener on port 80.
 
 -  The requested (sub)domain needs to resolve to a public IP of the
-   Proxmox Backup host.
+   `Proxmox Backup`_ host.
 
 .. _sysadmin_certs_acme_dns_challenge:
 
@@ -195,7 +193,7 @@ allows provisioning of ``TXT`` records via an API.
 Configuring ACME DNS APIs for validation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Proxmox Backup re-uses the DNS plugins developed for the
+`Proxmox Backup`_ re-uses the DNS plugins developed for the
 ``acme.sh``  [1]_ project. Please refer to its documentation for details
 on configuration of specific APIs.
 
@@ -213,7 +211,7 @@ and entering the credential data to access your account over their API.
    your provider. Configuration values do not need to be quoted with
    single or double quotes; for some plugins that is even an error.
 
-As there are many DNS providers and API endpoints, Proxmox Backup
+As there are many DNS providers and API endpoints, `Proxmox Backup`_
 automatically generates the form for the credentials, but not all
 providers are annotated yet. For those you will see a bigger text area,
 into which you simply need to copy all the credential’s
@@ -229,7 +227,7 @@ domain/DNS server, in case your primary/real DNS does not support
 provisioning via an API. Manually set up a permanent ``CNAME`` record
 for ``_acme-challenge.domain1.example`` pointing to
 ``_acme-challenge.domain2.example``, and set the ``alias`` property in
-the Proxmox Backup node configuration file ``/etc/proxmox-backup/node.cfg``
+the `Proxmox Backup`_ node configuration file ``/etc/proxmox-backup/node.cfg``
 to ``domain2.example`` to allow the DNS server of ``domain2.example`` to
 validate all challenges for ``domain1.example``.
 
@@ -276,13 +274,13 @@ expired or if it will expire in the next 30 days.
 
 .. _manually_change_certificate_over_command_line:
 
-Manually Change Certificate over the Command Line
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Manually Change Certificate over Command-Line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you want to get rid of certificate verification warnings, you have to
 generate a valid certificate for your server.
 
-Log in to your Proxmox Backup via ssh or use the console:
+Log in to your `Proxmox Backup`_ via ssh or use the console:
 
 ::
 
@@ -307,9 +305,9 @@ Follow the instructions on the screen, for example:
 After you have finished the certificate request, you have to send the
 file ``req.pem`` to your Certification Authority (CA). The CA will issue
 the certificate (BASE64 encoded), based on your request – save this file
-as ``cert.pem`` to your Proxmox Backup.
+as ``cert.pem`` to your `Proxmox Backup`_.
 
-To activate the new certificate, do the following on your Proxmox Backup
+To activate the new certificate, do the following on your `Proxmox Backup`_
 
 ::
 
@@ -326,9 +324,9 @@ Test your new certificate, using your browser.
 
 .. note::
 
-   To transfer files to and from your Proxmox Backup, you can use
+   To transfer files to and from your `Proxmox Backup`_, you can use
    secure copy: If your desktop runs Linux, you can use the ``scp``
-   command-line tool. If your desktop PC runs windows, please use an scp
+   command line tool. If your desktop PC runs windows, please use an scp
    client like WinSCP (see https://winscp.net/).
 
 .. [1]

docs/command-line-tools.rst

@@ -1,4 +1,4 @@
-Command-line Tools
+Command Line Tools
 ------------------
 
 ``proxmox-backup-client``

docs/command-syntax.rst

@@ -1,10 +1,6 @@
 Command Syntax
 ==============
 
-.. NOTE:: Logging verbosity for the command-line tools can be controlled with the
-    ``PBS_LOG`` (for ``pxar``: ``PXAR_LOG``) environment variable. Possible values are `off`,
-    `error`, `warn`, `info`, `debug` and `trace` with `info` being the default.
-
 ``proxmox-backup-client``
 -------------------------
 

docs/conf.py

@@ -69,12 +69,15 @@ source_suffix = '.rst'
 # The master toctree document.
 master_doc = 'index'
 
+epilog_file = open('epilog.rst', 'r')
+rst_epilog = epilog_file.read()
+
 # General information about the project.
 project = 'Proxmox Backup'
-copyright = '2019-2025, Proxmox Server Solutions GmbH'
+copyright = '2019-2021, Proxmox Server Solutions GmbH'
 author = 'Proxmox Support Team'
 
-# The version info for the project you're documenting acts as a replacement for
+# The version info for the project you're documenting, acts as a replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
@@ -85,48 +88,12 @@ version = vstr(os.getenv('DEB_VERSION_UPSTREAM'))
 # The full version, including alpha/beta/rc tags.
 release = vstr(os.getenv('DEB_VERSION'))
 
-epilog_file = open('epilog.rst', 'r')
-rst_epilog = epilog_file.read()
-rst_epilog += f"\n..  |VERSION| replace:: {version}"
-rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
-
-man_pages = [
-    # CLI
-    ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1),
-    ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1),
-    ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1),
-    ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1),
-    ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1),
-    ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1),
-    ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1),
-    ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1),
-    ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1),
-    ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1),
-    ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1),
-    # configs
-    ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
-    ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
-    ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5),
-    ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5),
-    ('config/node/man5', 'proxmox-backup.node.cfg', 'Proxmox Backup Server - Node Configuration', [author], 5),
-    ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5),
-    ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5),
-    ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5),
-    ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5),
-    ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5),
-    ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5),
-    ('config/prune/man5', 'prune.cfg', 'Prune Job Configuration', [author], 5),
-    ('config/notifications/man5', 'notifications.cfg', 'Notification target/matcher configuration', [author], 5),
-    ('config/notifications-priv/man5', 'notifications-priv.cfg', 'Notification target secrets', [author], 5),
-]
-
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'en'
+language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -135,14 +102,14 @@ language = 'en'
 # Else, today_fmt is used as the format for a strftime call.
 today_fmt = '%A, %d %B %Y'
 
-suppress_warnings = [ 'toc.excluded' ]
-
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
 exclude_patterns = [
     '_build', 'Thumbs.db', '.DS_Store',
+    '*/man1.rst',
     'certificate-management.rst',
+    'config/*/man5.rst',
     'epilog.rst',
     'pbs-copyright.rst',
     'local-zfs.rst',
@@ -203,12 +170,11 @@ html_theme_options = {
     'show_powered_by': False,
 
     'extra_nav_links': {
-        'Proxmox Homepage': 'https://www.proxmox.com',
+        'Proxmox Homepage': 'https://proxmox.com',
         'PDF': 'proxmox-backup.pdf',
         'API Viewer' : 'api-viewer/index.html',
         'Prune Simulator' : 'prune-simulator/index.html',
         'LTO Barcode Generator' : 'lto-barcode/index.html',
-        'Proxmox Backup Server Wiki' : 'https://pbs.proxmox.com'
     },
 
     'sidebar_width': '320px',
@@ -269,9 +235,6 @@ html_static_path = ['_static']
 html_js_files = [
     'custom.js',
 ]
-html_css_files = [
-    'custom.css',
-]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -423,8 +386,6 @@ latex_logo = "images/proxmox-logo.png"
 #
 # latex_domain_indices = True
 
-latex_table_style = ['booktabs', 'colorrows']
-
 
 # -- Options for Epub output ----------------------------------------------
 

docs/config/acl/man5.rst

@@ -1,13 +1,21 @@
-:orphan:
-
-=======
+==========================
 acl.cfg
-=======
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Access Control Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
 
-The file /etc/proxmox-backup/acl.cfg is a configuration file for Proxmox
+The file /etc/proxmox-backup/user.cfg is a configuration file for Proxmox
 Backup Server. It contains the access control configuration for the API.
 
 File Format
@@ -15,6 +23,7 @@ File Format
 
 .. include:: format.rst
 
+
 Roles
 =====
 
@@ -22,4 +31,5 @@ The following roles exist:
 
 .. include:: roles.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/datastore/man5.rst

@@ -1,8 +1,16 @@
-:orphan:
-
-=============
+==========================
 datastore.cfg
-=============
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Datastore Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
@@ -15,9 +23,11 @@ File Format
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/domains/format.rst

@@ -1,27 +0,0 @@
-This file contains the list authentication realms.
-
-Each user configuration section starts with the header ``<realm-type>: <name>``,
-followed by the realm's configuration options.
-
-For LDAP realms, the LDAP bind password is stored in ``ldap_passwords.json``.
-
-::
-
-  openid: master
-	client-id pbs
-	comment
-	issuer-url http://192.168.0.10:8080/realms/master
-	username-claim username
-
-  ldap: ldap-server
-	base-dn OU=People,DC=ldap-server,DC=example,DC=com
-	mode ldaps
-	server1 192.168.0.10
-	sync-attributes email=mail
-	sync-defaults-options enable-new=0,remove-vanished=acl;entry
-	user-attr uid
-	user-classes inetorgperson,posixaccount,person,user
-
-
-You can use the ``proxmox-backup-manager openid``, ``proxmox-backup-manager
-ldap`` and ``proxmox-backup-manager ad`` commands to manipulate this file.

docs/config/domains/man5.rst

@@ -1,23 +0,0 @@
-:orphan:
-
-===========
-domains.cfg
-===========
-
-Description
-===========
-
-The file /etc/proxmox-backup/domains.cfg is a configuration file for Proxmox
-Backup Server. It contains the realm configuration.
-
-File Format
-===========
-
-.. include:: format.rst
-
-Options
-=======
-
-.. include:: config.rst
-
-.. include:: ../../pbs-copyright.rst

docs/config/media-pool/man5.rst

@@ -1,9 +1,17 @@
-:orphan:
-
 ==========================
 media-pool.cfg
 ==========================
 
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Media Pool Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
+
 Description
 ===========
 
@@ -11,14 +19,17 @@ The file /etc/proxmox-backup/media-pool.cfg is a configuration file
 for Proxmox Backup Server. It contains the medila pool configuration
 for tape backups.
 
+
 File Format
 ===========
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/node/format.rst

@@ -1,49 +0,0 @@
-The file contains these options:
-
-:acme: The ACME account to use on this node.
-
-:acmedomain0: ACME domain.
-
-:acmedomain1: ACME domain.
-
-:acmedomain2: ACME domain.
-
-:acmedomain3: ACME domain.
-
-:acmedomain4: ACME domain.
-
-:http-proxy: Set proxy for apt and subscription checks.
-
-:email-from: Fallback email from which notifications will be sent.
-
-:ciphers-tls-1.3: List of TLS ciphers for TLS 1.3 that will be used by the proxy. Colon-separated and in descending priority (https://docs.openssl.org/master/man1/openssl-ciphers/). (Proxy has to be restarted for changes to take effect.)
-
-:ciphers-tls-1.2: List of TLS ciphers for TLS <= 1.2 that will be used by the proxy. Colon-separated and in descending priority (https://docs.openssl.org/master/man1/openssl-ciphers/). (Proxy has to be restarted for changes to take effect.)
-
-:default-lang: Default language used in the GUI.
-
-:description: Node description.
-
-:task-log-max-days: Maximum days to keep task logs.
-
-For example:
-
-::
-
-  acme: local
-  acmedomain0: first.domain.com
-  acmedomain1: second.domain.com
-  acmedomain2: third.domain.com
-  acmedomain3: fourth.domain.com
-  acmedomain4: fifth.domain.com
-  http-proxy: internal.proxy.com
-  email-from: proxmox@mail.com
-  ciphers-tls-1.3: TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_CHACHA20_POLY1305_SHA256
-  ciphers-tls-1.2: RSA_WITH_AES_128_CCM:DHE_RSA_WITH_AES_128_CCM
-  default-lang: en
-  description: Primary PBS instance
-  task-log-max-days: 30
-
-
-You can use the ``proxmox-backup-manager node`` command to manipulate
-this file.

docs/config/node/man5.rst

@@ -1,18 +0,0 @@
-:orphan:
-
-========
-node.cfg
-========
-
-Description
-===========
-
-The file /etc/proxmox-backup/node.cfg is a configuration file for Proxmox
-Backup Server. It contains the general configuration regarding this node.
-
-Options
-=======
-
-.. include:: format.rst
-
-.. include:: ../../pbs-copyright.rst

docs/config/notifications-priv/format.rst

@@ -1 +0,0 @@
-This file contains protected credentials for notification targets.

docs/config/notifications-priv/man5.rst

@@ -1,24 +0,0 @@
-:orphan:
-
-======================
-notifications-priv.cfg
-======================
-
-Description
-===========
-
-The file /etc/proxmox-backup/notifications-priv.cfg is a configuration file
-for Proxmox Backup Server. It contains the configuration for the
-notification system configuration.
-
-File Format
-===========
-
-.. include:: format.rst
-
-Options
-=======
-
-.. include:: config.rst
-
-.. include:: ../../pbs-copyright.rst

docs/config/notifications/format.rst

@@ -1,2 +0,0 @@
-This file contains configuration for notification targets and notification
-matchers.

docs/config/notifications/man5.rst

@@ -1,24 +0,0 @@
-:orphan:
-
-==================
-notifications.cfg
-==================
-
-Description
-===========
-
-The file /etc/proxmox-backup/notifications.cfg is a configuration file
-for Proxmox Backup Server. It contains the configuration for the
-notification system configuration.
-
-File Format
-===========
-
-.. include:: format.rst
-
-Options
-=======
-
-.. include:: config.rst
-
-.. include:: ../../pbs-copyright.rst

docs/config/prune/format.rst

@@ -1,14 +0,0 @@
-Each entry starts with the header ``prune: <name>``, followed by the job
-configuration options.
-
-::
-
-  prune: prune-store2
-	schedule mon..fri 10:30
-	store my-datastore
-
-  prune: ...
-
-
-You can use the ``proxmox-backup-manager prune-job`` command to manipulate this
-file.

docs/config/prune/man5.rst

@@ -1,23 +0,0 @@
-:orphan:
-
-=========
-prune.cfg
-=========
-
-Description
-===========
-
-The file /etc/proxmox-backup/prune.cfg is a configuration file for Proxmox
-Backup Server. It contains the prune job configuration.
-
-File Format
-===========
-
-.. include:: format.rst
-
-Options
-=======
-
-.. include:: config.rst
-
-.. include:: ../../pbs-copyright.rst

docs/config/remote/man5.rst

@@ -1,8 +1,16 @@
-:orphan:
-
-==========
+==========================
 remote.cfg
-==========
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Remote Server Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
@@ -11,14 +19,17 @@ The file /etc/proxmox-backup/remote.cfg is a configuration file for
 Proxmox Backup Server. It contains information about remote servers,
 usable for synchronization jobs.
 
+
 File Format
 ===========
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/sync/man5.rst

@@ -1,23 +1,35 @@
-:orphan:
-
-========
+==========================
 sync.cfg
-========
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Synchronization Job Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
 
-The file /etc/proxmox-backup/sync.cfg is a configuration file for Proxmox
-Backup Server. It contains the synchronization job configuration.
+The file /etc/proxmox-backup/sync.cfg is a configuration file for
+Proxmox Backup Server. It contains the synchronization job
+configuration.
+
 
 File Format
 ===========
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/tape-job/man5.rst

@@ -1,8 +1,16 @@
-:orphan:
-
-============
+==========================
 tape-job.cfg
-============
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Tape Job Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
@@ -10,11 +18,13 @@ Description
 The file ``/etc/proxmox-backup/tape-job.cfg`` is a configuration file for
 Proxmox Backup Server. It contains the tape job configuration.
 
+
 File Format
 ===========
 
 .. include:: format.rst
 
+
 Options
 =======
 

docs/config/tape/man5.rst

@@ -1,8 +1,16 @@
-:orphan:
-
-========
+==========================
 tape.cfg
-========
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Tape Drive and Changer Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
@@ -15,9 +23,11 @@ File Format
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/user/man5.rst

@@ -1,8 +1,16 @@
-:orphan:
-
-========
+==========================
 user.cfg
-========
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+User Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
@@ -15,9 +23,11 @@ File Format
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/config/verification/man5.rst

@@ -1,23 +1,35 @@
-:orphan:
-
-================
+==========================
 verification.cfg
-================
+==========================
+
+.. include:: ../../epilog.rst
+
+-------------------------------------------------------------
+Verification Job Configuration
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 5
 
 Description
 ===========
 
-The file /etc/proxmox-backup/verification.cfg is a configuration file for
-Proxmox Backup Server. It contains the verification job configuration.
+The file /etc/proxmox-backup/sync.cfg is a configuration file for
+Proxmox Backup Server. It contains the verification job
+configuration.
+
 
 File Format
 ===========
 
 .. include:: format.rst
 
+
 Options
 =======
 
 .. include:: config.rst
 
+
 .. include:: ../../pbs-copyright.rst

docs/configuration-files.rst

@@ -1,7 +1,7 @@
 Configuration Files
 ===================
 
-All `Proxmox Backup`_ Server configuration files reside in the directory
+All Proxmox Backup Server configuration files reside in the directory
 ``/etc/proxmox-backup/``.
 
 
@@ -36,22 +36,6 @@ Options
 
 .. include:: config/datastore/config.rst
 
-.. _domains.cfg:
-
-``domains.cfg``
-~~~~~~~~~~~~~~~
-
-File Format
-^^^^^^^^^^^
-
-.. include:: config/domains/format.rst
-
-
-Options
-^^^^^^^
-
-.. include:: config/domains/config.rst
-
 
 ``media-pool.cfg``
 ~~~~~~~~~~~~~~~~~~
@@ -67,61 +51,6 @@ Options
 
 .. include:: config/media-pool/config.rst
 
-``node.cfg``
-~~~~~~~~~~~~~~~~~~
-
-Options
-^^^^^^^
-
-.. include:: config/node/format.rst
-
-.. _notifications.cfg:
-
-``notifications.cfg``
-~~~~~~~~~~~~~~~~~~~~~
-
-File Format
-^^^^^^^^^^^
-
-.. include:: config/notifications/format.rst
-
-
-Options
-^^^^^^^
-
-.. include:: config/notifications/config.rst
-
-.. _notifications_priv.cfg:
-
-``notifications-priv.cfg``
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-File Format
-^^^^^^^^^^^
-
-.. include:: config/notifications-priv/format.rst
-
-
-Options
-^^^^^^^
-
-.. include:: config/notifications-priv/config.rst
-
-
-``prune.cfg``
-~~~~~~~~~~~~~
-
-File Format
-^^^^^^^^^^^
-
-.. include:: config/prune/format.rst
-
-
-Options
-^^^^^^^
-
-.. include:: config/prune/config.rst
-
 
 ``tape.cfg``
 ~~~~~~~~~~~~

docs/custom.css

@@ -0,0 +1,88 @@
+div.sphinxsidebar {
+    height: calc(100% - 20px);
+    overflow: auto;
+}
+
+h1.logo-name {
+    font-size: 24px;
+}
+
+div.body img {
+    width: 250px;
+}
+pre {
+    padding: 5px 10px;
+}
+
+div.topic {
+    background-color: #FAFAFA;
+}
+
+li a.current {
+    font-weight: bold;
+    border-bottom: 1px solid #000;
+}
+ul li.toctree-l1 {
+    margin-top: 0.5em;
+}
+ul li.toctree-l1 > a {
+    color: #000;
+}
+
+div.sphinxsidebar ul {
+    color: #444;
+}
+div.sphinxsidebar ul ul {
+    list-style: circle;
+}
+div.sphinxsidebar ul ul ul {
+    list-style: square;
+}
+
+div.sphinxsidebar ul a code {
+    font-weight: normal;
+}
+div.sphinxsidebar ul ul a {
+    border-bottom: 1px dotted #CCC;
+}
+
+div.sphinxsidebar form.search {
+    margin-bottom: 5px;
+}
+
+div.sphinxsidebar h3 {
+    width: 100%;
+}
+
+div.sphinxsidebar h1.logo-name {
+    display: none;
+}
+
+div.document, div.footer {
+    width: min(100%, 1320px);
+}
+
+@media screen and (max-width: 875px) {
+    div.sphinxsidebar p.logo {
+        display: initial;
+    }
+    div.sphinxsidebar h1.logo-name {
+        display: block;
+    }
+    div.sphinxsidebar span {
+        color: #EEE;
+    }
+    .sphinxsidebar ul li.toctree-l1 > a, div.sphinxsidebar a {
+        color: #FFF;
+    }
+    div.sphinxsidebar {
+        background-color: #555;
+    }
+    div.body {
+        min-width: 300px;
+    }
+    div.footer {
+        display: block;
+        margin: 15px auto 0px auto;
+    }
+}

docs/epilog.rst

@@ -3,6 +3,8 @@
    We use this file to define external links and common replacement
    patterns.
 
+.. |VERSION| replace:: 1.0
+.. |AUTHOR| replace:: Proxmox Support Team <support@proxmox.com>
 .. |WEBSITE| replace:: https://www.proxmox.com
 .. |DOWNLOADS| replace:: https://www.proxmox.com/downloads
 
@@ -10,15 +12,15 @@
 .. _Zstandard: https://en.wikipedia.org/wiki/Zstandard
 .. _Proxmox: https://www.proxmox.com
 .. _Proxmox Community Forum: https://forum.proxmox.com
-.. _Proxmox Virtual Environment: https://www.proxmox.com/proxmox-virtual-environment
-.. _Proxmox Backup: https://www.proxmox.com/proxmox-backup-server
-.. _Proxmox Backup Server Development List: https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
+.. _Proxmox Virtual Environment: https://www.proxmox.com/proxmox-ve
+.. _Proxmox Backup: https://pbs.proxmox.com/wiki/index.php/Main_Page
+.. _PBS Development List: https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
 .. _reStructuredText: https://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html
 .. _Rust: https://www.rust-lang.org/
 .. _SHA-256: https://en.wikipedia.org/wiki/SHA-2
 .. _Sphinx: https://www.sphinx-doc.org
 .. _Virtual machine: https://en.wikipedia.org/wiki/Virtual_machine
-.. _APT: https://en.wikipedia.org/wiki/Advanced_Packaging_Tool
+.. _APT: http://en.wikipedia.org/wiki/Advanced_Packaging_Tool
 .. _QEMU: https://www.qemu.org/
 .. _LXC: https://linuxcontainers.org/lxc/introduction/
 
@@ -27,7 +29,7 @@
 .. _GCM: https://en.wikipedia.org/wiki/Galois/Counter_Mode
 .. _AGPL3: https://www.gnu.org/licenses/agpl-3.0.en.html
 .. _Debian: https://www.debian.org/index.html
-.. _Debian Administrator's Handbook: https://debian-handbook.info/
+.. _Debian Administrator's Handbook: https://debian-handbook.info/download/stable/debian-handbook.pdf
 
 .. _LVM: https://en.wikipedia.org/wiki/Logical_Volume_Manager_(Linux)
 .. _ZFS: https://en.wikipedia.org/wiki/ZFS
@@ -37,4 +39,5 @@
 .. _UTC: https://en.wikipedia.org/wiki/Coordinated_Universal_Time
 .. _ISO Week date: https://en.wikipedia.org/wiki/ISO_week_date
 
-.. _systemd.time manpage: https://manpages.debian.org/stable/systemd/systemd.time.7.en.html
+.. _systemd.time manpage: https://manpages.debian.org/buster/systemd/systemd.time.7.en.html
+

docs/external-metric-server.rst

@@ -1,55 +0,0 @@
-External Metric Server
-----------------------
-
-Proxmox Backup Server periodically sends various metrics about your host's memory,
-network and disk activity to configured external metric servers.
-
-Currently supported are:
-
- * InfluxDB (HTTP) (see https://docs.influxdata.com/influxdb/v2/ )
- * InfluxDB (UDP) (see https://docs.influxdata.com/influxdb/v1/ )
-
-The external metric server definitions are saved in
-'/etc/proxmox-backup/metricserver.cfg', and can be edited through the web
-interface.
-
-.. note::
-
-   Using HTTP is recommended as UDP support has been dropped in InfluxDB v2.
-
-InfluxDB (HTTP) plugin configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The plugin can be configured to use the HTTP(s) API of InfluxDB 2.x.
-InfluxDB 1.8.x does contain a forwards compatible API endpoint for this v2 API.
-
-Since InfluxDB's v2 API is only available with authentication, you have
-to generate a token that can write into the correct bucket and set it.
-
-In the v2 compatible API of 1.8.x, you can use 'user:password' as token
-(if required), and can omit the 'organization' since that has no meaning in InfluxDB 1.x.
-
-You can also set the maximum batch size (default 25000000 bytes) with the
-'max-body-size' setting (this corresponds to the InfluxDB setting with the
-same name).
-
-InfluxDB (UDP) plugin configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Proxmox Backup Server can also send data via UDP. This requires the InfluxDB
-server to be configured correctly. The MTU can also be configured here if
-necessary.
-
-Here is an example configuration for InfluxDB (on your InfluxDB server):
-
-.. code-block:: console
-
-   [[udp]]
-      enabled = true
-      bind-address = "0.0.0.0:8089"
-      database = "proxmox"
-      batch-size = 1000
-      batch-timeout = "1s"
-
-With this configuration, the InfluxDB server listens on all IP addresses on
-port 8089, and writes the data in the *proxmox* database.

docs/faq-release-support-table.csv

@@ -1,4 +0,0 @@
-Proxmox Backup Version    , Debian Version           , First Release , Debian EOL , Proxmox Backup EOL
-Proxmox Backup 3          , Debian 12 (Bookworm)     , 2023-06       , TBA        , TBA
-Proxmox Backup 2          , Debian 11 (Bullseye)     , 2021-07       , 2024-07    , 2024-07
-Proxmox Backup 1          , Debian 10 (Buster)       , 2020-11       , 2022-08    , 2022-07

docs/faq.rst

@@ -4,7 +4,7 @@ FAQ
 What distribution is Proxmox Backup Server (PBS) based on?
 ----------------------------------------------------------
 
-`Proxmox Backup`_ Server is based on `Debian GNU/Linux <https://www.debian.org/>`_.
+Proxmox Backup Server is based on `Debian GNU/Linux <https://www.debian.org/>`_.
 
 
 Which platforms are supported as a backup source (client)?
@@ -21,54 +21,17 @@ Proxmox Backup Server only supports 64-bit CPUs (AMD or Intel). There are no
 future plans to support 32-bit processors.
 
 
-.. _faq-support-table:
-
 How long will my Proxmox Backup Server version be supported?
 ------------------------------------------------------------
 
-.. csv-table::
-   :file: faq-release-support-table.csv
-   :widths: 30 26 13 13 18
-   :header-rows: 1
++-----------------------+----------------------+---------------+------------+--------------------+
+|Proxmox Backup Version | Debian Version       | First Release | Debian EOL | Proxmox Backup EOL |
++=======================+======================+===============+============+====================+
+|Proxmox Backup 2.x     | Debian 11 (Bullseye) | 2021-07       | tba        | tba                |
++-----------------------+----------------------+---------------+------------+--------------------+
+|Proxmox Backup 1.x     | Debian 10 (Buster)   | 2020-11       | ~Q2/2022   | Q2-Q3/2022         |
++-----------------------+----------------------+---------------+------------+--------------------+
 
-How can I upgrade Proxmox Backup Server to the next point release?
-------------------------------------------------------------------
-
-Minor version upgrades, for example upgrading from Proxmox Backup Server in
-version 3.1 to 3.2 or 3.3, can be done just like any normal update.
-But, you should still check the `release notes
-<https://pbs.proxmox.com/wiki/index.php/Roadmap>`_ for any relevant notable,
-or breaking change.
-
-For the update itself use either the Web UI *Node -> Updates* panel or
-through the CLI with:
-
-.. code-block:: console
-
-  apt update
-  apt full-upgrade
-
-.. note:: Always ensure you correctly setup the
-   :ref:`package repositories <sysadmin_package_repositories>` and only
-   continue with the actual upgrade if `apt update` did not hit any error.
-
-.. _faq-upgrade-major:
-
-How can I upgrade Proxmox Backup Server to the next major release?
-------------------------------------------------------------------
-
-Major version upgrades, for example going from Proxmox Backup Server 2.4 to
-3.1, are also supported.
-They must be carefully planned and tested and should **never** be started
-without having an off-site copy of the important backups, e.g., via remote sync
-or tape, ready.
-
-Although the specific upgrade steps depend on your respective setup, we provide
-general instructions and advice of how a upgrade should be performed:
-
-* `Upgrade from Proxmox Backup Server 2 to 3 <https://pbs.proxmox.com/wiki/index.php/Upgrade_from_2_to_3>`_
-
-* `Upgrade from Proxmox Backup Server 1 to 2 <https://pbs.proxmox.com/wiki/index.php/Upgrade_from_1.1_to_2.x>`_
 
 Can I copy or synchronize my datastore to another location?
 -----------------------------------------------------------
@@ -103,15 +66,9 @@ be able to read the data.
   :ref:`backup client encryption section <client_encryption>`.
 
 
-Is the backup incremental/deduplicated/full?
---------------------------------------------
+Is the backup incremental/deduplicated?
+---------------------------------------
 
 With Proxmox Backup Server, backups are sent incrementally to the server, and
 data is then deduplicated on the server. This minimizes both the storage
-consumed and the impact on the network. Each backup still references all
-data and such is a full backup. For details see the
-:ref:`Technical Overview <tech_design_overview>`
-
-.. todo:: document our stability guarantees, i.e., the separate one for, in
-   increasing duration of how long we'll support it: api compat, backup
-   protocol compat and backup format compat
+consumed and the impact on the network.

docs/file-formats.rst

@@ -8,53 +8,7 @@ Proxmox File Archive Format (``.pxar``)
 
 .. graphviz:: pxar-format-overview.dot
 
-.. _pxar-meta-format:
 
-Proxmox File Archive Format - Meta (``.mpxar``)
------------------------------------------------
-
-Pxar metadata archive with same structure as a regular pxar archive, with the
-exception of regular file payloads not being contained within the archive
-itself, but rather being stored as payload references to the corresponding pxar
-payload (``.ppxar``) file.
-
-Can be used to lookup all the archive entries and metadata without the size
-overhead introduced by the file payloads.
-
-.. graphviz:: meta-format-overview.dot
-
-.. _ppxar-format:
-
-Proxmox File Archive Format - Payload (``.ppxar``)
---------------------------------------------------
-
-Pxar payload file storing regular file payloads to be referenced and accessed by
-the corresponding pxar metadata (``.mpxar``) archive. Contains a concatenation
-of regular file payloads, each prefixed by a `PAYLOAD` header. Further, the
-actual referenced payload entries might be separated by padding (full/partial
-payloads not referenced), introduced when reusing chunks of a previous backup
-run, when chunk boundaries did not aligned to payload entry offsets.
-
-All headers are stored as little-endian.
-
-.. list-table::
-   :widths: auto
-
-   * - ``PAYLOAD_START_MARKER``
-     - header of ``[u8; 16]`` consisting of type hash and size;
-       marks start
-   * - ``PAYLOAD``
-     - header of ``[u8; 16]`` cosisting of type hash and size;
-       referenced by metadata archive
-   * - Payload
-     - raw regular file payload
-   * - Padding
-     - partial/full unreferenced payloads, caused by unaligned chunk boundary
-   * - ...
-     - further concatenation of payload header, payload and padding
-   * - ``PAYLOAD_TAIL_MARKER``
-     - header of ``[u8; 16]`` consisting of type hash and size;
-       marks end
 .. _data-blob-format:
 
 Data Blob Format (``.blob``)

docs/gui.rst

@@ -1,7 +1,7 @@
 Graphical User Interface
 ========================
 
-`Proxmox Backup`_ Server offers an integrated, web-based interface to manage the
+Proxmox Backup Server offers an integrated, web-based interface to manage the
 server. This means that you can carry out all administration tasks through your
 web browser, and that you don't have to worry about installing extra management
 tools. The web interface also provides a built-in console, so if you prefer the
@@ -29,9 +29,8 @@ Login
 -----
 
 .. image:: images/screenshots/pbs-gui-login-window.png
-  :target: _images/pbs-gui-login-window.png
   :align: right
-  :alt: Proxmox Backup Server login window
+  :alt: PBS login window
 
 When you connect to the web interface, you will first see the login window.
 Proxmox Backup Server supports various languages and authentication back ends
@@ -40,24 +39,13 @@ Proxmox Backup Server supports various languages and authentication back ends
 .. note:: For convenience, you can save the username on the client side, by
   selecting the "Save User name" checkbox at the bottom of the window.
 
-.. _consent_banner:
-
-Consent Banner
-^^^^^^^^^^^^^^
-
-A custom consent banner that has to be accepted before login can be configured
-in **Configuration -> Other -> General -> Consent Text**. If there is no
-content, the consent banner will not be displayed. The text will be stored as a
-base64 string in the ``/etc/proxmox-backup/node.cfg`` config file.
-
 
 GUI Overview
 ------------
 
 .. image:: images/screenshots/pbs-gui-dashboard.png
-  :target: _images/pbs-gui-dashboard.png
   :align: right
-  :alt: Proxmox Backup Server GUI Dashboard
+  :alt: PBS GUI Dashboard
 
 The Proxmox Backup Server web interface consists of 3 main sections:
 
@@ -104,7 +92,6 @@ Administration
 ^^^^^^^^^^^^^^
 
 .. image:: images/screenshots/pbs-gui-administration-serverstatus.png
-  :target: _images/pbs-gui-administration-serverstatus.png
   :align: right
   :alt: Administration: Server Status overview
 
@@ -120,7 +107,6 @@ tasks and information. These are:
 * **Tasks**: Task history with multiple filter options
 
 .. image:: images/screenshots/pbs-gui-disks.png
-  :target: _images/pbs-gui-disks.png
   :align: right
   :alt: Administration: Disks
 
@@ -135,7 +121,6 @@ Tape Backup
 ^^^^^^^^^^^
 
 .. image:: images/screenshots/pbs-gui-tape-changer-overview.png
-  :target: _images/pbs-gui-tape-changer-overview.png
   :align: right
   :alt: Tape Backup: Tape changer overview
 
@@ -158,7 +143,6 @@ Datastore
 ^^^^^^^^^
 
 .. image:: images/screenshots/pbs-gui-datastore-summary.png
-  :target: _images/pbs-gui-datastore-summary.png
   :align: right
   :alt: Datastore Configuration
 

docs/index.rst

@@ -2,7 +2,7 @@
 
 Welcome to the Proxmox Backup documentation!
 ============================================
-| |pbs-copyright|
+| Copyright (C) 2019-2021 Proxmox Server Solutions GmbH
 | Version |version| -- |today|
 
 Permission is granted to copy, distribute and/or modify this document under the
@@ -34,7 +34,6 @@ in the section entitled "GNU Free Documentation License".
    maintenance.rst
    sysadmin.rst
    network-management.rst
-   notifications.rst
    technical-overview.rst
    faq.rst
 

docs/installation-media.rst

@@ -1,157 +0,0 @@
-.. _installation_medium:
-
-Installation Medium
--------------------
-
-Proxmox Backup Server can be installed via
-:ref:`different methods <install_pbs>`. The recommended method is the
-usage of an installation medium, to simply boot the interactive
-installer.
-
-Prepare Installation Medium
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Download the installer ISO image from |DOWNLOADS|.
-
-The Proxmox Backup Server installation medium is a hybrid ISO image.
-It works in two ways:
-
-- An ISO image file ready to burn to a DVD.
-
-- A raw sector (IMG) image file ready to copy to a USB flash drive (USB stick).
-
-Using a USB flash drive to install Proxmox Backup Server is the
-recommended way since it is the faster and more frequently available
-option these days.
-
-Prepare a USB Flash Drive as Installation Medium
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The flash drive needs to have at least 2 GB of storage space.
-
-.. note::
-
-   Do not use *UNetbootin*. It does not work with the Proxmox Backup
-   Server installation image.
-
-.. important::
-
-   Existing data on the USB flash drive will be overwritten.
-   Therefore, make sure that it does not contain any still needed data
-   and unmount it afterwards again before proceeding.
-
-Instructions for GNU/Linux
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-On Unix-like operating systems use the ``dd`` command to copy the ISO
-image to the USB flash drive. First find the correct device name of the
-USB flash drive (see below). Then run the ``dd`` command. Depending on
-your environment, you will need to have root privileges to execute
-``dd``.
-
-.. code-block:: console
-
-   # dd bs=1M conv=fdatasync if=./proxmox-backup-server_*.iso of=/dev/XYZ
-
-.. note::
-
-   Be sure to replace ``/dev/XYZ`` with the correct device name and adapt
-   the input filename (*if*) path.
-
-.. caution::
-
-   Be very careful, and do not overwrite the wrong disk!
-
-Find the Correct USB Device Name
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are two ways to find out the name of the USB flash drive. The
-first one is to compare the last lines of the ``dmesg`` command output
-before and after plugging in the flash drive. The second way is to
-compare the output of the ``lsblk`` command. Open a terminal and run:
-
-.. code-block:: console
-
-   # lsblk
-
-Then plug in your USB flash drive and run the command again:
-
-.. code-block:: console
-
-   # lsblk
-
-A new device will appear. This is the one you want to use. To be on the
-extra safe side check if the reported size matches your USB flash drive.
-
-Instructions for macOS
-~~~~~~~~~~~~~~~~~~~~~~
-
-Open the terminal (query *Terminal* in Spotlight).
-
-Convert the ``.iso`` file to ``.dmg`` format using the convert option of
-``hdiutil``, for example:
-
-.. code-block:: console
-
-   # hdiutil convert proxmox-backup-server_*.iso -format UDRW -o proxmox-backup-server_*.dmg
-
-.. note::
-
-   macOS tends to automatically add ``.dmg`` to the output file name.
-
-To get the current list of devices run the command:
-
-.. code-block:: console
-
-   # diskutil list
-
-Now insert the USB flash drive and run this command again to determine
-which device node has been assigned to it. (e.g., ``/dev/diskX``).
-
-.. code-block:: console
-
-   # diskutil list
-   # diskutil unmountDisk /dev/diskX
-
-.. note::
-
-   replace *X* with the disk number from the last command.
-
-.. code-block:: console
-
-   # sudo dd if=proxmox-backup-server_*.dmg bs=1M of=/dev/rdiskX
-
-.. note::
-
-   *rdiskX*, instead of *diskX*, in the last command is intended. It
-   will increase the write speed.
-
-Instructions for Windows
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Using Etcher
-^^^^^^^^^^^^
-
-Etcher works out of the box. Download Etcher from https://etcher.io. It
-will guide you through the process of selecting the ISO and your USB
-flash drive.
-
-Using Rufus
-^^^^^^^^^^^
-
-Rufus is a more lightweight alternative, but you need to use the **DD
-mode** to make it work. Download Rufus from https://rufus.ie/. Either
-install it or use the portable version. Select the destination drive
-and the downloaded Proxmox ISO file.
-
-.. important::
-
-   Once you click *Start*, you have to click *No* on the dialog asking to
-   download a different version of Grub. In the next dialog select **DD mode**.
-
-Use the Installation Medium
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Insert the created USB flash drive (or DVD) into your server. Continue
-by reading the :ref:`installer <using_the_installer>` chapter, which
-also describes possible boot issues.

docs/installation.rst

@@ -7,9 +7,7 @@ Debian_ from the provided package repository.
 
 .. include:: system-requirements.rst
 
-.. include:: installation-media.rst
-
-.. _install_pbs:
+.. include:: package-repositories.rst
 
 Server Installation
 -------------------
@@ -18,50 +16,40 @@ The backup server stores the actual backed up data and provides a web based GUI
 for various management tasks such as disk management.
 
 .. note:: You always need a backup server. It is not possible to use
-   Proxmox Backup without the server part.
+   `Proxmox Backup`_ without the server part.
 
-Using our provided disk image (ISO file) is the recommended
-installation method, as it includes a convenient installer, a complete
-Debian system as well as all necessary packages for the Proxmox Backup
-Server.
+The disk image (ISO file) provided by Proxmox includes a complete Debian system
+as well as all necessary packages for the `Proxmox Backup`_ Server.
 
-Once you have created an :ref:`installation_medium`, the booted
-:ref:`installer <using_the_installer>` will guide you through the
-setup process. It will help you to partition your disks, apply basic
-settings such as the language, time zone and network configuration,
-and finally install all required packages within minutes.
+The installer will guide you through the setup process and allow
+you to partition the local disk(s), apply basic system configuration
+(for example timezone, language, network), and install all required packages.
+The provided ISO will get you started in just a few minutes, and is the
+recommended method for new and existing users.
 
-As an alternative to the interactive installer, advanced users may
-wish to install Proxmox Backup Server
-:ref:`unattended <install_pbs_unattended>`.
+Alternatively, `Proxmox Backup`_ Server can be installed on top of an
+existing Debian system.
 
-With sufficient Debian knowledge, you can also install Proxmox Backup
-Server :ref:`on top of Debian <install_pbs_on_debian>` yourself.
+Install `Proxmox Backup`_ Server using the Installer
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-While not recommended, Proxmox Backup Server could also be installed
-:ref:`on Proxmox VE <install_pbs_on_pve>`.
+Download the ISO from |DOWNLOADS|.
+It includes the following:
 
-.. include:: using-the-installer.rst
+* The `Proxmox Backup`_ Server installer, which partitions the local
+  disk(s) with ext4, xfs or ZFS, and installs the operating system
 
-.. _install_pbs_unattended:
+* Complete operating system (Debian Linux, 64-bit)
 
-Install `Proxmox Backup`_ Server Unattended
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-It is possible to install Proxmox Backup Server automatically in an
-unattended manner. This enables you to fully automate the setup process on
-bare-metal. Once the installation is complete and the host has booted up,
-automation tools like Ansible can be used to further configure the installation.
+* Proxmox Linux kernel with ZFS support
 
-The necessary options for the installer must be provided in an answer file.
-This file allows the use of filter rules to determine which disks and network
-cards should be used.
+* Complete tool-set to administer backups and all necessary resources
 
-To use the automated installation, it is first necessary to prepare an
-installation ISO.  For more details and information on the unattended
-installation see `our wiki
-<https://pve.proxmox.com/wiki/Automated_Installation>`_.
+* Web based management interface
+
+.. note:: During the installation process, the complete server
+   is used by default and all existing data is removed.
 
-.. _install_pbs_on_debian:
 
 Install `Proxmox Backup`_ Server on Debian
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -72,8 +60,8 @@ standard Debian installation. After configuring the
 
 .. code-block:: console
 
-  # apt update
-  # apt install proxmox-backup-server
+  # apt-get update
+  # apt-get install proxmox-backup-server
 
 The above commands keep the current (Debian) kernel and install a minimal
 set of required packages.
@@ -83,13 +71,13 @@ does, please use the following:
 
 .. code-block:: console
 
-  # apt update
-  # apt install proxmox-backup
+  # apt-get update
+  # apt-get install proxmox-backup
 
 This will install all required packages, the Proxmox kernel with ZFS_
 support, and a set of common and useful packages.
 
-.. caution:: Installing Proxmox Backup on top of an existing Debian_
+.. caution:: Installing `Proxmox Backup`_ on top of an existing Debian_
   installation looks easy, but it assumes that the base system and local
   storage have been set up correctly. In general this is not trivial, especially
   when LVM_ or ZFS_ is used. The network configuration is completely up to you
@@ -99,8 +87,6 @@ support, and a set of common and useful packages.
    your web browser, using HTTPS on port 8007. For example at
    ``https://<ip-or-dns-name>:8007``
 
-.. _install_pbs_on_pve:
-
 Install Proxmox Backup Server on `Proxmox VE`_
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -109,8 +95,8 @@ After configuring the
 
 .. code-block:: console
 
-  # apt update
-  # apt install proxmox-backup-server
+  # apt-get update
+  # apt-get install proxmox-backup-server
 
 .. caution:: Installing the backup server directly on the hypervisor
    is not recommended. It is safer to use a separate physical
@@ -121,12 +107,10 @@ After configuring the
    your web browser, using HTTPS on port 8007. For example at
    ``https://<ip-or-dns-name>:8007``
 
-.. _install_pbc:
-
 Client Installation
 -------------------
 
-Install Proxmox Backup Client on Debian
+Install `Proxmox Backup`_ Client on Debian
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Proxmox ships as a set of Debian packages to be installed on top of a standard
@@ -135,29 +119,10 @@ you need to run:
 
 .. code-block:: console
 
-  # apt update
-  # apt install proxmox-backup-client
+  # apt-get update
+  # apt-get install proxmox-backup-client
 
-Install Statically Linked Proxmox Backup Client
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Proxmox provides a statically linked build of the Proxmox backup client that
-should run on any modern x86-64 Linux system.
+.. note:: The client-only repository should be usable by most recent Debian and
+   Ubuntu derivatives.
 
-It is currently available as a Debian package. After configuring the
-:ref:`package_repositories_client_only_apt`, you need to run:
-
-.. code-block:: console
-
-  # apt update
-  # apt install proxmox-backup-client-static
-
-This package conflicts with the `proxmox-backup-client` package, as both
-provide the client as an executable in the `/usr/bin/proxmox-backup-client`
-path.
-
-You can copy this executable to other, e.g. non-Debian based Linux systems.
-
-For details on using the Proxmox Backup Client, see :ref:`client_usage`.
-
-.. include:: package-repositories.rst

docs/introduction.rst

@@ -4,8 +4,8 @@ Introduction
 What is Proxmox Backup Server?
 ------------------------------
 
-`Proxmox Backup`_ Server is an enterprise-class, client-server backup solution
-that is capable of backing up :term:`virtual machine<Virtual machine>`\ s,
+Proxmox Backup Server is an enterprise-class, client-server backup solution that
+is capable of backing up :term:`virtual machine<Virtual machine>`\ s,
 :term:`container<Container>`\ s, and physical hosts. It is specially optimized
 for the `Proxmox Virtual Environment`_ platform and allows you to back up your
 data securely, even between remote sites, providing easy management through a
@@ -30,7 +30,7 @@ backup data and provides an API to create and manage datastores. With the
 API, it's also possible to manage disks and other server-side resources.
 
 The backup client uses this API to access the backed up data. You can use the
-``proxmox-backup-client`` command-line tool to create and restore file backups.
+``proxmox-backup-client`` command line tool to create and restore file backups.
 For QEMU_ and LXC_ within `Proxmox Virtual Environment`_, we deliver an
 integrated client.
 
@@ -44,8 +44,8 @@ parts of the backup, without the need to scan the whole backup.
 Main Features
 -------------
 
-:Support for Proxmox VE: The `Proxmox Virtual Environment`_ is fully supported,
-   and you can easily backup :term:`virtual machine<Virtual machine>`\ s and
+:Support for Proxmox VE: The `Proxmox Virtual Environment`_ is fully
+   supported, and you can easily backup :term:`virtual machine<Virtual machine>`\ s and
    :term:`container<Container>`\ s.
 
 :Performance: The whole software stack is written in :term:`Rust`,
@@ -58,10 +58,10 @@ Main Features
 :Incremental backups: Changes between backups are typically low. Reading and
    sending only the delta reduces the storage and network impact of backups.
 
-:Data integrity: The built-in `SHA-256`_ checksum algorithm ensures accuracy
-   and consistency in your backups.
+:Data Integrity: The built-in `SHA-256`_ checksum algorithm ensures accuracy and
+   consistency in your backups.
 
-:Remote sync: It is possible to efficiently synchronize data to remote
+:Remote Sync: It is possible to efficiently synchronize data to remote
    sites. Only deltas containing new data are transferred.
 
 :Compression: The ultra-fast Zstandard_ compression is able to compress
@@ -76,21 +76,16 @@ Main Features
    provides extensive support for backing up to tape and managing tape
    libraries.
 
-:Ransomware protection: :ref:`Protect your critical data from ransomware attacks
-   <ransomware_protection>` with Proxmox Backup Server's fine-grained access
-   control, data integrity verification, and off-site backup through remote sync
-   and tape backup.
-
 :Web interface: Manage the Proxmox Backup Server with the integrated, web-based
    user interface.
 
-:Open source: No secrets. Proxmox Backup Server is free and open-source
+:Open Source: No secrets. Proxmox Backup Server is free and open-source
    software. The source code is licensed under AGPL, v3.
 
-:No limits: Proxmox Backup Server has no artificial limits for backup storage or
+:No Limits: Proxmox Backup Server has no artificial limits for backup storage or
    backup-clients.
 
-:Enterprise support: Proxmox Server Solutions GmbH offers enterprise support in
+:Enterprise Support: Proxmox Server Solutions GmbH offers enterprise support in
    the form of `Proxmox Backup Server Subscription Plans
    <https://www.proxmox.com/en/proxmox-backup-server/pricing>`_. Users at every
    subscription level get access to the Proxmox Backup :ref:`Enterprise
@@ -162,7 +157,7 @@ Users with a `Proxmox Backup Server Basic, Standard or Premium Subscription Plan
 <https://www.proxmox.com/en/proxmox-backup-server/pricing>`_ have access to the
 `Proxmox Customer Portal <https://my.proxmox.com>`_. The customer portal
 provides support with guaranteed response times from the Proxmox developers.
-For more information or for volume discounts, please contact sales@proxmox.com.
+For more information or for volume discounts, please contact office@proxmox.com.
 
 Community Support Forum
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -178,7 +173,7 @@ Mailing Lists
 Proxmox Backup Server is fully open-source and contributions are welcome! Here
 is the primary communication channel for developers:
 
-:Mailing list for developers: `Proxmox Backup Server Development List`_
+:Mailing list for developers: `PBS Development List`_
 
 Bug Tracker
 ~~~~~~~~~~~
@@ -191,7 +186,7 @@ of the issue and will send a notification once it has been solved.
 License
 -------
 
-|pbs-copyright|
+Copyright (C) 2019-2021 Proxmox Server Solutions GmbH
 
 This software is written by Proxmox Server Solutions GmbH <support@proxmox.com>
 

docs/local-zfs.rst

@@ -121,7 +121,7 @@ Create a new pool with cache (L2ARC)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 It is possible to use a dedicated cache drive partition to increase
-the read performance (use SSDs).
+the performance (use SSD).
 
 For `<device>`, you can use multiple devices, as is shown in
 "Create a new pool with RAID*".
@@ -134,7 +134,7 @@ Create a new pool with log (ZIL)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 It is possible to use a dedicated cache drive partition to increase
-the write performance (use SSDs).
+the performance (SSD).
 
 For `<device>`, you can use multiple devices, as is shown in
 "Create a new pool with RAID*".
@@ -172,7 +172,7 @@ Changing a failed device
 Changing a failed bootable device
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Depending on how `Proxmox Backup`_ was installed, it is either using `grub` or
+Depending on how Proxmox Backup was installed, it is either using `grub` or
 `systemd-boot` as a bootloader.
 
 In either case, the first steps of copying the partition table, reissuing GUIDs
@@ -195,7 +195,7 @@ With `systemd-boot`:
   # proxmox-boot-tool init <new ESP>
 
 .. NOTE:: `ESP` stands for EFI System Partition, which is setup as partition #2 on
-  bootable disks setup by the Proxmox Backup installer. For details, see
+  bootable disks setup by the `Proxmox Backup`_ installer. For details, see
   :ref:`Setting up a new partition for use as synced ESP <systembooting-proxmox-boot-setup>`.
 
 With `grub`:
@@ -211,20 +211,20 @@ Usually `grub.cfg` is located in `/boot/grub/grub.cfg`
 Activate e-mail notification
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-ZFS comes with an event daemon, ``ZED``, which monitors events generated by the
-ZFS kernel module. The daemon can also send emails upon ZFS events, such as pool
+ZFS comes with an event daemon ``ZED``, which monitors events generated by the
+ZFS kernel module. The daemon can also send emails on ZFS events like pool
 errors. Newer ZFS packages ship the daemon in a separate package ``zfs-zed``,
-which should already be installed by default in Proxmox Backup.
+which should already be installed by default in `Proxmox Backup`_.
 
-You can configure the daemon via the file ``/etc/zfs/zed.d/zed.rc``, using your
-preferred editor. The required setting for email notification is
+You can configure the daemon via the file ``/etc/zfs/zed.d/zed.rc`` with your
+favorite editor. The required setting for email notfication is
 ``ZED_EMAIL_ADDR``, which is set to ``root`` by default.
 
 .. code-block:: console
 
   ZED_EMAIL_ADDR="root"
 
-Please note that Proxmox Backup forwards mails to `root` to the email address
+Please note that `Proxmox Backup`_ forwards mails to `root` to the email address
 configured for the root user.
 
 
@@ -264,7 +264,6 @@ systems with more than 256 GiB of total memory, where simply setting
 
   # update-initramfs -u
 
-.. _zfs_swap:
 
 Swap on ZFS
 ^^^^^^^^^^^
@@ -291,17 +290,17 @@ an editor of your choice and add the following line:
   vm.swappiness = 10
 
 .. table:: Linux kernel `swappiness` parameter values
-  :widths: 1, 3
+  :widths:auto
 
-  ===================  ===============================================================
+  ====================  ===============================================================
    Value                Strategy
-  ===================  ===============================================================
+  ====================  ===============================================================
    vm.swappiness = 0    The kernel will swap only to avoid an 'out of memory' condition
    vm.swappiness = 1    Minimum amount of swapping without disabling it entirely.
    vm.swappiness = 10   Sometimes recommended to improve performance when sufficient memory exists in a system.
    vm.swappiness = 60   The default value.
    vm.swappiness = 100  The kernel will swap aggressively.
-  ===================  ===============================================================
+  ====================  ===============================================================
 
 ZFS compression
 ^^^^^^^^^^^^^^^

docs/lto-barcode/label-setup.js

@@ -46,23 +46,6 @@ Ext.define('LabelSetupPanel', {
 	    let params = view.getValues();
 	    list.getStore().add(params);
 	},
-
-	validitychange: function() {
-	    let me = this;
-	    let isValid = true;
-	    me.getView().query('field').forEach((field) => {
-		if (!field.isValid()) {
-		    isValid = false;
-		}
-	    });
-	    me.lookup('addButton').setDisabled(!isValid);
-	},
-
-	control: {
-	    'field': {
-		validitychange: 'validitychange',
-	    },
-	},
     },
 
     items: [
@@ -84,7 +67,7 @@ Ext.define('LabelSetupPanel', {
 		    xtype: 'ltoTapeType',
 		    name: 'tape_type',
 		    fieldLabel: 'Type',
-		    value: 'L9',
+		    value: 'L8',
 		},
 		{
 		    xtype: 'ltoLabelStyle',
@@ -110,7 +93,6 @@ Ext.define('LabelSetupPanel', {
 		{
 		    xtype: 'button',
 		    text: 'Add',
-		    reference: 'addButton',
 		    handler: 'onAdd',
 		},
 	    ],

docs/lto-barcode/page-calibration.js

@@ -108,7 +108,7 @@ Ext.define('PageCalibration', {
 		    xtype: 'numberfield',
 		    value: 'a4',
 		    name: 's_x',
-		    fieldLabel: 'Measured Start Offset Sx (mm)',
+		    fieldLabel: 'Meassured Start Offset Sx (mm)',
 		    allowBlank: false,
 		    labelWidth: 200,
 		},
@@ -116,7 +116,7 @@ Ext.define('PageCalibration', {
 		    xtype: 'numberfield',
 		    value: 'a4',
 		    name: 'd_x',
-		    fieldLabel: 'Measured Length Dx (mm)',
+		    fieldLabel: 'Meassured Length Dx (mm)',
 		    allowBlank: false,
 		    labelWidth: 200,
 		},
@@ -124,7 +124,7 @@ Ext.define('PageCalibration', {
 		    xtype: 'numberfield',
 		    value: 'a4',
 		    name: 's_y',
-		    fieldLabel: 'Measured Start Offset Sy (mm)',
+		    fieldLabel: 'Meassured Start Offset Sy (mm)',
 		    allowBlank: false,
 		    labelWidth: 200,
 		},
@@ -132,7 +132,7 @@ Ext.define('PageCalibration', {
 		    xtype: 'numberfield',
 		    value: 'a4',
 		    name: 'd_y',
-		    fieldLabel: 'Measured Length Dy (mm)',
+		    fieldLabel: 'Meassured Length Dy (mm)',
 		    allowBlank: false,
 		    labelWidth: 200,
 		},

docs/lto-barcode/tape-type.js

@@ -11,20 +11,12 @@ Ext.define('LtoTapeType', {
     store: {
 	field: ['value', 'text'],
 	data: [
-	    { value: 'L9', text: "LTO-9" },
-	    { value: 'LZ', text: "LTO-9 (WORM)" },
 	    { value: 'L8', text: "LTO-8" },
-	    { value: 'LY', text: "LTO-8 (WORM)" },
 	    { value: 'L7', text: "LTO-7" },
-	    { value: 'LX', text: "LTO-7 (WORM)" },
 	    { value: 'L6', text: "LTO-6" },
-	    { value: 'LW', text: "LTO-6 (WORM)" },
 	    { value: 'L5', text: "LTO-5" },
-	    { value: 'LV', text: "LTO-5 (WORM)" },
 	    { value: 'L4', text: "LTO-4" },
-	    { value: 'LU', text: "LTO-4 (WORM)" },
 	    { value: 'L3', text: "LTO-3" },
-	    { value: 'LT', text: "LTO-3 (WORM)" },
 	    { value: 'CU', text: "Cleaning Unit" },
 	],
     },

docs/maintenance.rst

@@ -6,72 +6,43 @@ Maintenance Tasks
 Pruning
 -------
 
-Prune lets you specify which backup snapshots you want to keep, removing others.
-When pruning a snapshot, only the snapshot metadata (manifest, indices, blobs,
-log and notes) is removed. The chunks containing the actual backup data and
-previously referenced by the pruned snapshot, have to be removed by a garbage
-collection run.
-
-.. Caution:: Take into consideration that sensitive information stored in a
-   given data chunk will outlive pruned snapshots and remain present in the
-   datastore as long as referenced by at least one backup snapshot. Further,
-   *even* if no snapshot references a given chunk, it will remain present until
-   removed by the garbage collection.
-
-   Moreover, file-level backups created using the change detection mode
-   ``metadata`` can reference backup chunks containing files which have vanished
-   since the previous backup. These files might still be accessible by reading
-   the chunks raw data (client or server side).
-
-   To remove chunks containing sensitive data, prune any snapshot made while the
-   data was part of the backup input and run a garbage collection. Further, if
-   using file-based backups with change detection mode ``metadata``,
-   additionally prune all snapshots since the sensitive data was no longer part
-   of the backup input and run a garbage collection.
-
-   The no longer referenced chunks will then be marked for deletion on the next
-   garbage collection run and removed by a subsequent run after the grace
-   period.
-
-The following retention options are available for pruning:
+Prune lets you specify which backup snapshots you want to keep. The
+following retention options are available:
 
 ``keep-last <N>``
   Keep the last ``<N>`` backup snapshots.
 
 ``keep-hourly <N>``
-  Keep backups for the last ``<N>`` hours. If there is more than one backup for
-  a single hour, only the latest is retained. Hours without backups do not
-  count.
+  Keep backups for the last ``<N>`` hours. If there is more than one
+  backup for a single hour, only the latest is retained.
 
 ``keep-daily <N>``
-  Keep backups for the last ``<N>`` days. If there is more than one backup for a
-  single day, only the latest is retained. Days without backups do not count.
+  Keep backups for the last ``<N>`` days. If there is more than one
+  backup for a single day, only the latest is retained.
 
 ``keep-weekly <N>``
-  Keep backups for the last ``<N>`` weeks. If there is more than one backup for
-  a single week, only the latest is retained. Weeks without backup do not count.
+  Keep backups for the last ``<N>`` weeks. If there is more than one
+  backup for a single week, only the latest is retained.
 
   .. note:: Weeks start on Monday and end on Sunday. The software
      uses the `ISO week date`_ system and handles weeks at
      the end of the year correctly.
 
 ``keep-monthly <N>``
-  Keep backups for the last ``<N>`` months. If there is more than one backup for
-  a single month, only the latest is retained. Months without backups do not
-  count.
+  Keep backups for the last ``<N>`` months. If there is more than one
+  backup for a single month, only the latest is retained.
 
 ``keep-yearly <N>``
-  Keep backups for the last ``<N>`` years. If there is more than one backup for
-  a single year, only the latest is retained. Years without backups do not
-  count.
+  Keep backups for the last ``<N>`` years. If there is more than one
+  backup for a single year, only the latest is retained.
 
 The retention options are processed in the order given above. Each option
 only covers backups within its time period. The next option does not take care
 of already covered backups. It will only consider older backups.
 
-Old unfinished or incomplete backups will be removed by the prune command,
-unless they are newer than the last successful backup. In this case, the last
-failed backup is retained.
+Unfinished and incomplete backups will be removed by the prune command, unless
+they are newer than the last successful backup. In this case, the last failed
+backup is retained.
 
 Prune Simulator
 ^^^^^^^^^^^^^^^
@@ -80,60 +51,6 @@ You can use the built-in `prune simulator <prune-simulator/index.html>`_
 to explore the effect of different retention options with various backup
 schedules.
 
-.. _maintenance_prune_jobs:
-
-Prune Jobs
-^^^^^^^^^^
-
-.. image:: images/screenshots/pbs-gui-datastore-prunegc.png
-  :target: _images/pbs-gui-datastore-prunegc.png
-  :align: right
-  :alt: Prune and garbage collection options
-
-Prune jobs are configured to periodically prune a datastore or a subset of it.
-You can manage prune jobs in the web interface, from the **Prune & GC** tab of
-the **Datastore** panel or from that of the Datastore itself. Alternatively,
-you can manage them with the ``proxmox-backup-manager prune-job`` command. The
-configuration information for prune jobs is stored at
-``/etc/proxmox-backup/prune.cfg``. To create a new prune job, click the add
-button in the GUI, or use the manager CLI's ``create`` subcommand. After
-creating a prune job, you can either start it manually from the GUI or provide
-it with a schedule (see :ref:`calendar-event-scheduling`) to run regularly.
-
-Each prune job has settings for retention, limitation of scope and frequency.
-
-``store <datastore>``
- The datastore you want to run this prune job on.
-
-``ns <namespace>``
- Limit the prune job to a specific namespace.
-
-``max-depth <N>``
- Configure the namespace depth it should prune from below the configured
- namespace. For example, `0` to only prune the backup groups available directly
- on the configured namespace itself. Omit the parameter to scan to the full
- depth below.
-
-.. image:: images/screenshots/pbs-gui-datastore-prune-job-add.png
-  :target: _images/pbs-gui-datastore-prune-job-add.png
-  :align: right
-  :alt: Prune Job creation and edit dialogue
-
-``schedule``
- Configure a :ref:`calendar event interval <calendar-event-scheduling>` for
- when to automatically trigger this job. You can omit this if you want to
- trigger a job only manually.
-
-``keep-X``
- See the description of the various retention options above.
-
-``disable``
- Set to disable a job temporarily while keeping its settings.
-
-``comment``
- You can add a short comment for a job, for example about it intentions.
-
-
 Manual Pruning
 ^^^^^^^^^^^^^^
 
@@ -147,6 +64,18 @@ To manually prune a specific backup group, you can use
 :ref:`backup-pruning`, or navigate to the **Content** tab of the datastore and
 click the scissors icon in the **Actions** column of the relevant backup group.
 
+Prune Schedules
+^^^^^^^^^^^^^^^
+
+To prune on a datastore level, scheduling options can be found under the
+**Prune & GC** tab of the datastore. Here you can set retention settings and
+edit the interval at which pruning takes place.
+
+.. image:: images/screenshots/pbs-gui-datastore-prunegc.png
+  :target: _images/pbs-gui-datastore-prunegc.png
+  :align: right
+  :alt: Prune and garbage collection options
+
 
 Retention Settings Example
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -183,103 +112,22 @@ We recommend that you use a higher retention period than is minimally required
 by your environment; you can always reduce it if you find it is unnecessarily
 high, but you cannot recreate backup snapshots from the past.
 
+
 .. _maintenance_gc:
 
 Garbage Collection
 ------------------
 
-Garbage collection (GC) is the process that frees up space in a datastore by
-deleting all unused backup chunks from chunk storage. GC completes the pruning
-of backup snapshots, which deletes only the metadata, not the underlying backup
-data.
-
-It's recommended to setup a schedule to ensure that unused space is cleaned up
-periodically. For most setups a weekly schedule provides a good interval to
-start.
-
-.. _gc_background:
-
-GC Background
-^^^^^^^^^^^^^
-
-In `Proxmox Backup`_ Server, backup data is not saved directly, but rather as
-chunks that are referred to by the indexes of each backup snapshot. This
-approach enables reuse of chunks through deduplication, among other benefits
-that are detailed in the :ref:`tech_design_overview`.
-
-When deleting a backup snapshot, Proxmox Backup Server cannot directly remove
-the chunks associated with it because other backups, even ones that are still
-running, may have references to those chunks. To avoid excessive load and slow
-performance, the whole datastore cannot be locked to scan all other indexes for
-references to the same chunks on every snapshot deletion. Moreover, locking the
-entire datastore is not feasible because new backups would be blocked until the deletion
-process was complete.
-
-Therefore, Proxmox Backup Server uses a garbage collection (GC) process to
-identify and remove the unused backup chunks that are no longer needed by any
-snapshot in the datastore. The GC process is designed to efficiently reclaim
-the space occupied by these chunks with low impact on the performance of the
-datastore or interfering with other backups.
-
-The garbage collection (GC) process is performed per datastore and is split
-into two phases:
-
-- Phase one (Mark):
-
-  All index files are read, and the access time (``atime``) of the referenced
-  chunk files is updated.
-
-- Phase two (Sweep):
-
-  The task iterates over all chunks and checks their file access time against a
-  cutoff time. The cutoff time is given by either the oldest backup writer
-  instance, if present, or 24 hours and 5 minutes before the start of the
-  garbage collection.
-
-  Garbage collection considers chunk files with access time older than the
-  cutoff time to be neither referenced by any backup snapshot's index, nor part
-  of any currently running backup job. Therefore, these chunks can safely be
-  deleted.
-
-  Chunks within the grace period will not be deleted and logged at the end of
-  the garbage collection task as *Pending removals*.
-
-.. note:: The grace period for backup chunk removal is not arbitrary, but stems
-   from the fact that filesystems are typically mounted with the ``relatime``
-   option by default. This results in better performance by only updating the
-   ``atime`` property if a file has been modified since the last access or the
-   last access has been at least 24 hours ago.
-
-Manually Starting GC
-^^^^^^^^^^^^^^^^^^^^
-
 You can monitor and run :ref:`garbage collection <client_garbage-collection>` on the
 Proxmox Backup Server using the ``garbage-collection`` subcommand of
 ``proxmox-backup-manager``. You can use the ``start`` subcommand to manually
 start garbage collection on an entire datastore and the ``status`` subcommand to
 see attributes relating to the :ref:`garbage collection <client_garbage-collection>`.
 
-This functionality can also be accessed in the web UI using the `Start Garbage
-Collection` button found in each datastore's **Prune & GC** tab.
+This functionality can also be accessed in the GUI, by navigating to **Prune &
+GC** from the top panel of a datastore. From here, you can edit the schedule at
+which garbage collection runs and manually start the operation.
 
-Scheduled GC
-^^^^^^^^^^^^
-
-Normally, datastore admins don't want to bother triggering GC's manually.
-That's why you can configure a schedule to let Proxmox Backup Server handle it.
-
-Setting or editing a datastore's GC schedule can be either done by using the
-``proxmox-backup-manager datastore update <datastore> --gc-schedule <schedule>``
-CLI command or the edit window in the web UI in each datastore's **Prune & GC**
-tab.
-
-The GC scheduling uses the :ref:`calendar-event-scheduling` format.
-
-.. tip:: You can disable automatic GC runs by clearing the schedule by either
-   clearing the content of the field in the web UI or using the
-   ``proxmox-backup-manager datastore update <datastore> --delete gc-schedule``
-   CLI command. This might be, for example, useful during maintenance or if you
-   archive a datastore for good.
 
 .. _maintenance_verification:
 
@@ -319,18 +167,33 @@ the **Actions** column in the table.
 Notifications
 -------------
 
-Proxmox Backup Server can send you notifications about automatically
+Proxmox Backup Server can send you notification emails about automatically
 scheduled verification, garbage-collection and synchronization tasks results.
 
-Refer to the :ref:`notifications` chapter for more details.
+By default, notifications are sent to the email address configured for the
+`root@pam` user. You can instead set this user for each datastore.
+
+.. image:: images/screenshots/pbs-gui-datastore-options.png
+  :align: right
+  :alt: Datastore Options
+
+You can also change the level of notification received per task type, the
+following options are available:
+
+* Always: send a notification for any scheduled task, independent of the
+  outcome
+
+* Errors: send a notification for any scheduled task that results in an error
+
+* Never: do not send any notification at all
 
 .. _maintenance_mode:
 
 Maintenance Mode
 ----------------
 
-Proxmox Backup Server supports setting `read-only` and `offline`
-maintenance modes on a datastore.
+Proxmox Backup Server implements setting the `read-only` and `offline`
+maintenance modes for a datastore.
 
 Once enabled, depending on the mode, new reads and/or writes to the datastore
 are blocked, allowing an administrator to safely execute maintenance tasks, for

docs/managing-remotes.rst

@@ -6,15 +6,14 @@ Managing Remotes & Sync
 :term:`Remote`
 --------------
 
-A remote refers to a separate `Proxmox Backup`_ Server installation and a user
-on that installation, from which you can `sync` datastores to a local datastore
-with a `Sync Job`. You can configure remotes in the web interface, under
-**Configuration -> Remotes**. Alternatively, you can use the ``remote``
-subcommand. The configuration information for remotes is stored in the file
+A remote refers to a separate Proxmox Backup Server installation and a user on that
+installation, from which you can `sync` datastores to a local datastore with a
+`Sync Job`. You can configure remotes in the web interface, under **Configuration
+-> Remotes**. Alternatively, you can use the ``remote`` subcommand. The
+configuration information for remotes is stored in the file
 ``/etc/proxmox-backup/remote.cfg``.
 
 .. image:: images/screenshots/pbs-gui-remote-add.png
-  :target: _images/pbs-gui-remote-add.png
   :align: right
   :alt: Add a remote
 
@@ -56,7 +55,6 @@ Sync Jobs
 ---------
 
 .. image:: images/screenshots/pbs-gui-syncjob-add.png
-  :target: _images/pbs-gui-syncjob-add.png
   :align: right
   :alt: Add a Sync Job
 
@@ -69,13 +67,6 @@ sync-job`` command. The configuration information for sync jobs is stored at
 in the GUI, or use the ``create`` subcommand. After creating a sync job, you can
 either start it manually from the GUI or provide it with a schedule (see
 :ref:`calendar-event-scheduling`) to run regularly.
-Backup snapshots, groups and namespaces which are no longer available on the
-**Remote** datastore can be removed from the local datastore as well by setting
-the ``remove-vanished`` option for the sync job.
-Setting the ``verified-only`` or ``encrypted-only`` flags allows to limit the
-sync jobs to backup snapshots which have been verified or encrypted,
-respectively. This is particularly of interest when sending backups to a less
-trusted remote backup server.
 
 .. code-block:: console
 
@@ -107,55 +98,34 @@ the local datastore as well. If the ``owner`` option is not set (defaulting to
 If the ``group-filter`` option is set, only backup groups matching at least one
 of the specified criteria are synced. The available criteria are:
 
-* Backup type, for example, to only sync groups of the `ct` (Container) type:
+* backup type, for example to only sync groups of the `ct` (Container) type:
     .. code-block:: console
 
      # proxmox-backup-manager sync-job update ID --group-filter type:ct
-* Full group identifier, to sync a specific backup group:
+* full group identifier
     .. code-block:: console
 
      # proxmox-backup-manager sync-job update ID --group-filter group:vm/100
-* Regular expression, matched against the full group identifier
-    .. code-block:: console
+* regular expression matched against the full group identifier
 
-     # proxmox-backup-manager sync-job update ID --group-filter regex:'^vm/1\d{2,3}$'
+.. todo:: add example for regex
 
-The same filter is applied to local groups, for handling of the
+The same filter is applied to local groups for handling of the
 ``remove-vanished`` option.
 
-A ``group-filter`` can be inverted by prepending ``exclude:`` to it.
-
-* Regular expression example, excluding the match:
-    .. code-block:: console
-
-     # proxmox-backup-manager sync-job update ID --group-filter exclude:regex:'^vm/1\d{2,3}$'
-
-For mixing include and exclude filter, following rules apply:
-
- - no filters: all backup groups
- - include: only those matching the include filters
- - exclude: all but those matching the exclude filters
- - both: those matching the include filters, but without those matching the exclude filters
-
 .. note:: The ``protected`` flag of remote backup snapshots will not be synced.
 
-Enabling the advanced option 'resync-corrupt' will re-sync all snapshots that have 
-failed to verify during the last :ref:`maintenance_verification`. Hence, a verification
-job needs to be run before a sync job with 'resync-corrupt' can be carried out. Be aware
-that a 'resync-corrupt'-job needs to check the manifests of all snapshots in a datastore
-and might take much longer than regular sync jobs.
-
 Namespace Support
 ^^^^^^^^^^^^^^^^^
 
-Sync jobs can be configured to not only sync datastores, but also subsets of
+Sync jobs can be configured to not only sync datastores, but also sub-sets of
 datastores in the form of namespaces or namespace sub-trees. The following
-parameters influence how namespaces are treated as part of a sync job's
+parameters influence how namespaces are treated as part of a sync job
 execution:
 
 - ``remote-ns``: the remote namespace anchor (default: the root namespace)
 
-- ``ns``: the local namespace anchor (default: the root namespace)
+- ``ns``: the local namespace anchor (default: the root naemspace)
 
 - ``max-depth``: whether to recursively iterate over sub-namespaces of the remote
   namespace anchor (default: `None`)
@@ -229,54 +199,11 @@ sync job scope but only exist locally are treated as vanished and removed
 Bandwidth Limit
 ^^^^^^^^^^^^^^^
 
-Syncing a datastore to an archive can produce a lot of traffic and impact other
-users of the network. In order to avoid network or storage congestion, you can
-limit the bandwidth of a sync job in pull direction by setting the ``rate-in``
-option either in the web interface or using the ``proxmox-backup-manager``
-command-line tool:
+Syncing a datastore to an archive can produce lots of traffic and impact other
+users of the network. So, to avoid network or storage congestion you can limit
+the bandwidth of the sync job by setting the ``rate-in`` option either in the
+web interface or using the ``proxmox-backup-manager`` command-line tool:
 
 .. code-block:: console
 
     # proxmox-backup-manager sync-job update ID --rate-in 20MiB
-
-For sync jobs in push direction use the ``rate-out`` option instead.
-
-Sync Direction Push
-^^^^^^^^^^^^^^^^^^^
-
-Sync jobs can be configured for pull or push direction. Sync jobs in push
-direction are not identical in behaviour because of the limited access to the
-target datastore via the remote servers API. Most notably, pushed content will
-always be owned by the user configured in the remote configuration, being
-independent from the local user as configured in the sync job. Latter is used
-exclusively for permission check and scope checks on the pushing side.
-
-.. note:: It is strongly advised to create a dedicated remote configuration for
-   each individual sync job in push direction, using a dedicated user on the
-   remote. Otherwise, sync jobs pushing to the same target might remove each
-   others snapshots and/or groups, if the remove vanished flag is set or skip
-   snapshots if the backup time is not incremental.
-   This is because the backup groups on the target are owned by the user
-   given in the remote configuration.
-
-The following permissions are required for a sync job in push direction:
-
-#. ``Remote.Audit`` on ``/remote/{remote}`` and ``Remote.DatastoreBackup`` on
-   ``/remote/{remote}/{remote-store}/{remote-ns}`` path or subnamespace.
-#. At least ``Datastore.Read`` and ``Datastore.Audit`` on the local source
-   datastore namespace (``/datastore/{store}/{ns}``) or ``Datastore.Backup`` if
-   owner of the sync job.
-#. ``Remote.DatastorePrune`` on ``/remote/{remote}/{remote-store}/{remote-ns}``
-   path to remove vanished snapshots and groups. Make sure to use a dedicated
-   remote for each sync job in push direction as noted above.
-#. ``Remote.DatastoreModify`` on ``/remote/{remote}/{remote-store}/{remote-ns}``
-   path to remove vanished namespaces. A remote user with limited access should
-   be used on the remote backup server instance. Consider the implications as
-   noted below.
-
-.. note:: ``Remote.DatastoreModify`` will allow to remove whole namespaces on the
-   remote target datastore, independent of ownership. Make sure the user as
-   configured in remote.cfg has limited permissions on the remote side.
-
-.. note:: Sync jobs in push direction require namespace support on the remote
-   Proxmox Backup Server instance (minimum version 2.2).

docs/markdown-primer.rst

@@ -10,18 +10,18 @@ Markdown Primer
   --  John Gruber, https://daringfireball.net/projects/markdown/
 
 
-The "Notes" panel of the `Proxmox Backup`_ Server web-interface supports
-rendering Markdown text.
+The Proxmox Backup Server (PBS) web-interface has support for using Markdown to
+rendering rich text formatting in node and virtual guest notes.
 
-Proxmox Backup Server supports CommonMark with most extensions of GFM (GitHub
-Flavoured Markdown), like tables or task-lists.
+PBS supports CommonMark with most extensions of GFM (GitHub Flavoured Markdown),
+like tables or task-lists.
 
 .. _markdown_basics:
 
 Markdown Basics
 ---------------
 
-Note that we only describe the basics here. Please search the web for more
+Note that we only describe the basics here, please search the web for more
 extensive resources, for example on https://www.markdownguide.org/
 
 Headings
@@ -51,7 +51,7 @@ Combinations are also possible, for example:
 Links
 ~~~~~
 
-You can use automatic detection of links. For example,
+You can use automatic detection of links, for example,
 ``https://forum.proxmox.com/`` would transform it into a clickable link.
 
 You can also control the link text, for example:
@@ -76,7 +76,7 @@ Use ``*`` or ``-`` for unordered lists, for example:
   * Item 2b
 
 
-You can create nested lists by adding indentation.
+Adding an indentation can be used to created nested lists.
 
 Ordered Lists
 ^^^^^^^^^^^^^
@@ -94,7 +94,7 @@ NOTE: The integer of ordered lists does not need to be correct, they will be num
 Task Lists
 ^^^^^^^^^^
 
-Task lists use a empty box ``[ ]`` for unfinished tasks and a box with an `X` for finished tasks.
+Task list use a empty box ``[ ]`` for unfinished tasks and a box with an `X` for finished tasks.
 
 For example:
 
@@ -110,7 +110,7 @@ Tables
 ~~~~~~
 
 Tables use the pipe symbol ``|`` to separate columns, and ``-`` to separate the
-table header from the table body. In that separation, you can also set the text
+table header from the table body, in that separation one can also set the text
 alignment, making one column left-, center-, or right-aligned.
 
 
@@ -143,24 +143,23 @@ You can enter block quotes by prefixing a line with ``>``, similar as in plain-t
 Code and Snippets
 ~~~~~~~~~~~~~~~~~
 
-You can use backticks to avoid processing a group of words or paragraphs. This
-is useful for preventing a code or configuration hunk from being mistakenly
-interpreted as markdown.
+You can use backticks to avoid processing for a few word or paragraphs. That is useful for
+avoiding that a code or configuration hunk gets mistakenly interpreted as markdown.
 
-Inline Code
+Inline code
 ^^^^^^^^^^^
 
-Surrounding part of a line with single backticks allows you to write code
-inline, for examples:
+Surrounding part of a line with single backticks allows to write code inline,
+for examples:
 
 .. code-block:: md
 
   This hosts IP address is `10.0.0.1`.
 
-Entire Blocks of Code
-^^^^^^^^^^^^^^^^^^^^^
+Whole blocks of code
+^^^^^^^^^^^^^^^^^^^^
 
-For code blocks spanning several lines, you can use triple-backticks to start
+For code blocks spanning several lines you can use triple-backticks to start
 and end such a block, for example:
 
 .. code-block:: md

docs/meta-format-overview.dot

@@ -1,50 +0,0 @@
-digraph g {
-graph [
-rankdir = "LR"
-fontname="Helvetica"
-];
-node [
-fontsize = "16"
-shape = "record"
-];
-edge [
-];
-
-"archive" [
-label = "archive.mpxar"
-shape = "record"
-];
-
-"rootdir" [
-label = "<fv>FORMAT_VERSION\l|PRELUDE\l|<f0>ENTRY\l|\{XATTR\}\* extended attribute list\l|\{ACL_USER\}\* USER ACL entries\l|\{ACL_GROUP\}\* GROUP ACL entries\l|\[ACL_GROUP_OBJ\] the ACL_GROUP_OBJ \l|\[ACL_DEFAULT\] the various default ACL fields\l|\{ACL_DEFAULT_USER\}\* USER ACL entries\l|\{ACL_DEFAULT_GROUP\}\* GROUP ACL entries\l|\[FCAPS\] file capability in Linux disk format\l|\[QUOTA_PROJECT_ID\] the ext4/xfs quota project ID\l|{<pl> PAYLOAD_REF|SYMLINK|DEVICE|{<de> \{DirectoryEntries\}\*|GOODBYE}}"
-shape = "record"
-];
-
-
-"entry" [
-label = "<f0> size: u64 = 64\l|type: u64 = ENTRY\l|feature_flags: u64\l|mode: u64\l|flags: u64\l|uid: u64\l|gid: u64\l|mtime: u64\l"
-labeljust = "l"
-shape = "record"
-];
-
-
-
-"direntry" [
-label = "<f0> FILENAME\l|{ENTRY\l|HARDLINK\l}"
-shape = "record"
-];
-
-"payloadrefentry" [
-label = "<f0> offset: u64\l|size: u64\l"
-shape = "record"
-];
-
-"archive" -> "rootdir":fv
-
-"rootdir":f0 -> "entry":f0
-
-"rootdir":de -> "direntry":f0
-
-"rootdir":pl -> "payloadrefentry":f0
-
-}

docs/network-management.rst

@@ -4,14 +4,13 @@ Network Management
 ==================
 
 .. image:: images/screenshots/pbs-gui-system-config.png
-  :target: _images/pbs-gui-system-config.png
   :align: right
   :alt: System and Network Configuration Overview
 
-`Proxmox Backup`_ Server provides both a web interface and a command-line tool
-for network configuration. You can find the configuration options in the web
+Proxmox Backup Server provides both a web interface and a command line tool for
+network configuration. You can find the configuration options in the web
 interface under the **Network Interfaces** section of the **Configuration** menu
-tree item. The command-line tool is accessed via the ``network`` subcommand.
+tree item. The command line tool is accessed via the ``network`` subcommand.
 These interfaces allow you to carry out some basic network management tasks,
 such as adding, configuring, and removing network interfaces.
 
@@ -46,7 +45,6 @@ in the list above:
   # proxmox-backup-manager network create bond0 --type bond --bond_mode active-backup --slaves ens18,ens19 --autostart true --cidr x.x.x.x/x --gateway x.x.x.x
 
 .. image:: images/screenshots/pbs-gui-network-create-bond.png
-  :target: _images/pbs-gui-network-create-bond.png
   :align: right
   :alt: Add a network interface
 

docs/notifications.rst

@@ -1,388 +0,0 @@
-.. _notifications:
-
-Notifications
-=============
-
-Overview
---------
-
-* Proxmox Backup Server emits :ref:`notification_events` in case of noteworthy
-  events in the system. These events are handled by the notification system. A
-  notification event has metadata, for example a timestamp, a severity level, a
-  type and other metadata fields.
-* :ref:`notification_matchers` route a notification event to one or more
-  notification targets. A matcher can have match rules to selectively route
-  based on the metadata of a notification event.
-* :ref:`notification_targets` are a destination to which a notification event
-  is routed to by a matcher. There are multiple types of target, mail-based
-  (Sendmail and SMTP) and Gotify.
-
-Datastores and tape backup jobs have a configurable :ref:`notification_mode`.
-It allows you to choose between the notification system and a legacy mode for
-sending notification emails. The legacy mode is equivalent to the way
-notifications were handled before Proxmox Backup Server 3.2.
-
-The notification system can be configured in the GUI under *Configuration →
-Notifications*. The configuration is stored in :ref:`notifications.cfg` and
-:ref:`notifications_priv.cfg` - the latter contains sensitive configuration
-options such as passwords or authentication tokens for notification targets and
-can only be read by ``root``.
-
-.. _notification_targets:
-
-Notification Targets
---------------------
-
-Proxmox Backup Server offers multiple types of notification targets.
-
-.. _notification_targets_sendmail:
-
-Sendmail
-^^^^^^^^
-The sendmail binary is a program commonly found on Unix-like operating systems
-that handles the sending of email messages. It is a command-line utility that
-allows users and applications to send emails directly from the command line or
-from within scripts.
-
-The sendmail notification target uses the ``sendmail`` binary to send emails to
-a list of configured users or email addresses. If a user is selected as a
-recipient, the email address configured in user's settings will be used. For
-the ``root@pam`` user, this is the email address entered during installation. A
-user's email address can be configured in ``Configuration → Access Control →
-User Management``. If a user has no associated email address, no email will be
-sent.
-
-.. NOTE:: In standard Proxmox Backup Server installations, the ``sendmail``
-   binary is provided by Postfix. It may be necessary to configure Postfix so
-   that it can deliver mails correctly - for example by setting an external
-   mail relay (smart host). In case of failed delivery, check the system logs
-   for messages logged by the Postfix daemon.
-
-See :ref:`notifications.cfg` for all configuration options.
-
-.. _notification_targets_smtp:
-
-SMTP
-^^^^
-SMTP notification targets can send emails directly to an SMTP mail relay. This
-target does not use the system's MTA to deliver emails. Similar to sendmail
-targets, if a user is selected as a recipient, the user's configured email
-address will be used.
-
-.. NOTE:: Unlike sendmail targets, SMTP targets do not have any queuing/retry
-   mechanism in case of a failed mail delivery.
-
-See :ref:`notifications.cfg` for all configuration options.
-
-.. _notification_targets_gotify:
-
-Gotify
-^^^^^^
-`Gotify <http://gotify.net>`_ is an open-source self-hosted notification server
-that allows you to send push notifications to various devices and applications.
-It provides a simple API and web interface, making it easy to integrate with
-different platforms and services.
-
-.. NOTE:: Gotify targets will respect the HTTP proxy settings from
-   Configuration → Other → HTTP proxy
-
-See :ref:`notifications.cfg` for all configuration options.
-
-.. _notification_targets_webhook:
-Webhook
-^^^^^^^
-Webhook notification targets perform HTTP requests to a configurable URL.
-
-The following configuration options are available:
-
-* ``url``: The URL to which to perform the HTTP requests. Supports templating
-  to inject message contents, metadata and secrets.
-* ``method``: HTTP Method to use (POST/PUT/GET)
-* ``header``: Array of HTTP headers that should be set for the request.
-  Supports templating to inject message contents, metadata and secrets.
-* ``body``: HTTP body that should be sent. Supports templating to inject
-  message contents, metadata and secrets.
-* ``secret``: Array of secret key-value pairs. These will be stored in a
-  protected configuration file only readable by root. Secrets can be
-  accessed in body/header/URL templates via the ``secrets`` namespace.
-* ``comment``: Comment for this target.
-
-For configuration options that support templating, the `Handlebars
-<https://handlebarsjs.com>`_ syntax can be used to access the following
-properties:
-
-* ``{{ title }}``: The rendered notification title
-* ``{{ message }}``: The rendered notification body
-* ``{{ severity }}``: The severity of the notification (``info``, ``notice``,
-  ``warning``, ``error``, ``unknown``)
-* ``{{ timestamp }}``: The notification's timestamp as a UNIX epoch (in
-  seconds).
-* ``{{ fields.<name> }}``: Sub-namespace for any metadata fields of the
-  notification. For instance, ``fields.type`` contains the notification
-  type - for all available fields refer to :ref:`notification_events`.
-* ``{{ secrets.<name> }}``: Sub-namespace for secrets. For instance, a secret
-  named ``token`` is accessible via ``secrets.token``.
-
-For convenience, the following helpers are available:
-
-* ``{{ url-encode <value/property> }}``: URL-encode a property/literal.
-* ``{{ escape <value/property> }}``: Escape any control characters that cannot
-  be safely represented as a JSON string.
-* ``{{ json <value/property> }}``: Render a value as JSON. This can be useful
-  to pass a whole sub-namespace (e.g. ``fields``) as a part of a JSON payload
-  (e.g. ``{{ json fields }}``).
-
-
-.. NOTE:: Webhook targets will respect the HTTP proxy settings from
-   Configuration → Other → HTTP proxy
-
-Example - ntfy.sh
-"""""""""""""""""
-
-* Method: ``POST``
-* URL: ``https://ntfy.sh/{{ secrets.channel }}``
-* Headers:
-
-  * ``Markdown``: ``Yes``
-* Body::
-
-    ```
-    {{ message }}
-    ```
-
-* Secrets:
-
-  * ``channel``: ``<your ntfy.sh channel>``
-
-Example - Discord
-"""""""""""""""""
-
-* Method: ``POST``
-* URL: ``https://discord.com/api/webhooks/{{ secrets.token }}``
-* Headers:
-
-  * ``Content-Type``: ``application/json``
-
-* Body::
-
-    {
-      "content": "``` {{ escape message }}```"
-    }
-
-* Secrets:
-
-  * ``token``: ``<token>``
-
-Example - Slack
-"""""""""""""""
-
-* Method: ``POST``
-* URL: ``https://hooks.slack.com/services/{{ secrets.token }}``
-* Headers:
-
-  * ``Content-Type``: ``application/json``
-
-* Body::
-
-    {
-      "text": "``` {{escape message}}```",
-      "type": "mrkdwn"
-    }
-
-* Secrets:
-
-  * ``token``: ``<token>``
-
-.. _notification_matchers:
-
-Notification Matchers
----------------------
-
-Notification matchers route notifications to notification targets based on
-their matching rules. These rules can match certain properties of a
-notification, such as the timestamp (``match-calendar``), the severity of the
-notification (``match-severity``) or metadata fields (``match-field``). If a
-notification is matched by a matcher, all targets configured for the matcher
-will receive the notification.
-
-An arbitrary number of matchers can be created, each with with their own
-matching rules and targets to notify. Every target is notified at most once for
-every notification, even if the target is used in multiple matchers.
-
-A matcher without rules matches any notification; the configured targets will
-always be notified.
-
-See :ref:`notifications.cfg` for all configuration options.
-
-Calendar Matching Rules
-^^^^^^^^^^^^^^^^^^^^^^^
-A calendar matcher matches a notification's timestamp.
-
-Examples:
-
-* ``match-calendar 8-12``
-* ``match-calendar 8:00-15:30``
-* ``match-calendar mon-fri 9:00-17:00``
-* ``match-calendar sun,tue-wed,fri 9-17``
-
-Field Matching Rules
-^^^^^^^^^^^^^^^^^^^^
-Notifications have a selection of metadata fields that can be matched. When
-using ``exact`` as a matching mode, a ``,`` can be used as a separator. The
-matching rule then matches if the metadata field has **any** of the specified
-values.
-
-Examples:
-
-* ``match-field exact:type=gc`` Only match notifications for garbage collection
-  jobs
-* ``match-field exact:type=prune,verify`` Match prune job and verification job
-  notifications.
-* ``match-field regex:datastore=^backup-.*$`` Match any datastore starting with
-  ``backup``.
-
-If a notification does not have the matched field, the rule will **not** match.
-For instance, a ``match-field regex:datastore=.*`` directive will match any
-notification that has a ``datastore`` metadata field, but will not match if the
-field does not exist.
-
-Severity Matching Rules
-^^^^^^^^^^^^^^^^^^^^^^^
-A notification has a associated severity that can be matched.
-
-Examples:
-
-* ``match-severity error``: Only match errors
-* ``match-severity warning,error``: Match warnings and error
-
-The following severities are in use:
-``info``, ``notice``, ``warning``, ``error``, ``unknown``.
-
-.. _notification_events:
-
-Notification Events
--------------------
-
-The following table contains a list of all notification events in Proxmox
-Backup server, their type, severity and additional metadata fields. ``type`` as
-well as any other metadata field may be used in ``match-field`` match rules.
-
-================================ ==================== ========== ==============================================================
-Event                            ``type``             Severity   Metadata fields (in addition to ``type``)
-================================ ==================== ========== ==============================================================
-ACME certificate renewal failed  ``acme``             ``error``  ``hostname``
-Garbage collection failure       ``gc``               ``error``  ``datastore``, ``hostname``
-Garbage collection success       ``gc``               ``info``   ``datastore``, ``hostname``
-Package updates available        ``package-updates``  ``info``   ``hostname``
-Prune job failure                ``prune``            ``error``  ``datastore``, ``hostname``, ``job-id``
-Prune job success                ``prune``            ``info``   ``datastore``, ``hostname``, ``job-id``
-Remote sync failure              ``sync``             ``error``  ``datastore``, ``hostname``, ``job-id``
-Remote sync success              ``sync``             ``info``   ``datastore``, ``hostname``, ``job-id``
-Tape backup job failure          ``tape-backup``      ``error``  ``datastore``, ``hostname``, ``media-pool``, ``job-id``
-Tape backup job success          ``tape-backup``      ``info``   ``datastore``, ``hostname``, ``media-pool``, ``job-id``
-Tape loading request             ``tape-load``        ``notice`` ``hostname``
-Verification job failure         ``verification``     ``error``  ``datastore``, ``hostname``, ``job-id``
-Verification job success         ``verification``     ``info``   ``datastore``, ``hostname``, ``job-id``
-================================ ==================== ========== ==============================================================
-
-The following table contains a description of all use metadata fields. All of
-these can be used in ``match-field`` match rules.
-
-==================== ===================================
-Metadata field       Description
-==================== ===================================
-``datastore``        The name of the datastore
-``hostname``         The hostname of the backup server
-``job-id``           Job ID
-``media-pool``       The name of the tape media pool
-``type``             Notification event type
-==================== ===================================
-
-.. NOTE:: The daily task checking for any available system updates only sends
-   notifications if the node has an active subscription.
-
-System Mail Forwarding
-----------------------
-Certain local system daemons, such as ``smartd``, send notification emails to
-the local ``root`` user. Proxmox Backup Server will feed these mails into the
-notification system as a notification of type ``system-mail`` and with severity
-``unknown``.
-
-When the email is forwarded to a sendmail target, the mail's content and
-headers are forwarded as-is. For all other targets, the system tries to extract
-both a subject line and the main text body from the email content. In instances
-where emails solely consist of HTML content, they will be transformed into
-plain text format during this process.
-
-Permissions
------------
-In order to modify/view the configuration for notification targets, the
-``Sys.Modify/Sys.Audit`` permissions are required for the
-``/system/notifications`` ACL node.
-
-.. _notification_mode:
-
-Notification Mode
------------------
-Datastores and tape backup/restore job configuration have a
-``notification-mode`` option which can have one of two values:
-
-* ``legacy-sendmail``: Send notification emails via the system's ``sendmail``
-  command. The notification system will be bypassed and any configured
-  targets/matchers will be ignored. This mode is equivalent to the notification
-  behavior for version before Proxmox Backup Server 3.2.
-
-* ``notification-system``: Use the new, flexible notification system.
-
-If the ``notification-mode`` option is not set, Proxmox Backup Server will
-default to ``legacy-sendmail``.
-
-Starting with Proxmox Backup Server 3.2, a datastore created in the UI will
-automatically opt in to the new notification system. If the datastore is
-created via the API or the ``proxmox-backup-manager`` CLI, the
-``notification-mode`` option has to be set explicitly to
-``notification-system`` if the notification system shall be used.
-
-The ``legacy-sendmail`` mode might be removed in a later release of
-Proxmox Backup Server.
-
-Settings for ``legacy-sendmail`` notification mode
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If ``notification-mode`` is set to ``legacy-sendmail``,  Proxmox Backup Server
-will send notification emails via the system's ``sendmail`` command to the
-email address configured for the user set in the ``notify-user`` option
-(falling back to ``root@pam`` if not set).
-
-For datastores, you can also change the level of notifications received per
-task type via the ``notify`` option.
-
-* Always: send a notification for any scheduled task, independent of the
-  outcome
-
-* Errors: send a notification for any scheduled task that results in an error
-
-* Never: do not send any notification at all
-
-The ``notify-user`` and ``notify`` options are ignored if ``notification-mode``
-is set to ``notification-system``.
-
-Overriding Notification Templates
----------------------------------
-
-Proxmox Backup Server uses Handlebars templates to render notifications. The
-original templates provided by Proxmox Backup Server are stored in
-``/usr/share/proxmox-backup/templates/default/``.
-
-Notification templates can be overridden by providing a custom template file in
-the override directory at
-``/etc/proxmox-backup/notification-templates/default/``. When rendering a
-notification of a given type, Proxmox Backup Server will first attempt to load
-a template from the override directory. If this one does not exist or fails to
-render, the original template will be used.
-
-The template files follow the naming convention of
-``<type>-<body|subject>.txt.hbs``. For instance, the file
-``gc-err-body.txt.hbs`` contains the template for rendering notifications for
-garbage collection errors, while ``package-updates-subject.txt.hbs`` is used to
-render the subject line of notifications for available package updates.

docs/package-repositories.rst

@@ -6,7 +6,7 @@ Debian Package Repositories
 All Debian based systems use APT_ as a package management tool. The lists of
 repositories are defined in ``/etc/apt/sources.list`` and the ``.list`` files found
 in the ``/etc/apt/sources.d/`` directory. Updates can be installed directly
-with the ``apt`` command-line tool, or via the GUI.
+with the ``apt`` command line tool, or via the GUI.
 
 APT_ ``sources.list`` files list one package repository per line, with the most
 preferred source listed first. Empty lines are ignored and a ``#`` character
@@ -17,18 +17,17 @@ update``.
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list``
 
-  deb http://deb.debian.org/debian bookworm main contrib
-  deb http://deb.debian.org/debian bookworm-updates main contrib
+  deb http://ftp.debian.org/debian bullseye main contrib
+  deb http://ftp.debian.org/debian bullseye-updates main contrib
 
   # security updates
-  deb http://security.debian.org/debian-security bookworm-security main contrib
+  deb http://security.debian.org/debian-security bullseye-security main contrib
 
 
 In addition, you need a package repository from Proxmox to get Proxmox Backup
 updates.
 
 .. image:: images/screenshots/pbs-gui-administration-apt-repos.png
-  :target: _images/pbs-gui-administration-apt-repos.png
   :align: right
   :alt: APT Repository Management in the Web Interface
 
@@ -48,21 +47,21 @@ key with the following commands:
 
 .. code-block:: console
 
- # wget https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
+ # wget https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg -O /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
 
 Verify the SHA512 checksum afterwards with the expected output below:
 
 .. code-block:: console
 
- # sha512sum /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
- 7da6fe34168adc6e479327ba517796d4702fa2f8b4f0a9833f5ea6e6b48f6507a6da403a274fe201595edc86a84463d50383d07f64bdde2e3658108db7d6dc87  /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
+ # sha512sum /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
+ 7fb03ec8a1675723d2853b84aa4fdb49a46a3bb72b9951361488bfd19b29aab0a789a4f8c7406e71a69aabbc727c936d3549731c4659ffa1a08f44db8fdcebfa  /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
 
 and the md5sum, with the expected output below:
 
 .. code-block:: console
 
- # md5sum /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
- 41558dc019ef90bd0f6067644a51cf5b /etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg
+ # md5sum /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
+ bcc35c7173e0845c0d6ad6470b70f50e /etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg
 
 .. _sysadmin_package_repos_enterprise:
 
@@ -70,14 +69,14 @@ and the md5sum, with the expected output below:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This is the stable, recommended repository. It is available for
-all Proxmox Backup subscription users. It contains the most stable packages,
+all `Proxmox Backup`_ subscription users. It contains the most stable packages,
 and is suitable for production use. The ``pbs-enterprise`` repository is
 enabled by default:
 
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list.d/pbs-enterprise.list``
 
-  deb https://enterprise.proxmox.com/debian/pbs bookworm pbs-enterprise
+  deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise
 
 
 To never miss important security fixes, the superuser (``root@pam`` user) is
@@ -107,15 +106,15 @@ We recommend to configure this repository in ``/etc/apt/sources.list``.
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list``
 
-  deb http://deb.debian.org/debian bookworm main contrib
-  deb http://deb.debian.org/debian bookworm-updates main contrib
+  deb http://ftp.debian.org/debian bullseye main contrib
+  deb http://ftp.debian.org/debian bullseye-updates main contrib
 
-  # Proxmox Backup Server pbs-no-subscription repository provided by proxmox.com,
+  # PBS pbs-no-subscription repository provided by proxmox.com,
   # NOT recommended for production use
-  deb http://download.proxmox.com/debian/pbs bookworm pbs-no-subscription
+  deb http://download.proxmox.com/debian/pbs bullseye pbs-no-subscription
 
   # security updates
-  deb http://security.debian.org/debian-security bookworm-security main contrib
+  deb http://security.debian.org/debian-security bullseye-security main contrib
 
 
 `Proxmox Backup`_ Test Repository
@@ -133,14 +132,14 @@ You can access this repository by adding the following line to
 .. code-block:: sources.list
   :caption: sources.list entry for ``pbstest``
 
-  deb http://download.proxmox.com/debian/pbs bookworm pbstest
+  deb http://download.proxmox.com/debian/pbs bullseye pbstest
 
 .. _package_repositories_client_only:
 
 Proxmox Backup Client-only Repository
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you want to :ref:`use the Proxmox Backup Client <client_creating_backups>`
+If you want to :ref:`use the the Proxmox Backup Client <client_creating_backups>`
 on systems using a Linux distribution not based on Proxmox projects, you can
 use the client-only repository.
 
@@ -149,7 +148,7 @@ Currently there's only a client-repository for APT based systems.
 .. _package_repositories_client_only_apt:
 
 APT-based Proxmox Backup Client Repository
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+++++++++++++++++++++++++++++++++++++++++++
 
 For modern Linux distributions using `apt` as package manager, like all Debian
 and Ubuntu Derivative do, you may be able to use the APT-based repository.
@@ -158,20 +157,6 @@ In order to configure this repository you need to first :ref:`setup the Proxmox
 release key <package_repos_secure_apt>`. After that, add the repository URL to
 the APT sources lists.
 
-**Repositories for Debian 12 (Bookworm) based releases**
-
-This repository is tested with:
-
-- Debian Bookworm
-
-Edit the file ``/etc/apt/sources.list.d/pbs-client.list`` and add the following
-snippet
-
-.. code-block:: sources.list
-  :caption: File: ``/etc/apt/sources.list``
-
-  deb http://download.proxmox.com/debian/pbs-client bookworm main
-
 **Repositories for Debian 11 (Bullseye) based releases**
 
 This repository is tested with:
@@ -179,7 +164,7 @@ This repository is tested with:
 - Debian Bullseye
 
 Edit the file ``/etc/apt/sources.list.d/pbs-client.list`` and add the following
-snippet
+snipped
 
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list``
@@ -196,7 +181,7 @@ This repository is tested with:
 It may work with older, and should work with more recent released versions.
 
 Edit the file ``/etc/apt/sources.list.d/pbs-client.list`` and add the following
-snippet
+snipped
 
 .. code-block:: sources.list
   :caption: File: ``/etc/apt/sources.list``

docs/pbs-copyright.rst

@@ -1,7 +1,7 @@
 Copyright and Disclaimer
 ========================
 
-|pbs-copyright|
+Copyright (C) 2007-2021 Proxmox Server Solutions GmbH
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as

docs/pbs2to3/man1.rst

@@ -1,16 +0,0 @@
-:orphan:
-
-
-=======
-pbs2to3
-=======
-
-Description
-===========
-
-This tool will help you to detect common pitfalls and misconfiguration before,
-and during the upgrade of a Proxmox Backup Server system. Any failures or
-warnings must be addressed prior to the upgrade. If you suspect that a message
-is a false positive, you have to make carefully sure that it really is.
-
-.. include:: ../pbs-copyright.rst

docs/pmt/man1.rst

@@ -1,24 +1,36 @@
-:orphan:
-
-===
+==========================
 pmt
-===
+==========================
+
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Control Linux Tape Devices
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
 
 Synopsis
 ========
 
 .. include:: synopsis.rst
 
+
 Common Options
 ==============
 
 .. include:: options.rst
 
+
 Description
 ===========
 
 .. include:: description.rst
 
+
 ENVIRONMENT
 ===========
 
@@ -26,4 +38,5 @@ ENVIRONMENT
 
 :PROXMOX_TAPE_DRIVE: If set, replaces the `--drive` option.
 
+
 .. include:: ../pbs-copyright.rst

docs/pmtx/man1.rst

@@ -1,14 +1,24 @@
-:orphan:
-
 ==========================
 pmtx
 ==========================
 
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Control SCSI media changer devices (tape autoloaders)
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
+
 Synopsis
 ==========
 
 .. include:: synopsis.rst
 
+
 Common Options
 ==============
 
@@ -28,17 +38,20 @@ parameter. It accepts the following values:
 
 :``json-pretty``: JSON (multiple lines, nicely formatted).
 
+
 Description
 ============
 
 .. include:: description.rst
 
+
 ENVIRONMENT
 ===========
 
 :CHANGER: If set, replaces the `--device` option
 
 :PROXMOX_TAPE_DRIVE: If set, use the Proxmox Backup Server
-   configuration to find the associated changer device.
+   configuration to find the associcated changer device.
+
 
 .. include:: ../pbs-copyright.rst

docs/proxmox-backup-client/man1.rst

@@ -1,8 +1,17 @@
-:orphan:
-
-=====================
+==========================
 proxmox-backup-client
-=====================
+==========================
+
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Command line tool for Backup and Restore
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
 
 Synopsis
 ==========

docs/proxmox-backup-debug/description.rst

@@ -1,9 +1,6 @@
 Implements debugging functionality to inspect Proxmox Backup datastore
 files, verify the integrity of chunks.
 
-The 'diff' subcommand allows comparing .pxar archives for two
-arbitrary snapshots. A list of added/modified/deleted files will be displayed.
-
 Also contains an 'api' subcommand where arbitrary api paths can be called
 (get/create/set/delete) as well as display their parameters (usage) and
 their child-links (ls).

docs/proxmox-backup-debug/man1.rst

@@ -1,11 +1,20 @@
-:orphan:
-
-====================
+==========================
 proxmox-backup-debug
-====================
+==========================
+
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Debugging command line tool for Backup and Restore
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
 
 Synopsis
-========
+==========
 
 .. include:: synopsis.rst
 
@@ -14,9 +23,11 @@ Common Options
 
 .. include:: ../output-format.rst
 
+
 Description
 ============
 
 .. include:: description.rst
 
+
 .. include:: ../pbs-copyright.rst

docs/proxmox-backup-manager/man1.rst

@@ -1,9 +1,18 @@
-:orphan:
-
 ==========================
 proxmox-backup-manager
 ==========================
 
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Command line tool to manage and configure the backup server.
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
+
 Synopsis
 ========
 
@@ -16,3 +25,4 @@ Description
 
 
 .. include:: ../pbs-copyright.rst
+

docs/proxmox-backup-proxy/description.rst

@@ -1,4 +1,5 @@
-This daemon exposes the whole Proxmox Backup Server API on TCP port 8007 using
-HTTPS. It runs as user ``backup`` and has very limited permissions. Operations
-requiring more permissions are forwarded to the local ``proxmox-backup``
-service.
+This daemon exposes the whole Proxmox Backup Server API on TCP port
+8007 using HTTPS. It runs as user ``backup`` and has very limited
+permissions. Operations requiring more permissions are forwarded to
+the local ``proxmox-backup`` service.
+

docs/proxmox-backup-proxy/man1.rst

@@ -1,9 +1,18 @@
-:orphan:
-
 ==========================
 proxmox-backup-proxy
 ==========================
 
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Proxmox Backup Public API Server
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
+
 Synopsis
 ==========
 
@@ -27,4 +36,6 @@ Description
 
 .. include:: description.rst
 
+
 .. include:: ../pbs-copyright.rst
+

docs/proxmox-backup/man1.rst

@@ -1,9 +1,18 @@
-:orphan:
-
 ==========================
 proxmox-backup
 ==========================
 
+.. include:: ../epilog.rst
+
+-------------------------------------------------------------
+Proxmox Backup Local API Server
+-------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
+
 Synopsis
 ==========
 
@@ -22,9 +31,11 @@ For debugging, you can start the daemon in foreground using::
 .. NOTE:: You need to stop the service before starting the daemon in
    foreground.
 
+
 Description
 ============
 
 .. include:: description.rst
 
+
 .. include:: ../pbs-copyright.rst

docs/proxmox-file-restore/description.rst

@@ -1,4 +1,3 @@
-Command-line tool for restoring files and directories from Proxmox Backup
-archives. In contrast to proxmox-backup-client, this supports both
-container/host and VM backups.
+Command line tool for restoring files and directories from PBS archives. In contrast to
+proxmox-backup-client, this supports both container/host and VM backups.
 

docs/proxmox-file-restore/man1.rst

@@ -1,17 +1,28 @@
-:orphan:
-
-====================
+==========================
 proxmox-file-restore
-====================
+==========================
+
+.. include:: ../epilog.rst
+
+-----------------------------------------------------------------------
+Command line tool for restoring files and directories from PBS archives
+-----------------------------------------------------------------------
+
+:Author: |AUTHOR|
+:Version: Version |VERSION|
+:Manual section: 1
+
 
 Synopsis
-========
+==========
 
 .. include:: synopsis.rst
 
+
 Description
 ============
 
 .. include:: description.rst
 
+
 .. include:: ../pbs-copyright.rst