diff --git a/config/samples/quickstart_continuous_server_backup_receiver.yml b/config/samples/quickstart_continuous_server_backup_receiver.yml index 8118c78..f590239 100644 --- a/config/samples/quickstart_continuous_server_backup_receiver.yml +++ b/config/samples/quickstart_continuous_server_backup_receiver.yml @@ -9,7 +9,4 @@ jobs: key: "/etc/zrepl/backups.key" client_cns: - "prod" - recv: - placeholder: - encryption: inherit # use 'off' if sender uses send.encrypted root_fs: "storage/zrepl/sink" diff --git a/config/samples/quickstart_continuous_server_backup_sender.yml b/config/samples/quickstart_continuous_server_backup_sender.yml index ca4d56c..e5ed54d 100644 --- a/config/samples/quickstart_continuous_server_backup_sender.yml +++ b/config/samples/quickstart_continuous_server_backup_sender.yml @@ -9,8 +9,8 @@ jobs: key: /etc/zrepl/prod.key server_cn: "backups" filesystems: { - "zroot/var/db": true, - "zroot/usr/home<": true, + "zroot<": true, + "zroot/var/tmp<": false, "zroot/usr/home/paranoid": false } snapshotting: diff --git a/docs/quickstart/continuous_server_backup.rst b/docs/quickstart/continuous_server_backup.rst index c19bec3..ef76d8c 100644 --- a/docs/quickstart/continuous_server_backup.rst +++ b/docs/quickstart/continuous_server_backup.rst @@ -9,13 +9,13 @@ This config example shows how we can backup our ZFS-based server to another mach * Production server ``prod`` with filesystems to back up: - * ``zroot/var/db`` - * ``zroot/usr/home`` and all its child filesystems - * **except** ``zroot/usr/home/paranoid`` belonging to a user doing backups themselves + * The entire pool ``zroot`` + * except ``zroot/var/tmp`` and all child datasets of it + * and except ``zroot/usr/home/paranoid`` which belongs to a user doing backups themselves. -* Backup server ``backups`` with +* Backup server ``backups`` with a dataset sub-tree for use by zrepl: - * Filesystem ``storage/zrepl/sink/prod`` + children dedicated to backups of ``prod`` + * In our example, that will be ``storage/zrepl/sink/prod``. Our backup solution should fulfill the following requirements: