Skip to content

Commit

Permalink
prep for 0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Aug 2, 2014
1 parent ca5b6f4 commit ff8b189
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 42 deletions.
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ znapzend - A ZFS backup system
Copyright by Dominik Hassler, Tobias Oetiker and the other people listed
in the AUTHORS file.

2014-08-01
2014-08-02

All rights reserved.

Expand Down
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ dist_bin_SCRIPTS = $(BIN)
imandir = $(mandir)/man1
iman_DATA = $(MAN)

doc/%.pod: bin/% VERSION
doc/%.pod: bin/% configure
$(AM_V_GEN)mkdir -p doc;grep -A100000 '=head1 NAME' $< > $@

man/%.1: bin/% VERSION
man/%.1: bin/% configure
$(AM_V_GEN)mkdir -p man; test $(POD2MAN) = "no" || $(POD2MAN) --release=$(VERSION) --center=$(PACKAGE_NAME) $< > $@

README.md COPYRIGHT: VERSION
README.md COPYRIGHT: configure
$(AM_V_GEN)$(PERL) -i -p -e 's/\d{4}-\d{2}-\d{2}/$(DATE)/g;s/\d+\.\d+\.\d+/$(PACKAGE_VERSION)/g' $@

install-exec-hook:
Expand Down
6 changes: 3 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -824,13 +824,13 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-imanDATA \
uninstall-imanDATA uninstall-svcDATA


doc/%.pod: bin/% VERSION
doc/%.pod: bin/% configure
$(AM_V_GEN)mkdir -p doc;grep -A100000 '=head1 NAME' $< > $@

man/%.1: bin/% VERSION
man/%.1: bin/% configure
$(AM_V_GEN)mkdir -p man; test $(POD2MAN) = "no" || $(POD2MAN) --release=$(VERSION) --center=$(PACKAGE_NAME) $< > $@

README.md COPYRIGHT: VERSION
README.md COPYRIGHT: configure
$(AM_V_GEN)$(PERL) -i -p -e 's/\d{4}-\d{2}-\d{2}/$(DATE)/g;s/\d+\.\d+\.\d+/$(PACKAGE_VERSION)/g' $@

install-exec-hook:
Expand Down
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ZnapZend 0.9.1
ZnapZend 0.10.0
==============

