borgbackup 1.4.0rc1__tar.gz → 1.4.1__tar.gz

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/CHANGES.rst

@@ -311,8 +311,11 @@ Upgrade Notes
 borg 1.2.x to 1.4.x
 -------------------
 
-Coming from borg 1.2 there are no upgrade steps needed - just make sure you
-already have done the previous upgrade steps up to 1.2.7.
+If you currently use borg 1.2.5+: no upgrade steps needed (if you already did
+them when upgrading to that version, otherwise see below).
+
+If you currently use borg 1.2.0 .. 1.2.4, read and follow "Pre-1.2.5 archives
+spoofing vulnerability (CVE-2023-36811)" section, see the top of this changelog.
 
 Compatibility notes:
 
@@ -411,13 +414,109 @@ Compatibility notes:
 Change Log
 ==========
 
-
-Version 1.4.0rc1 (2024-05-26)
------------------------------
+Version 1.4.1 (2025-04-19)
+--------------------------
 
 For upgrade and compatibility hints, please also read the section "Upgrade Notes"
 above.
 
+New features:
+
+- prune: add 13weekly and 3monthly quarterly pruning strategies, #8337
+- add BORG_USE_CHUNKS_ARCHIVE env var as a cleaner way to control whether
+  borg shall use chunks.archive.d/ cache directory. the previous "hack" to
+  create a non-directory file at that place is still supported.
+- compact: support --dry-run (do nothing) to simplify scripting, #8300
+- add {unixtime} placeholder, #8522
+- macOS: retrieve birthtime in nanosecond precision via system call, #8724
+- implement padme chunk size obfuscation (SPEC 250), #8705
+
+Fixes:
+
+- borg exits when assertions are disabled with Python optimizations, #8649
+- fix remote repository exception handling / modern exit codes, #8631
+- config: fix acceptance of storage_quota 0, #8499
+- config: reject additional_free_space < 10M (but accept 0), #6066
+- check: more consistent messaging considering --repair, #8533
+- yes: deal with UnicodeDecodeError in input(), #6984
+- fix WORKAROUNDS=authenticated_no_key support for archive TAM authentication,
+  #8400
+- diff: do not assert on diff if hard link sources are not found due to
+  exclusions, #8344
+- diff:
+
+  - suppress modified changes for files which weren't actually modified in JSON
+    output, #8334
+  - ensure that 0B changes are hidden from text diffs, too.
+  - remove 0-added,0-removed modified entries from JSON output.
+- try to rebuild cache if an exception is raised, #5213
+- freebsd: fix nfs4 acl processing, #8756.
+  This issue only affected borg extract --numeric-ids when processing NFS4
+  ACLs, it didn't affect POSIX ACL processing.
+
+Other changes:
+
+- support and test on Python 3.13
+- use Cython 3.0.12
+- filter LibreSSL related warnings on OpenBSD
+- docs:
+
+  - update install docs, nothing bundled anymore, #8342
+  - clarify excluded and included flags for dry-run, #8556
+  - small changes regarding compression, #8542
+  - clean up entries regarding SSH settings, link to recommended ones, #8542
+  - borg/borgfs detects internally under which name it was invoked, #8207
+  - binary: using the directory build is faster, #8008
+  - add readme of the binaries
+  - mount: document on-demand loading, perf tips, #7173
+  - better link modern return codes, #8370
+  - update repository URLs in docs to use new syntax, #8361
+  - align /etc/backups path references in automated backups deployment guide
+  - mount docs: apply jdchristensen's suggestion, better phrasing.
+  - FAQ: Why is backing up an unmodified FAT filesystem slow on Linux?
+  - FAQ: Why are backups slow on a Linux server that is a member of a windows domain?
+  - FAQ: add entry about pure-python msgpack warning, #8323
+  - modify docs for automated backup to append to SYSTEMD_WANTS rather than overwrite, #8641
+  - fix udev rule priority in automated-local.rst, #8639
+  - clarify requirements when using command line options with special characters within a shell, #8628
+  - work around sudden failure of sphinx ini lexer
+  - readthedocs theme fixes
+
+    - bring back highlighted content preview in search results.
+    - fix erroneous warning about missing javascript support.
+- tests:
+
+  - github CI: windows msys2 build: broken, disable it for now, #8264
+  - improve borg check --repair healing tests, #8302
+  - fix hourly prune test failure due to local timezone
+  - ignore `com.apple.provenance` xattr (macOS specific)
+- vagrant:
+
+  - pyenv: only use Python 3.11.12, use this for binary build
+  - macos: give more memory
+  - install rust on BSD
+  - add FreeBSD 13 box, for #8266
+  - fix OpenBSD box, #8506
+  - use a bento/ubuntu-24.04 box for now
+
+
+Version 1.4.0 (2024-07-03)
+--------------------------
+
+Other changes:
+
+- vagrant: revive the buster64 box, RHEL8 has same glibc
+- tests: fix pytest_report_header, #8232
+- docs:
+
+  - mount: add examples using :: positional argument, #8255
+  - Installation: update Arch Linux repo name
+  - update standalone binary section
+
+
+Version 1.4.0rc1 (2024-05-26)
+-----------------------------
+
 Fixes:
 
 - setup.py: fix import error reporting for cythonize import, #8208

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2024 The Borg Collective (see AUTHORS file)
+Copyright (C) 2015-2025 The Borg Collective (see AUTHORS file)
 Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
 All rights reserved.
 

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: borgbackup
-Version: 1.4.0rc1
+Version: 1.4.1
 Summary: Deduplicated, encrypted, authenticated and compressed backups
 Author: The Borg Collective (see AUTHORS file)
 Maintainer-email: Thomas Waldmann <tw@waldmann-edv.de>
