alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #3102 from tofran/remove-rclone-drive-use-tras-default-param

Browse source 
Remove `--drive-use-trash=false` from rclone param
This commit is contained in:
rawtaz 2020-11-17 11:21:20 +01:00 committed by GitHub
commit 1b6e8c888f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
changelog/unreleased/issue-3095 Normal file
View file

@ -0,0 +1,9 @@
Change: Remove `--drive-use-trash=false` from default rclone params
By default restic used launched rclone with --drive-use-trash=false,
since google drive trash retention policy changed, it is no longer required.
Rclone will now use what's provided in by the `--drive-use-trash
parameter, `drive-use-trash` config or RCLONE_CONFIG_*_USE_TRASH env
falling back to `true` as a default (as of: v1.53.2).
https://github.com/restic/restic/issues/3095

5
doc/030_preparing_a_new_repo.rst
View file

@ -601,10 +601,9 @@ For debugging rclone, you can set the environment variable ``RCLONE_VERBOSE=2``.
The rclone backend has two additional options: The rclone backend has two additional options:
* ``-o rclone.program`` specifies the path to rclone, the default value is just ``rclone`` * ``-o rclone.program`` specifies the path to rclone, the default value is just ``rclone``
* ``-o rclone.args`` allows setting the arguments passed to rclone, by default this is ``serve restic --stdio --b2-hard-delete --drive-use-trash=false`` * ``-o rclone.args`` allows setting the arguments passed to rclone, by default this is ``serve restic --stdio --b2-hard-delete``
The reason for the two last parameters (``--b2-hard-delete`` and The reason for the ``--b2-hard-delete`` parameters can be found in the corresponding GitHub `issue #1657`_.
``--drive-use-trash=false``) can be found in the corresponding GitHub `issue #1657`_.
In order to start rclone, restic will build a list of arguments by joining the In order to start rclone, restic will build a list of arguments by joining the
following lists (in this order): ``rclone.program``, ``rclone.args`` and as the following lists (in this order): ``rclone.program``, ``rclone.args`` and as the

4
internal/backend/rclone/config.go
View file

@ -10,14 +10,14 @@ import (
// Config contains all configuration necessary to start rclone. // Config contains all configuration necessary to start rclone.
type Config struct { type Config struct {
Program string `option:"program" help:"path to rclone (default: rclone)"` Program string `option:"program" help:"path to rclone (default: rclone)"`
Args string `option:"args" help:"arguments for running rclone (default: serve restic --stdio --b2-hard-delete --drive-use-trash=false)"` Args string `option:"args" help:"arguments for running rclone (default: serve restic --stdio --b2-hard-delete)"`
Remote string Remote string
Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 5)"` Connections uint `option:"connections" help:"set a limit for the number of concurrent connections (default: 5)"`
} }
var defaultConfig = Config{ var defaultConfig = Config{
Program: "rclone", Program: "rclone",
Args: "serve restic --stdio --b2-hard-delete --drive-use-trash=false", Args: "serve restic --stdio --b2-hard-delete",
Connections: 5, Connections: 5,
} }