[![Build Status](https://travis-ci.org/oetiker/znapzend.svg?branch=master)](https://travis-ci.org/oetiker/znapzend)
Expand All @@ -17,12 +17,12 @@ Zetup Zimple
There are two ways to get going with znapzend. The way of the real sysadmin
(as described below) or you can take the simple way out and download our
prebuilt release. It comes with all the perlmodules required for running
znapzend with a copy of perl as old as 0.9.1:
znapzend with a copy of perl as old as 0.10.0:

```sh
wget https://github.com/oetiker/znapzend/releases/download/v0.9.1/znapzend-prebuilt-0.9.1.tar.gz
tar zxvf znapzend-prebuilt-0.9.1.tar.gz
cp -rp znapzend-prebuilt-0.9.1 /opt/znapzend-0.9.1
wget https://github.com/oetiker/znapzend/releases/download/v0.10.0/znapzend-prebuilt-0.10.0.tar.gz
tar zxvf znapzend-prebuilt-0.10.0.tar.gz
cp -rp znapzend-prebuilt-0.10.0 /opt/znapzend-0.10.0
```

Read on in the [Configuration](#configuration) Section.
Expand All @@ -35,15 +35,15 @@ with all the tools and trimmings for building stuff, follow these zimple
inztructionz below to get a cusom made copy of znapzend.

```sh
wget https://github.com/oetiker/znapzend/releases/download/v0.9.1/znapzend-0.9.1.tar.gz
tar zxvf znapzend-0.9.1.tar.gz
cd znapzend-0.9.1
./configure --prefix=/opt/znapzend-0.9.1
wget https://github.com/oetiker/znapzend/releases/download/v0.10.0/znapzend-0.10.0.tar.gz
tar zxvf znapzend-0.10.0.tar.gz
cd znapzend-0.10.0
./configure --prefix=/opt/znapzend-0.10.0
```
if configure complains about missing perl modules, run

```sh
./setup/build-thirdparty.sh /opt/znapzend-0.9.1/thirdparty
./setup/build-thirdparty.sh /opt/znapzend-0.10.0/thirdparty
```

to install the missing modules into the specified directry. This will NOT messup your local perl installation!
Expand All @@ -68,19 +68,19 @@ The [znapzend](doc/znapzend.pod) demon is responsible for doing the actual backu
To see if your configuration is any good, run znapzend in noaction mode first.

```sh
/opt/znapzend-0.9.1/bin/znapzend --noaction --debug
/opt/znapzend-0.10.0/bin/znapzend --noaction --debug
```

If you don't want to wait for the scheduler to actually schedule work, you can also force immediate action by calling

```sh
/opt/znapzend-0.9.1/bin/znapzend --noaction --debug --runonce=<src_dataset>
/opt/znapzend-0.10.0/bin/znapzend --noaction --debug --runonce=<src_dataset>
```

then when you are happy with what you got, start it in daemon mode.

```sh
/opt/znapzend-0.9.1/bin/znapzend --daemonize
/opt/znapzend-0.10.0/bin/znapzend --daemonize
```

Best is to integrate znapzend into your system startup sequence, but you can also
Expand Down Expand Up @@ -121,4 +121,4 @@ And if you have a contribution, please send a pull request.
Enjoy!

Dominik Hassler & Tobi Oetiker
2014-08-01
2014-08-02
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.1
0.10.0
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for znapzend 0.9.1.
# Generated by GNU Autoconf 2.68 for znapzend 0.10.0.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -559,8 +559,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='znapzend'
PACKAGE_TARNAME='znapzend'
PACKAGE_VERSION='0.9.1'
PACKAGE_STRING='znapzend 0.9.1'
PACKAGE_VERSION='0.10.0'
PACKAGE_STRING='znapzend 0.10.0'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1199,7 +1199,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures znapzend 0.9.1 to adapt to many kinds of systems.
\`configure' configures znapzend 0.10.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1265,7 +1265,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of znapzend 0.9.1:";;
short | recursive ) echo "Configuration of znapzend 0.10.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1351,7 +1351,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
znapzend configure 0.9.1
znapzend configure 0.10.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
Expand All @@ -1368,7 +1368,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by znapzend $as_me 0.9.1, which was
It was created by znapzend $as_me 0.10.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2191,7 +2191,7 @@ fi

# Define the identity of the package.
PACKAGE='znapzend'
VERSION='0.9.1'
VERSION='0.10.0'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -3186,7 +3186,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by znapzend $as_me 0.9.1, which was
This file was extended by znapzend $as_me 0.10.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -3239,7 +3239,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
znapzend config.status 0.9.1
znapzend config.status 0.10.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Expand Down
10 changes: 10 additions & 0 deletions doc/znapzend.pod
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ B<znapzend> [I<options>...]
--pidfile=x write a pid file when running in daemon mode
--daemonize fork into the background
--runonce=x run one round on source dataset x
--features=x comma separated list of features to be enabled

=head1 DESCRIPTION

Expand Down Expand Up @@ -69,6 +70,15 @@ run one round on source I<fileset>. This is very useful for testing.
Use it in connection with B<--noaction> and B<--debug> while
testing your new configuration

=item B<--features>=I<feature1,feature2>

enables enhanced zfs features not supported by all zfs implementations.
Do not enable features unless you are sure your zfs supports it

Available features:

combinedDestroy

=back

=head1 EXAMPLE
Expand Down
6 changes: 6 additions & 0 deletions doc/znapzendzetup.pod
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ where 'command' is one of the following:
SRC [plan] dataset \
[ DST:key [plan] [dataset] ]

edit <src_dataset>

enable <src_dataset>

disable <src_dataset>
Expand Down Expand Up @@ -157,6 +159,9 @@ B<list> function to see the keys.
modify the configuration of a dataset. see the descriptions in the B<create>
function for details.

If B<edit> is used with a source dataset as single argument, properties
can be edited in an editor.

=head2 B<export>

dumps the backup configuration of a dataset
Expand All @@ -178,6 +183,7 @@ commandline.

may be called multiple times to override properties in the imported config.

=back

=head1 EXAMPLES

Expand Down
15 changes: 13 additions & 2 deletions man/znapzend.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZEND 1"
.TH ZNAPZEND 1 "2014-08-01" "0.9.1" "znapzend"
.TH ZNAPZEND 1 "2014-08-02" "0.10.0" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand All @@ -135,7 +135,7 @@ znapzend \- znapzend daemon
.IX Header "SYNOPSIS"
\&\fBznapzend\fR [\fIoptions\fR...]
.PP
.Vb 10
.Vb 11
\& \-\-man show man\-page and exit
\& \-h,\-\-help display this help and exit
\& \-d,\-\-debug print debug messages to STDERR
Expand All @@ -146,6 +146,7 @@ znapzend \- znapzend daemon
\& \-\-pidfile=x write a pid file when running in daemon mode
\& \-\-daemonize fork into the background
\& \-\-runonce=x run one round on source dataset x
\& \-\-features=x comma separated list of features to be enabled
.Ve
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
Expand Down Expand Up @@ -190,6 +191,16 @@ Fork into the background.
run one round on source \fIfileset\fR. This is very useful for testing.
Use it in connection with \fB\-\-noaction\fR and \fB\-\-debug\fR while
testing your new configuration
.IP "\fB\-\-features\fR=\fIfeature1,feature2\fR" 4
.IX Item "--features=feature1,feature2"
enables enhanced zfs features not supported by all zfs implementations.
Do not enable features unless you are sure your zfs supports it
.Sp
Available features:
.Sp
.Vb 1
\& combinedDestroy
.Ve
.SH "EXAMPLE"
.IX Header "EXAMPLE"
To test a new config
Expand Down
13 changes: 6 additions & 7 deletions man/znapzendzetup.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZENDZETUP 1"
.TH ZNAPZENDZETUP 1 "2014-08-01" "0.9.1" "znapzend"
.TH ZNAPZENDZETUP 1 "2014-08-02" "0.10.0" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down Expand Up @@ -154,6 +154,8 @@ where 'command' is one of the following:
\& SRC [plan] dataset \e
\& [ DST:key [plan] [dataset] ]
\&
\& edit <src_dataset>
\&
\& enable <src_dataset>
\&
\& disable <src_dataset>
Expand Down Expand Up @@ -289,6 +291,9 @@ to only remove a destination, specify the key of the destionation. Use the
.IX Subsection "edit"
modify the configuration of a dataset. see the descriptions in the \fBcreate\fR
function for details.
.PP
If \fBedit\fR is used with a source dataset as single argument, properties
can be edited in an editor.
.SS "\fBexport\fP"
.IX Subsection "export"
dumps the backup configuration of a dataset
Expand Down Expand Up @@ -353,9 +358,3 @@ Dominik\ Hassler\ <[email protected]>
2014\-06\-29 had Flexible snapshot time format
2014\-06\-01 had Multi destination backup
2014\-05\-30 had Initial Version
.SH "POD ERRORS"
.IX Header "POD ERRORS"
Hey! \fBThe above document had some coding errors, which are explained below:\fR
.IP "Around line 481:" 4
.IX Item "Around line 481:"
You forgot a '=back' before '=head1'
2 changes: 1 addition & 1 deletion man/znapzendztatz.1
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "ZNAPZENDZTATZ 1"
.TH ZNAPZENDZTATZ 1 "2014-08-01" "0.9.1" "znapzend"
.TH ZNAPZENDZTATZ 1 "2014-08-02" "0.10.0" "znapzend"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down

0 comments on commit ff8b189

Please sign in to comment.