@@ -26,6 +26,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Security :: Cryptography
 Classifier: Topic :: System :: Archiving :: Backup
 Requires-Python: >=3.9
@@ -38,6 +39,8 @@ Requires-Dist: llfuse>=1.3.8; extra == "llfuse"
 Provides-Extra: pyfuse3
 Requires-Dist: pyfuse3>=3.1.1; extra == "pyfuse3"
 Provides-Extra: nofuse
+Dynamic: description
+Dynamic: license-file
 
 
 What is BorgBackup?

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/SECURITY.md

@@ -4,12 +4,12 @@
 
 These borg releases are currently supported with security updates.
 
-| Version | Supported              |
-|---------|------------------------|
-| 1.4.x   | :x: (not released yet) |
-| 1.2.x   | :white_check_mark:     |
-| 1.1.x   | :x:                    |
-| < 1.1   | :x:                    |
+| Version | Supported          |
+|---------|--------------------|
+| 1.4.x   | :white_check_mark: |
+| 1.2.x   | :white_check_mark: |
+| 1.1.x   | :x:                |
+| < 1.1   | :x:                |
 
 ## Reporting a Vulnerability
 

borgbackup-1.4.1/docs/_templates/layout.html

@@ -0,0 +1,173 @@
+{%- extends "basic/layout.html" %}
+
+{# Do this so that bootstrap is included before the main css file #}
+{%- block htmltitle %}
+  {% set script_files = script_files + ["_static/myscript.js"] %}
+  <!-- Licensed under the Apache 2.0 License -->
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/fonts/open-sans/stylesheet.css', 1) }}" />
+  <!-- Licensed under the SIL Open Font License -->
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/fonts/source-serif-pro/source-serif-pro.css', 1) }}" />
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/css/bootstrap.min.css', 1) }}" />
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/css/bootstrap-theme.min.css', 1) }}" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  {{ super() }}
+{%- endblock %}
+
+{%- block extrahead %}
+  {% if theme_touch_icon %}
+  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
+  {% endif %}
+  {{ super() }}
+{% endblock %}
+
+{# Displays the URL for the homepage if it's set or the master_doc if it is not #}
+{% macro homepage() -%}
+  {%- if theme_homepage %}
+    {%- if hasdoc(theme_homepage) %}
+      {{ pathto(theme_homepage) }}
+    {%- else %}
+      {{ theme_homepage }}
+    {%- endif %}
+  {%- else %}
+    {{ pathto(master_doc) }}
+  {%- endif %}
+{%- endmacro %}
+
+{# Displays the URL for the tospage if it's set or falls back to homepage macro #}
+{% macro tospage() -%}
+  {%- if theme_tospage %}
+    {%- if hasdoc(theme_tospage) %}
+      {{ pathto(theme_tospage) }}
+    {%- else %}
+      {{ theme_tospage }}
+    {%- endif %}
+  {%- else %}
+    {{ homepage() }}
+  {%- endif %}
+{%- endmacro %}
+
+{# Displays the URL for the projectpage if it's set or falls back to homepage macro #}
+{% macro projectlink() -%}
+  {%- if theme_projectlink %}
+    {%- if hasdoc(theme_projectlink) %}
+      {{ pathto(theme_projectlink) }}
+    {%- else %}
+      {{ theme_projectlink }}
+    {%- endif %}
+  {%- else %}
+    {{ homepage() }}
+  {%- endif %}
+{%- endmacro %}
+
+{# Displays the next and previous links both before and after content #}
+{% macro render_relations() -%}
+  {% if prev or next %}
+  <div class="footer-relations">
+    {% if prev %}
+      <div class="pull-left">
+        <a class="btn btn-default" href="{{ prev.link|e }}" title="{{ _('previous chapter')}} (use the left arrow)">{{ prev.title }}</a>
+      </div>
+    {% endif %}
+    {%- if next and next.title != '&lt;no title&gt;' %}
+      <div class="pull-right">
+        <a class="btn btn-default" href="{{ next.link|e }}" title="{{ _('next chapter')}} (use the right arrow)">{{ next.title }}</a>
+      </div>
+    {%- endif %}
+    </div>
+    <div class="clearer"></div>
+  {% endif %}
+{%- endmacro %}
+
+{%- macro guzzle_sidebar() %}
+  <div id="left-column">
+    <div class="sphinxsidebar">
+      {%- if sidebars != None %}
+        {#- new style sidebar: explicitly include/exclude templates #}
+        {%- for sidebartemplate in sidebars %}
+        {%- include sidebartemplate %}
+        {%- endfor %}
+      {% else %}
+        {% include "logo-text.html" %}
+        {% include "globaltoc.html" %}
+        {% include "searchbox.html" %}
+      {%- endif %}
+    </div>
+  </div>
+{%- endmacro %}
+
+{%- block content %}
+
+  {%- if pagename == 'index' and theme_index_template %}
+    {% include theme_index_template %}
+  {%- else %}
+    <div class="container-wrapper">
+
+      <div id="mobile-toggle">
+        <a href="#"><span class="glyphicon glyphicon-align-justify" aria-hidden="true"></span></a>
+      </div>
+
+      {%- block sidebar1 %}{{ guzzle_sidebar() }}{% endblock %}
+
+      {%- block document_wrapper %}
+        {%- block document %}
+        <div id="right-column">
+          {% block breadcrumbs %}
+          <div role="navigation" aria-label="breadcrumbs navigation">
+            <ol class="breadcrumb">
+              <li><a href="{{ pathto(master_doc) }}">Docs</a></li>
+              {% for doc in parents %}
+                <li><a href="{{ doc.link|e }}">{{ doc.title }}</a></li>
+              {% endfor %}
+              <li>{{ title }}</li>
+            </ol>
+          </div>
+          {% endblock %}
+          <div class="document clearer body" role="main">
+            {% block body %} {% endblock %}
+          </div>
+          {%- block bottom_rel_links %}
+            {{ render_relations() }}
+          {%- endblock %}
+        </div>
+        <div class="clearfix"></div>
+        {%- endblock %}
+      {%- endblock %}
+
+      {%- block comments -%}
+        {% if theme_disqus_comments_shortname %}
+        <div class="container comment-container">
+          {% include "comments.html" %}
+        </div>
+        {% endif %}
+      {%- endblock %}
+    </div>
+  {%- endif %}
+  {%- endblock %}
+
+{%- block footer %}
+<script type="text/javascript">
+  $("#mobile-toggle a").click(function () {
+    $("#left-column").toggle();
+  });
+</script>
+<script type="text/javascript" src="{{ pathto('_static/js/bootstrap.js', 1)}}"></script>
+{%- block footer_wrapper %}
+  <div class="footer">
+    &copy; Copyright {{ copyright }}. Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
+  </div>
+{%- endblock %}
+{%- block ga %}
+  {%- if theme_google_analytics_account %}
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', '{{ theme_google_analytics_account }}']);
+      _gaq.push(['_trackPageview']);
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
+  {%- endif %}
+{%- endblock %}
+{%- endblock %}

borgbackup-1.4.1/docs/binaries/00_README.txt

@@ -0,0 +1,87 @@
+Binary BorgBackup builds
+========================
+
+The binaries are supposed to work on the specified platform without installing
+any dependencies.
+
+
+Download the correct files
+--------------------------
+
+amd64 / x86_64 architecture
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+borg-linux-glibc236 Linux (built on Debian 12 "Bookworm" with glibc 2.36)
+borg-linux-glibc231 Linux (built on Debian 11 "Bullseye" with glibc 2.31)
+borg-linux-glibc228 Linux (built on Debian 10 "Buster" with glibc 2.28)
+                    Note: you can also try them on other Linuxes with other glibc
+                    versions - as long as the glibc is compatible, they will work.
+                    If it doesn't work, try a borg 1.2.x binary.
+
+borg-macos1012      macOS (built on macOS Sierra 10.12 with latest macFUSE from brew)
+                    To avoid signing issues download the file via command line OR
+                    remove the "quarantine" attribute after downloading:
+                    $ xattr -dr com.apple.quarantine borg-macos.tgz
+
+borg-freebsd13      FreeBSD (built on FreeBSD 13)
+borg-freebsd14      FreeBSD (built on FreeBSD 14)
+
+*.tgz               similar to above, but built as a directory with files,
+                    not as a single self-extracting binary. using the directory
+                    build is faster and doesn't need as much space in the temp
+                    directory as the one-file build.
+*.asc               GnuPG signatures for *
+
+
+Verifying your download
+-----------------------
+
+Please check the GPG signature to make sure you received the binary as I have
+built it.
+
+To check the GPG signature, download both the binary and the corresponding
+*.asc file and then (on the shell) type, e.g.:
+
+    gpg --recv-keys 9F88FB52FAF7B393
+    gpg --verify borg-freebsd.asc borg-freebsd
+
+The files are signed by:
+
+Thomas Waldmann <tw@waldmann-edv.de>
+GPG key fingerprint: 6D5B EF9A DD20 7580 5747 B70F 9F88 FB52 FAF7 B393
+
+My fingerprint is also in the footer of all my borgbackup mailing list posts.
+
+
+Installing
+----------
+
+It is suggested that you rename or symlink the binary to just "borg".
+If you need "borgfs", just also symlink it to the same binary, it will
+detect internally under which name it was invoked.
+
+On UNIX-like platforms, /usr/local/bin/ or ~/bin/ is a nice place for it,
+but you can invoke it from every place by giving a full path to it.
+
+Make sure the file is readable and executable (chmod +rx borg on UNIX-like
+platforms).
+
+
+Reporting issues
+----------------
+
+Please first check the FAQ and whether a github issue already exists.
+
+If you find a NEW issue, please open a ticket on our issue tracker:
+
+https://github.com/borgbackup/borg/issues/
+
+There, please give:
+- the version number (it is displayed if you invoke borg -V)
+- the sha256sum of the binary
+- a good description of what the issue is
+- a good description of how to reproduce your issue
+- a traceback with system info (if you have one)
+- your precise platform (CPU, 32/64bit?), OS, distribution, release
+- your python and (g)libc version
+

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/docs/changes.rst

@@ -311,8 +311,11 @@ Upgrade Notes
 borg 1.2.x to 1.4.x
 -------------------
 
-Coming from borg 1.2 there are no upgrade steps needed - just make sure you
-already have done the previous upgrade steps up to 1.2.7.
+If you currently use borg 1.2.5+: no upgrade steps needed (if you already did
+them when upgrading to that version, otherwise see below).
+
+If you currently use borg 1.2.0 .. 1.2.4, read and follow "Pre-1.2.5 archives
+spoofing vulnerability (CVE-2023-36811)" section, see the top of this changelog.
 
 Compatibility notes:
 
@@ -411,13 +414,109 @@ Compatibility notes:
 Change Log
 ==========
 
-
-Version 1.4.0rc1 (2024-05-26)
------------------------------
+Version 1.4.1 (2025-04-19)
+--------------------------
 
 For upgrade and compatibility hints, please also read the section "Upgrade Notes"
 above.
 
+New features:
+
+- prune: add 13weekly and 3monthly quarterly pruning strategies, #8337
+- add BORG_USE_CHUNKS_ARCHIVE env var as a cleaner way to control whether
+  borg shall use chunks.archive.d/ cache directory. the previous "hack" to
+  create a non-directory file at that place is still supported.
+- compact: support --dry-run (do nothing) to simplify scripting, #8300
+- add {unixtime} placeholder, #8522
+- macOS: retrieve birthtime in nanosecond precision via system call, #8724
+- implement padme chunk size obfuscation (SPEC 250), #8705
+
+Fixes:
+
+- borg exits when assertions are disabled with Python optimizations, #8649
+- fix remote repository exception handling / modern exit codes, #8631
+- config: fix acceptance of storage_quota 0, #8499
+- config: reject additional_free_space < 10M (but accept 0), #6066
+- check: more consistent messaging considering --repair, #8533
+- yes: deal with UnicodeDecodeError in input(), #6984
+- fix WORKAROUNDS=authenticated_no_key support for archive TAM authentication,
+  #8400
+- diff: do not assert on diff if hard link sources are not found due to
+  exclusions, #8344
+- diff:
+
+  - suppress modified changes for files which weren't actually modified in JSON
+    output, #8334
+  - ensure that 0B changes are hidden from text diffs, too.
+  - remove 0-added,0-removed modified entries from JSON output.
+- try to rebuild cache if an exception is raised, #5213
+- freebsd: fix nfs4 acl processing, #8756.
+  This issue only affected borg extract --numeric-ids when processing NFS4
+  ACLs, it didn't affect POSIX ACL processing.
+
+Other changes:
+
+- support and test on Python 3.13
+- use Cython 3.0.12
+- filter LibreSSL related warnings on OpenBSD
+- docs:
+
+  - update install docs, nothing bundled anymore, #8342
+  - clarify excluded and included flags for dry-run, #8556
+  - small changes regarding compression, #8542
+  - clean up entries regarding SSH settings, link to recommended ones, #8542
+  - borg/borgfs detects internally under which name it was invoked, #8207
+  - binary: using the directory build is faster, #8008
+  - add readme of the binaries
+  - mount: document on-demand loading, perf tips, #7173
+  - better link modern return codes, #8370
+  - update repository URLs in docs to use new syntax, #8361
+  - align /etc/backups path references in automated backups deployment guide
+  - mount docs: apply jdchristensen's suggestion, better phrasing.
+  - FAQ: Why is backing up an unmodified FAT filesystem slow on Linux?
+  - FAQ: Why are backups slow on a Linux server that is a member of a windows domain?
+  - FAQ: add entry about pure-python msgpack warning, #8323
+  - modify docs for automated backup to append to SYSTEMD_WANTS rather than overwrite, #8641
+  - fix udev rule priority in automated-local.rst, #8639
+  - clarify requirements when using command line options with special characters within a shell, #8628
+  - work around sudden failure of sphinx ini lexer
+  - readthedocs theme fixes
+
+    - bring back highlighted content preview in search results.
+    - fix erroneous warning about missing javascript support.
+- tests:
+
+  - github CI: windows msys2 build: broken, disable it for now, #8264
+  - improve borg check --repair healing tests, #8302
+  - fix hourly prune test failure due to local timezone
+  - ignore `com.apple.provenance` xattr (macOS specific)
+- vagrant:
+
+  - pyenv: only use Python 3.11.12, use this for binary build
+  - macos: give more memory
+  - install rust on BSD
+  - add FreeBSD 13 box, for #8266
+  - fix OpenBSD box, #8506
+  - use a bento/ubuntu-24.04 box for now
+
+
+Version 1.4.0 (2024-07-03)
+--------------------------
+
+Other changes:
+
+- vagrant: revive the buster64 box, RHEL8 has same glibc
+- tests: fix pytest_report_header, #8232
+- docs:
+
+  - mount: add examples using :: positional argument, #8255
+  - Installation: update Arch Linux repo name
+  - update standalone binary section
+
+
+Version 1.4.0rc1 (2024-05-26)
+-----------------------------
+
 Fixes:
 
 - setup.py: fix import error reporting for cythonize import, #8208

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/docs/conf.py

@@ -42,7 +42,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Borg - Deduplicating Archiver'
-copyright = '2010-2014 Jonas Borgström, 2015-2024 The Borg Collective (see AUTHORS file)'
+copyright = '2010-2014 Jonas Borgström, 2015-2025 The Borg Collective (see AUTHORS file)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -113,6 +113,7 @@ def set_rst_settings(app):
 
 
 def setup(app):
+    app.setup_extension('sphinxcontrib.jquery')
     app.add_css_file('css/borg.css')
     app.connect('builder-inited', set_rst_settings)
 
@@ -258,6 +259,8 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
+    'sphinxcontrib.jquery',  # jquery is not included anymore by default
+    'guzzle_sphinx_theme',  # register the theme as an extension to generate a sitemap.xml
 ]
 
 extlinks = {

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/docs/deployment/automated-local.rst

@@ -32,9 +32,9 @@ All configuration goes into this directory.
 Find out the ID of the partition table of your backup disk (here assumed to be /dev/sdz):
     lsblk --fs -o +PTUUID /dev/sdz
 
-Then, create ``/etc/backups/40-backup.rules`` with the following content (all on one line)::
+Then, create ``/etc/backups/80-backup.rules`` with the following content (all on one line)::
 
-    ACTION=="add", SUBSYSTEM=="block", ENV{ID_PART_TABLE_UUID}=="<the PTUUID you just noted>", TAG+="systemd", ENV{SYSTEMD_WANTS}="automatic-backup.service"
+    ACTION=="add", SUBSYSTEM=="block", ENV{ID_PART_TABLE_UUID}=="<the PTUUID you just noted>", TAG+="systemd", ENV{SYSTEMD_WANTS}+="automatic-backup.service"
 
 The "systemd" tag in conjunction with the SYSTEMD_WANTS environment variable has systemd
 launch the "automatic-backup" service, which we will create next, as the
@@ -150,7 +150,7 @@ modify it to suit your needs (e.g. more backup sets, dumping databases etc.).
     fi
 
 Create the ``/etc/backups/autoeject`` file to have the script automatically eject the drive
-after creating the backup. Rename the file to something else (e.g. ``/etc/backup/autoeject-no``)
+after creating the backup. Rename the file to something else (e.g. ``/etc/backups/autoeject-no``)
 when you want to do something with the drive after creating backups (e.g running check).
 
 Create the ``/etc/backups/backup-suspend`` file if the machine should suspend after completing
@@ -164,7 +164,7 @@ The last part is to actually enable the udev rules and services:
 
 .. code-block:: bash
 
-    ln -s /etc/backups/40-backup.rules /etc/udev/rules.d/40-backup.rules
+    ln -s /etc/backups/80-backup.rules /etc/udev/rules.d/80-backup.rules
     ln -s /etc/backups/automatic-backup.service /etc/systemd/system/automatic-backup.service
     systemctl daemon-reload
     udevadm control --reload
@@ -177,7 +177,7 @@ Find the UUID of the file system that backups should be stored on::
 
     lsblk -o+uuid,label
 
-Note the UUID into the ``/etc/backup/backup.disks`` file.
+Note the UUID into the ``/etc/backups/backup.disks`` file.
 
 Mount the drive to /mnt/backup.
 
@@ -198,7 +198,7 @@ Security considerations
 -----------------------
 
 The script as shown above will mount any file system with an UUID listed in
-``/etc/backup/backup.disks``. The UUID check is a safety / annoyance-reduction
+``/etc/backups/backup.disks``. The UUID check is a safety / annoyance-reduction
 mechanism to keep the script from blowing up whenever a random USB thumb drive is connected.
 It is not meant as a security mechanism. Mounting file systems and reading repository
 data exposes additional attack surfaces (kernel file system drivers,

{borgbackup-1.4.0rc1 → borgbackup-1.4.1}/docs/deployment/central-backup-server.rst

@@ -81,7 +81,7 @@ The options which are added to the key will perform the following:
 Due to the ``cd`` command we use, the server automatically changes the current
 working directory. Then client doesn't need to have knowledge of the absolute
 or relative remote repository path and can directly access the repositories at
-``<user>@<host>:<repo>``.
+``ssh://<user>@<host>/./<repo>``.
 
 .. note:: The setup above ignores all client given commandline parameters
           which are normally appended to the `borg serve` command.
@@ -93,21 +93,21 @@ The client needs to initialize the `pictures` repository like this:
 
 ::
 
- borg init backup@backup01.srv.local:pictures
+ borg init ssh://backup@backup01.srv.local/./pictures
 
 Or with the full path (should actually never be used, as only for demonstrational purposes).
 The server should automatically change the current working directory to the `<client fqdn>` folder.
 
 ::
 
-  borg init backup@backup01.srv.local:/home/backup/repos/johndoe.clnt.local/pictures
+  borg init ssh://backup@backup01.srv.local/home/backup/repos/johndoe.clnt.local/pictures
 
 When `johndoe.clnt.local` tries to access a not restricted path the following error is raised.
 John Doe tries to backup into the Web 01 path:
 
 ::
 
-  borg init backup@backup01.srv.local:/home/backup/repos/web01.srv.local/pictures
+  borg init ssh://backup@backup01.srv.local/home/backup/repos/web01.srv.local/pictures
 
 ::