Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple profile configuration #45

Merged
merged 38 commits into from
Feb 1, 2022
Merged

Multiple profile configuration #45

merged 38 commits into from
Feb 1, 2022

Commits on Jan 7, 2019

  1. moved env variables out into separate .env files, with inheritance fr… 

    …om _global
    @mfeif
    mfeif committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    765523c View commit details
    Browse the repository at this point in the history

  2. oops; wrong way to declare env variable for $HOME

    @mfeif
    mfeif committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    e186cc3 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2022

  1. Merge remote-tracking branch 'origin/master' into multi-repo 

    Resolved conflicts:
	etc/restic/b2_env.sh.template
	etc/restic/b2_pw.txt
	etc/restic/b2_pw.txt.template
	etc/restic/pw.txt
	etc/systemd/system/restic-backup@.service
	usr/local/sbin/restic_backup.sh
    @gerardbosch
    gerardbosch committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    a006731 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2022

  1. Extract configuration to env profiles 

    Improve organization of configurations by extracting them to different
environment files that enable different "backup profiles". Profiles are
loaded by passing them as systemd parameter.
    @gerardbosch
    gerardbosch committed Jan 16, 2022
    Configuration menu
    Copy the full SHA
    20705a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. Merge remote-tracking branch 'origin/master' into multi-repo 

    # Conflicts:
#	Makefile
    @gerardbosch
    gerardbosch committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    f136bab View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into multi-repo 

    # Conflicts:
#	README.md
    @gerardbosch
    gerardbosch committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    1be6878 View commit details
    Browse the repository at this point in the history

  3. Add root note on README

    @gerardbosch
    gerardbosch committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    53e246c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into multi-repo

    @gerardbosch
    gerardbosch committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    7a31380 View commit details
    Browse the repository at this point in the history

  5. Align with the latest additions from master

    @gerardbosch
    gerardbosch committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    13371f8 View commit details
    Browse the repository at this point in the history

  6. Test contribution to PR

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    58ac90d View commit details
    Browse the repository at this point in the history

  7. Brush up documentation in .env files

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    3842699 View commit details
    Browse the repository at this point in the history

  8. Fix .backup_exclude per backup path 

    This was wrong in master branch already.
    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    e534752 View commit details
    Browse the repository at this point in the history

  9. Prepare CHANGELOG.md

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    9a889c9 View commit details
    Browse the repository at this point in the history

  10. Clarify PREFIX installation

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    80ed04c View commit details
    Browse the repository at this point in the history

  11. Document in restic_*.sh how to run the scripts

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    d4c7e56 View commit details
    Browse the repository at this point in the history

  12. Make TL;DR in README more concise

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    f9e44fb View commit details
    Browse the repository at this point in the history

  13. Correct comment about restic crashing

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    d77c042 View commit details
    Browse the repository at this point in the history

  14. Find backup exlude files in home directores again

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    424bb0c View commit details
    Browse the repository at this point in the history

  15. Explain how backup exclude files works in README

    @erikw
    erikw committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    a49f672 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2022

  1. Fix spell

    @gerardbosch
    gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    9eb647d View commit details
    Browse the repository at this point in the history

  2. Update usr/local/sbin/restic_backup.sh 

    Co-authored-by: Gerard Bosch <30733556+gerardbosch@users.noreply.github.com>
    @erikw @gerardbosch
    erikw and gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    b6b7764 View commit details
    Browse the repository at this point in the history

  3. Update usr/local/sbin/restic_backup.sh 

    Co-authored-by: Gerard Bosch <30733556+gerardbosch@users.noreply.github.com>
    @erikw @gerardbosch
    erikw and gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    6c16b60 View commit details
    Browse the repository at this point in the history

  4. Extract global exclude file into env RESTIC_BACKUP_EXCLUDE

    @gerardbosch
    gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    4675d99 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/multi-repo' into multi-repo

    @gerardbosch
    gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    38f9d5e View commit details
    Browse the repository at this point in the history

  6. Align suggested function name with the call-site name

    @gerardbosch
    gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    47a6155 View commit details
    Browse the repository at this point in the history

  7. Add sudo note on make install

    @gerardbosch
    gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    d689f80 View commit details
    Browse the repository at this point in the history

  8. Fix exclusion args function return 

    Not quoting the returned value caused that leading space was lost,
resulting in incorrect exclusion argument list.
    @gerardbosch
    gerardbosch committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    9c384bc View commit details
    Browse the repository at this point in the history

  9. Fix duplicate exclusion argument entries 

    It happens that when backup paths contains the homedir of a user,
exclusion file is computed by duplicate: one time by being a backup path
and another time for being a homedir.multi-repo

Having duplicate arguments seems to make no harm (other than probably
making restic parser do the job twice), but is weird and probably not
desirable.

This solution is not ideal but a workaround for now.
    @gerardbosch
    gerardbosch committed Jan 18, 2022
    1 Configuration menu
    Copy the full SHA
    066f6f9 View commit details
    Browse the repository at this point in the history

  10. Remove automatic /home/user\*/.backup_exclude feature 

    As discussed in #45, this aims at solving a problem larger than the
scope of this project. Thus simplify and remove.
    @erikw
    erikw committed Jan 18, 2022
    Configuration menu
    Copy the full SHA
    2ba0864 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. After removing the home exclusions feature, sort_unique became dead code

    @gerardbosch
    gerardbosch committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    ef41587 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. README update suggestions from @mfeif

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    1494871 View commit details
    Browse the repository at this point in the history

  2. Fix URL sytnax

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    e898fef View commit details
    Browse the repository at this point in the history

  3. Random sleep on service execution

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    cda0230 View commit details
    Browse the repository at this point in the history

  4. Notes on password setup

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    0a4475c View commit details
    Browse the repository at this point in the history

  5. README note

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    c2c6e75 View commit details
    Browse the repository at this point in the history

  6. Replace bash RANDOM with simpler to read shuf(1)

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    df411de View commit details
    Browse the repository at this point in the history

  7. s/RESTIC_BACKUP_EXCLUDE/RESTIC_BACKUP_EXCLUDE_FILE/

    @erikw
    erikw committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    ccd769d View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. PR feedback fixes in README

    @erikw
    erikw committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    ce62520 View commit details
    Browse the repository at this point in the history