Skip to content
Snippets Groups Projects

Use restrict key option and relative borg command

Merged Evangelos Foutras requested to merge simplify-borg_client-authorized_keys into master
3 files
+ 3
3
Compare changes
  • Side-by-side
  • Inline
Files
3
  • No functional change; the "restrict" key option is a shorthand for:
    
    - no-agent-forwarding
    - no-port-forwarding
    - no-X11-forwarding
    - no-pty
    - no-user-rc
    
    It was added in OpenSSH 7.2 (2016-02-29) as a convenient way to specify
    an authorized key should have "all current and future key restrictions"
    applied to it.
    
    Also switch to a relative borg command since its location is not really
    standardized; on rsync.net it appears to be located under usr/local/bin
    (though /usr/bin/borg works too, even if it doesn't exist!) and Hetzner
    just forces its own command, ignoring ours. :cat:
    
    The Borg documentation seems to agree with both the above alterations:
    
    [1] https://borgbackup.readthedocs.io/en/stable/usage/serve.html
@@ -37,5 +37,5 @@
user: borg
key: "{{ item.stdout }}"
manage_dir: true
key_options: "command=\"/usr/bin/borg serve --restrict-to-path {{ backup_dir }}/{{ item['item'] }}\",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc"
key_options: "command=\"borg serve --restrict-to-path {{ backup_dir }}/{{ item['item'] }}\",restrict"
with_items: "{{ ssh_keys.results }}"
Loading