Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris authored and chrisx8 committed Aug 7, 2021
2 parents ad1604c + e80f200 commit 5575341
Show file tree
Hide file tree
Showing 8 changed files with 728 additions and 354 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.2.0] - 2021-08-05

### Added

- Community page
- Support for yaml references and aliases

### Fixed

- Better verbose output for hooks
- Better error message for bad formatted configs

## [1.1.2] - 2021-07-11

### Fixes
Expand Down
3 changes: 1 addition & 2 deletions cmd/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ var backupCmd = &cobra.Command{
Use: "backup",
Short: "Create backups for given locations",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
CheckErr(err)
defer lock.Unlock()

internal.GetConfig()

selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err)
errors := 0
Expand Down
3 changes: 1 addition & 2 deletions cmd/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ var execCmd = &cobra.Command{
Use: "exec",
Short: "Execute arbitrary native restic commands for given backends",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
CheckErr(err)
defer lock.Unlock()

internal.GetConfig()

selected, err := internal.GetAllOrSelected(cmd, true)
CheckErr(err)
for _, name := range selected {
Expand Down
3 changes: 1 addition & 2 deletions cmd/forget.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ var forgetCmd = &cobra.Command{
Use: "forget",
Short: "Forget and optionally prune snapshots according the specified policies",
Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig()
err := lock.Lock()
CheckErr(err)
defer lock.Unlock()

internal.GetConfig()

selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err)
prune, _ := cmd.Flags().GetBool("prune")
Expand Down
4 changes: 2 additions & 2 deletions docs/markdown/_toc.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
> [Upgrade](/cli/upgrade)
[Examples](/examples)

[QA](/qa)

[Community](/community)
[Contributors](/contrib)

10 changes: 10 additions & 0 deletions docs/markdown/community.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 🏘 Community

A list of community driven projects. (No official affiliation)

- SystemD Units: https://gitlab.com/py_crash/autorestic-systemd-units
- Docker image: https://github.com/pascaliske/docker-autorestic
- Ansible Role: https://github.com/adsanz/ansible-restic-role
- Ansible Role: https://github.com/ItsNotGoodName/ansible-role-autorestic

> :ToCPrevNext
Loading

0 comments on commit 5575341

Please sign in to comment.