diff options
| author | Micah Anderson <micah@riseup.net> | 2010-01-29 17:02:03 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-01-29 17:02:03 -0500 |
| commit | c1f1baebb5170abb49fb0ec5d6d463d6827bae1b (patch) | |
| tree | c57da8f9d364097473bd8cc35ed6f13f60959d61 /examples | |
| parent | 329e13e35d0bb394c5beed9893b2a869fda6648c (diff) | |
| download | backupninja-c1f1baebb5170abb49fb0ec5d6d463d6827bae1b.tar.gz backupninja-c1f1baebb5170abb49fb0ec5d6d463d6827bae1b.tar.bz2 | |
fix bad upstream merge
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/example.ldap | 3 | ||||
| -rw-r--r-- | examples/example.mysql | 4 | ||||
| -rw-r--r-- | examples/example.sys | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/examples/example.ldap b/examples/example.ldap index 4dd03ea..ee7c57d 100644 --- a/examples/example.ldap +++ b/examples/example.ldap @@ -48,5 +48,4 @@ ## tls (default yes): if set to 'yes' then TLS connection will be ## attempted to your ldaphost by using the URI base ldaps: otherwise ldap: will be used -# tls = yes - +# tls = yes
\ No newline at end of file diff --git a/examples/example.mysql b/examples/example.mysql index bd996e7..de9651f 100644 --- a/examples/example.mysql +++ b/examples/example.mysql @@ -73,6 +73,10 @@ compress = yes # make a backup using mysqldump. this creates text files with sql commands # sufficient to recontruct the database. # +# sqldumpoptions = <options> +# (default = --lock-tables --complete-insert --add-drop-table --quick --quote-names) +# arguments to pass to mysqldump +# # compress = < yes | no > (default = yes) # if yes, compress the sqldump output. # diff --git a/examples/example.sys b/examples/example.sys index af28fd6..fe34646 100644 --- a/examples/example.sys +++ b/examples/example.sys @@ -1,6 +1,6 @@ # # this config file will save various reports of vital system information. -# by default, all the reports are enabled and are saved in /var/backups. +# by default, all the reports are saved in /var/backups. # # requires dpkg, debconf-utils, sfdisk, and hwinfo # @@ -25,6 +25,14 @@ # (4) hardware information. # detailed information on most important aspects of the hardware. # +# (5) the Luks header of every Luks block device, if option luksheaders +# is enabled. +# in case you (have to) scramble such a Luks header (for some time), +# and restore it later by running "dd if=luksheader.sda2.bin of=/dev/sda2" +# (MAKE SURE YOU PASS THE CORRECT DEVICE AS of= !!!) +# +# (6) LVM metadata for every detected volume group, if "lvm = yes" +# # here are the defaults, commented out: @@ -47,6 +55,16 @@ # hardwarefile = /var/backups/hardware.txt # dohwinfo = yes +# luksheaders = no +# NOTE: the __star__ below will be replaced by the Luks partitions found on the +# system (e.g. luksheader.sda2.bin, luksheader.sdb3.bin). If you change +# the luksheadersfile default below, be sure to include the __star__ +# replacement in the filename, or you will get one file for only one partition, +# the others being written to the same file, and then overwritten by the next. +# luksheadersfile = /var/backups/luksheader.__star__.bin + +# lvm = no + # If vservers = yes in /etc/backupninja.conf then the following variables can # be used: # vsnames = all | <vserver1> <vserver2> ... (default = all) |