Imported Upstream version 2.4.5

[debian/amanda] / example / amanda.conf.in

diff --git a/example/amanda.conf.in b/example/amanda.conf.in
index 01948fb37ec555012c57f7260099a6476b6e926a..807f8bb9ba4c044b3fe68077d8af52075ac9fdfb 100644 (file)
--- a/example/amanda.conf.in
+++ b/example/amanda.conf.in
@@ -32,6 +32,25 @@ dumporder "sssS"     # specify the priority order of each dumper
                        #   B -> biggest bandwitdh
                        # try "BTBTBTBTBTBT" if you are not holding
                        # disk constrained
+
+taperalgo first                # The algorithm used to choose which dump image to send
+                       # to the taper.
+
+                       # Possible values: [first|firstfit|largest|largestfit|smallest|last]
+                       # Default: first. 
+
+                       # first         First in - first out.
+                       # firstfit      The first dump image that will fit on the current tape.
+                       # largest       The largest dump image.
+                       # largestfit    The largest dump image that will fit on the current tape.
+                       # smallest      The smallest dump image.
+                       # last          Last in - first out.
+
+displayunit "k"                # Possible values: "k|m|g|t"
+                       # Default: k. 
+                       # The unit used to print many numbers.
+                       # k=kilo, m=mega, g=giga, t=tera
+                       
 netusage  600 Kbps     # maximum net bandwidth for Amanda, in KB per sec
 
 dumpcycle 4 weeks      # the number of days in the normal dump cycle
@@ -43,11 +62,9 @@ tapecycle 25 tapes   # the number of tapes in rotation
                        # need amflush and so we do not overwrite the full
                        # backups performed at the beginning of the previous
                        # cycle
-### ### ###
-# WARNING: don't use `inf' for tapecycle, it's broken!
-### ### ###
 
 bumpsize 20 Mb         # minimum savings (threshold) to bump level 1 -> 2
+bumppercent 20         # minimum savings (threshold) to bump level 1 -> 2
 bumpdays 1             # minimum days at each level
 bumpmult 4             # threshold = bumpsize * bumpmult^(level-1)