Merge branch 'master' into squeeze

[debian/amanda] / example / template.d / advanced.conf.in

diff --git a/example/template.d/advanced.conf.in b/example/template.d/advanced.conf.in
index 1a0ee064ae16c45f46cd5c428ff9e0feea0f8b31..e0312707e486bfd3c4c50f64f103e1d1e5e4364b 100644 (file)
--- a/example/template.d/advanced.conf.in
+++ b/example/template.d/advanced.conf.in
@@ -1,4 +1,3 @@
-dumpuser "@CLIENT_LOGIN@"      # the user to run dumps under
 inparallel 4           # maximum dumpers that will run in parallel (max 63)
                        # this maximum can be increased at compile-time,
                        # modifying MAX_DUMPERS in server-src/driverio.h
@@ -50,14 +49,10 @@ device_output_buffer_size 1280k
 # encounters, uncomment the line below. Note that this will ERASE any
 # non-Amanda tapes you may have, and may also ERASE any near-failing tapes.
 # Use with caution.
-## label_new_tapes "DailySet1-%%%"
+## autolabel "DailySet1-%%%" empty
                        
 maxdumpsize -1         # Maximum total size the planner will schedule
                        # for a run (default: runtapes * tape_length) (kbytes).
-amrecover_do_fsf yes           # amrecover will call amrestore with the
-                               # -f flag for faster positioning of the tape.
-amrecover_check_label yes      # amrecover will call amrestore with the
-                               # -l flag to check the label.
 bumpmult 4             # threshold = bumpsize * bumpmult^(level-1)