From 0e70386f81a7625701a192335e066ba65d5425cb Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Wed, 14 Oct 2015 18:29:46 +0200 Subject: [PATCH] Change default user include file location to .rs-backup/include --- README.md | 8 ++++---- client/etc/rs-backup/client-config | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 45ed7d2..db83f8b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ rs-backup-suite is designed for push backups, which means the client pushes its It is also a user-centric backup system. That means each user creates his own backup on the NAS instead of root backing up the whole machine at once (although this is possible). That also means that each user has a UNIX account on the NAS. The NAS username is usually `-` (e.g. `mymachine-johndoe`). -On the client machine(s) each user can create a file called `.rs-backup-include` (name is configurable) inside his home directory which includes the list of files that should be considered by the backup. Additionally root can maintain a similar file located at `/etc/rs-backup/include-files` for the system files. +On the client machine(s) each user can create a file called `.rs-backup/include` (name is configurable) inside his home directory which includes the list of files that should be considered by the backup. Additionally root can maintain a similar file located at `/etc/rs-backup/include-files` for the system files. ## Setup (please read this carefully before performing any actions!) rs-backup-suite is split into two parts: a client part for pushing the backup to the NAS and a server part which runs on the NAS itself. @@ -109,8 +109,8 @@ on your client machine. Then open the file `/etc/rs-backup/client-config` as roo On the client machines the script `/usr/bin/rs-backup-run` is used for performing the backups. This script can either be run as root or as an unprivileged user. The behavior differs in both cases: -* If run as root, all files and folder specified in `/etc/rs-backup/include-files` will be backed up. The backup user used for logging into the NAS is `hostname-root` by default (where `hostname` is the hostname of the current machine). Additionally the home directories of all users will be scanned. If a home directory contains a file called `.rs-backup-include` all files and folders specified inside that file will be backed up under this user's privileges. The username used for logging into the NAS is `hostname-username` (where `hostname` is again substituted for the hostname of the current machine and `username` for the user whose home directory is being backed up). -* If run as a normal user, only the files that are specified in your own `.rs-backup-include` will be backed up. +* If run as root, all files and folder specified in `/etc/rs-backup/include-files` will be backed up. The backup user used for logging into the NAS is `hostname-root` by default (where `hostname` is the hostname of the current machine). Additionally the home directories of all users will be scanned. If a home directory contains a file called `.rs-backup/include` all files and folders specified inside that file will be backed up under this user's privileges. The username used for logging into the NAS is `hostname-username` (where `hostname` is again substituted for the hostname of the current machine and `username` for the user whose home directory is being backed up). +* If run as a normal user, only the files that are specified in your own `.rs-backup/include` will be backed up. #### Changing the default configuration All the client configuration options are defined in `/etc/rs-backup/client-config`. You can edit the file as you wish. All parameters are documented clearly by comments. Most of these configuration options can also be overridden at runtime by passing command line arguments to `rs-backup-run`. For a list and a description of all possible command line arguments run @@ -134,7 +134,7 @@ The intended use case for rs-backup-suite is as follows: you set up the server p In the next step you edit the crontab for root on each client and add a job for running `/usr/bin/rs-backup-run` at certain times. You can of course also create a shell script that calls `rs-backup-run` and put it in `/etc/cron.daily` to perform a global backup once a day. -After everything is set up that way you create the file `/etc/rs-backup/include-file` and write to it a list of files and folders you want to back up as root (e.g. you can specify `/etc/***` to backup the whole `/etc` directory and all its subdirectories). Furthermore each user creates a file called `.rs-backup-include` inside his home directory that serves the same purpose for his own home directory instead of the global system. Such a file could look like this: +After everything is set up that way you create the file `/etc/rs-backup/include-file` and write to it a list of files and folders you want to back up as root (e.g. you can specify `/etc/***` to backup the whole `/etc` directory and all its subdirectories). Furthermore each user creates a file called `.rs-backup/include` inside his home directory that serves the same purpose for his own home directory instead of the global system. Such a file could look like this: - /home/johndoe/.cache/*** /home diff --git a/client/etc/rs-backup/client-config b/client/etc/rs-backup/client-config index 4e55bb5..d547a92 100644 --- a/client/etc/rs-backup/client-config +++ b/client/etc/rs-backup/client-config @@ -43,7 +43,7 @@ USER_LOG_FILE="rs-backup.user.log" # The format is the same as the global 'include-files' config file # and described in the FILTER RULES section of the rsync(1) man page. # If no such file is found inside a home directory, it won't be backup up -INCLUSION_PATTERN_FILE=".rs-backup-include" +INCLUSION_PATTERN_FILE=".rs-backup/include" # Log verbosity # (0 = quiet, 1 = errors only, 2 = errors and warnings, 3 = info, 4 = debug)