$OpenBSD: patch-rsnapshot_1,v 1.3 2008/09/27 11:54:11 ajacoutot Exp $ --- rsnapshot.1.orig Fri Sep 19 11:02:40 2008 +++ rsnapshot.1 Fri Sep 19 11:05:44 2008 @@ -156,7 +156,7 @@ of cron jobs. It is possible, however, to run as any a with an alternate configuration file. .PP All important options are specified in a configuration file, which is -located by default at \fB/etc/rsnapshot.conf\fR. An alternate file can be +located by default at \fB${SYSCONFDIR}/rsnapshot.conf\fR. An alternate file can be specified on the command line. There are also additional options which can be passed on the command line. .PP @@ -179,14 +179,10 @@ The command line options are as follows: .RE .SH "CONFIGURATION" .IX Header "CONFIGURATION" -\&\fB/etc/rsnapshot.conf\fR is the default configuration file. All parameters -in this file must be separated by tabs. \fB/etc/rsnapshot.conf.default\fR +\&\fB${SYSCONFDIR}/rsnapshot.conf\fR is the default configuration file. All parameters +in this file must be separated by tabs. \fB${SAMPLES_DIR}/rsnapshot.conf.default\fR can be used as a reference. .PP -It is recommended that you copy \fB/etc/rsnapshot.conf.default\fR to -\&\fB/etc/rsnapshot.conf\fR, and then modify \fB/etc/rsnapshot.conf\fR to suit -your needs. -.PP Long lines may be split over several lines. \*(L"Continuation\*(R" lines \&\fBmust\fR begin with a space or a tab character. Continuation lines will have all leading and trailing whitespace stripped off, and then be appended @@ -807,7 +803,7 @@ also want to run it from the command line once or twic a feel for what it's doing. .Sp Here is an example crontab entry, assuming that backup levels \fBhourly\fR, -\&\fBdaily\fR, \fBweekly\fR and \fBmonthly\fR have been defined in \fB/etc/rsnapshot.conf\fR +\&\fBdaily\fR, \fBweekly\fR and \fBmonthly\fR have been defined in \fB${SYSCONFDIR}/rsnapshot.conf\fR .Sp .RS 4 \&\fB0 */4 * * * /usr/local/bin/rsnapshot hourly\fR @@ -852,7 +848,7 @@ your hourly snapshot will fail sometimes because the d .Sp Remember that these are just the times that the program runs. To set the number of backups stored, set the \fBretain\fR numbers in -\&\fB/etc/rsnapshot.conf\fR +\&\fB${SYSCONFDIR}/rsnapshot.conf\fR .Sp To check the disk space used by rsnapshot, you can call it with the \*(L"du\*(R" argument. .Sp @@ -963,7 +959,7 @@ run rsnapshot again, using example.com/etc as the opti .RS 4 .SH "FILES" .IX Header "FILES" -/etc/rsnapshot.conf +${SYSCONFDIR}/rsnapshot.conf .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fIrsync\fR\|(1), \fIssh\fR\|(1), \fIlogger\fR\|(1), \fIsshd\fR\|(1), \fIssh\-keygen\fR\|(1), \fIperl\fR\|(1), \fIcp\fR\|(1), \fIdu\fR\|(1), \fIcrontab\fR\|(1) @@ -988,8 +984,8 @@ Please report bugs (and other comments) to the rsnapsh \&\fBhttp://lists.sourceforge.net/lists/listinfo/rsnapshot\-discuss\fR .SH "NOTES" .IX Header "NOTES" -Make sure your /etc/rsnapshot.conf file has all elements separated by tabs. -See /etc/rsnapshot.conf.default for a working example file. +Make sure your ${SYSCONFDIR}/rsnapshot.conf file has all elements separated by tabs. +See ${SAMPLES_DIR}/rsnapshot.conf.default for a working example file. .Sp Make sure you put a trailing slash on the end of all directory references. If you don't, you may have extra directories created in your snapshots. @@ -1005,7 +1001,7 @@ If you would like regular users to be able to restore there are a number of ways this can be accomplished. One such scenario would be: .Sp -Set \fBsnapshot_root\fR to \fB/.private/.snapshots\fR in \fB/etc/rsnapshot.conf\fR +Set \fBsnapshot_root\fR to \fB/.private/.snapshots\fR in \fB${SYSCONFDIR}/rsnapshot.conf\fR .Sp Set the file permissions on these directories as follows: .Sp