|
[-]
[+]
|
Added |
amanda.spec
|
|
|
|
[-]
[+]
|
Added |
amanda-3.1-amrestore.patch
^
|
| @@ -0,0 +1,23 @@
+diff --git a/server-src/amrestore.pl b/server-src/amrestore.pl
+index dfe521a..d3284ed 100755
+--- a/server-src/amrestore.pl
++++ b/server-src/amrestore.pl
+@@ -372,13 +372,14 @@ sub main {
+ my ($err) = @_;
+ return failure($err, $finished_cb) if $err;
+
+- $steps->{'next_file'}->();
++ $steps->{'next_file'}->('extracted');
+ };
+
+ step next_file => sub {
+- # amrestore does not loop over multiple files when reading from
+- # holding or when outputting to a pipe
+- if ($opt_holding or $opt_pipe) {
++ my ($extracted) = @_;
++ # amrestore does not loop over multiple files when reading from holding
++ # when outputting to a pipe amrestore extracts only the first file
++ if ($opt_holding or ($opt_pipe and $extracted)) {
+ return $steps->{'finished'}->();
+ }
+
|
|
[-]
[+]
|
Added |
amanda-3.1.0-example.patch
^
|
| @@ -0,0 +1,16 @@
+diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am
+--- amanda-3.1.0/example/Makefile.am.example 2010-06-01 21:21:59.000000000 +0200
++++ amanda-3.1.0/example/Makefile.am 2010-06-23 15:53:42.693848261 +0200
+@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va
+
+ amanda_dir = $(amdatadir)
+ templatedir = $(amanda_dir)/template.d
+-server_exampledir = $(amanda_dir)/example
+-client_exampledir = $(amanda_dir)/example
+-lbltempldir = $(amanda_dir)/example/label-templates
++server_exampledir = $(sysconfdir)/amanda/example
++client_exampledir = $(sysconfdir)/amanda/example
++lbltempldir = $(sysconfdir)/amanda/example/label-templates
+
+ template_in_FILE = \
+ template.d/advanced.conf.in \
|
|
[-]
[+]
|
Added |
amanda-3.1.0-ftbfs.patch
^
|
| @@ -0,0 +1,12 @@
+diff -up amanda-3.1.0/common-src/glib-util.c.ftbfs amanda-3.1.0/common-src/glib-util.c
+--- amanda-3.1.0/common-src/glib-util.c.ftbfs 2010-06-01 21:22:19.000000000 +0200
++++ amanda-3.1.0/common-src/glib-util.c 2010-06-23 17:34:18.580848540 +0200
+@@ -42,7 +42,7 @@ glib_init(void) {
+ * is initialized) */
+ #ifdef HAVE_LIBCURL
+ # ifdef G_THREADS_ENABLED
+- g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
++ /*g_assert(!g_thread_supported());*/ /* assert threads aren't initialized yet */
+ # endif
+ g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
+ #endif
|
|
[-]
[+]
|
Added |
amanda-3.1.1-bsd.patch
^
|
| @@ -0,0 +1,28 @@
+diff -up amanda-3.1.1/example/amanda-client.conf.in.bsd amanda-3.1.1/example/amanda-client.conf.in
+--- amanda-3.1.1/example/amanda-client.conf.in.bsd 2010-08-10 12:26:03.000000000 +0200
++++ amanda-3.1.1/example/amanda-client.conf.in 2010-08-10 14:37:54.027754862 +0200
+@@ -17,8 +17,8 @@ tapedev "@EXAMPLE_TAPEDEV@" # your
+ # auth - authentication scheme to use between server and client.
+ # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local",
+ # "rsh" and "ssh".
+-# Default: [auth "bsdtcp"]
+-auth "bsdtcp"
++# Default: [auth "bsd"]
++auth "bsd"
+
+ ssh_keys "" # your ssh keys file if you use ssh auth
+
+diff -up amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd amanda-3.1.1/example/amanda-client-postgresql.conf.in
+--- amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/amanda-client-postgresql.conf.in 2010-08-10 14:38:00.522754862 +0200
+@@ -16,8 +16,8 @@ tape_server "@DEFAULT_TAPE_SERVER@" # y
+ # auth - authentication scheme to use between server and client.
+ # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local",
+ # "rsh" and "ssh".
+-# Default: [auth "bsdtcp"]
+-auth "bsdtcp"
++# Default: [auth "bsd"]
++auth "bsd"
+
+ # your ssh keys file if you use ssh auth
+ ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover"
|
|
[-]
[+]
|
Added |
amanda-3.1.1-tcpport.patch
^
|
| @@ -0,0 +1,29 @@
+diff -up amanda-3.1.1/example/amanda-client.conf.in.tcpport amanda-3.1.1/example/amanda-client.conf.in
+--- amanda-3.1.1/example/amanda-client.conf.in.tcpport 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/amanda-client.conf.in 2010-08-10 14:44:32.372879810 +0200
+@@ -22,3 +22,5 @@ auth "bsdtcp"
+
+ ssh_keys "" # your ssh keys file if you use ssh auth
+
++#resolves "resource temporarily unavailable" bug
++unreserved-tcp-port 1025,65535
+diff -up amanda-3.1.1/example/amanda-client-postgresql.conf.in.tcpport amanda-3.1.1/example/amanda-client-postgresql.conf.in
+--- amanda-3.1.1/example/amanda-client-postgresql.conf.in.tcpport 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/amanda-client-postgresql.conf.in 2010-08-10 14:44:41.423755630 +0200
+@@ -44,3 +44,6 @@ property "foo-PG-DATADIR" "/var/postgres
+ # For this example:
+ # archive_command = 'test ! -f /var/postgresql/archive/%f && cp %p /var/postgresql/archive/%f'
+ property "foo-PG-ARCHIVEDIR" "/var/postgresql/archive"
++
++#resolves "resource temporarily unavailable" bug
++unreserved-tcp-port 1025,65535
+diff -up amanda-3.1.1/example/amanda.conf.in.tcpport amanda-3.1.1/example/amanda.conf.in
+--- amanda-3.1.1/example/amanda.conf.in.tcpport 2010-08-10 14:43:55.640754722 +0200
++++ amanda-3.1.1/example/amanda.conf.in 2010-08-10 14:44:50.760880089 +0200
+@@ -761,3 +761,6 @@ define script-tool sc-email {
+ # configurations.
+
+ #includefile "@CONFIG_DIR@/amanda.conf.main"
++
++#resolves "resource temporarily unavailable" bug
++unreserved-tcp-port 1025,65535
|
|
[-]
[+]
|
Added |
amanda-3.1.1-xattrs.patch
^
|
| @@ -0,0 +1,55 @@
+diff -up amanda-3.1.1/example/amanda.conf.in.xattrs amanda-3.1.1/example/amanda.conf.in
+--- amanda-3.1.1/example/amanda.conf.in.xattrs 2010-08-03 14:45:25.000000000 +0200
++++ amanda-3.1.1/example/amanda.conf.in 2010-08-03 14:47:42.516753010 +0200
+@@ -718,6 +718,7 @@ define interface local {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ #default from gnutar_list_dir setting in amanda-client.conf
+diff -up amanda-3.1.1/example/template.d/amanda-harddisk.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-harddisk.conf.in
+--- amanda-3.1.1/example/template.d/amanda-harddisk.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-harddisk.conf.in 2010-08-03 14:47:17.027752940 +0200
+@@ -30,6 +30,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
+diff -up amanda-3.1.1/example/template.d/amanda-single-tape.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-single-tape.conf.in
+--- amanda-3.1.1/example/template.d/amanda-single-tape.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-single-tape.conf.in 2010-08-03 14:47:21.307753002 +0200
+@@ -37,6 +37,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
+diff -up amanda-3.1.1/example/template.d/amanda-S3.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-S3.conf.in
+--- amanda-3.1.1/example/template.d/amanda-S3.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-S3.conf.in 2010-08-03 14:47:26.723752659 +0200
+@@ -38,6 +38,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
+diff -up amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in
+--- amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in 2010-08-03 14:47:30.827752997 +0200
+@@ -37,6 +37,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
|
|
|
Added |
amanda-3.3.4.tar.gz
^
|
|
[-]
[+]
|
Added |
amanda-xinetd
^
|
| @@ -0,0 +1,23 @@
+# default: off
+# description: The client for the Amanda backup system.\
+# This must be on for systems being backed up\
+# by Amanda.
+
+service amanda
+{
+ socket_type = dgram
+ protocol = udp
+ wait = yes
+ user = amandabackup
+ group = disk
+ server = /usr/sbin/amandad
+# Configure server_args for the authentication type you will be using,
+# and the services you wish to allow the amanda server and/or recovery
+# clients to use.
+#
+# Change the -auth= entry to reflect the authentication type you use.
+# Add amindexd to allow recovery clients to access the index database.
+# Add amidxtaped to allow recovery clients to access the tape device.
+ server_args = -auth=bsd amdump
+ disable = yes
+}
|
|
[-]
[+]
|
Added |
amanda.crontab
^
|
| @@ -0,0 +1,9 @@
+# This is an example for a crontab entry for automated backup with amanda
+# With these cron lines, Amanda will check that the correct tape is in
+# the drive every weekday afternoon at 4pm (if it isn't, all the
+# operators will get mail). At 12:45am that night the dumps will be run.
+#
+# This should be put in user operator's crontab
+#
+0 16 * * 1-5 /usr/sbin/amcheck -m DailySet1
+45 0 * * 2-6 /usr/sbin/amdump DailySet1
|
|
[-]
[+]
|
Added |
amandahosts
^
|
| @@ -0,0 +1,29 @@
+# Allow access to amanda over the network. See 'man amanda'
+
+# 'ambackup' connects to 'amandad'. If your 'disklist' is correctly
+# set up, i.e. if it does not use 'localhost' but the fully qualified
+# domain name (FQDN) of the target machine, then you must put
+# the FQDN here. 'ambackup' must be run by user 'amandabackup', so we allow
+# access by user 'amandabackup'. Do not forget to add an 'only_from' line to
+# '/etc/xinet.d/amanda' to allow access to 'amandad' only from known
+# IP addresses.
+
+# replace mymachine.mydomain by the correct value and uncomment
+# mymachine.mydomain amandabackup
+
+
+# 'amrecover' connects to 'amandaidx', which uses the fully qualified
+# domain name when access is done from another machine. 'amrecover'
+# must be run by user 'root', so we allow access by user 'root'.
+
+# replace mymachine.mydomain by the correct value and uncomment
+# mymachine.mydomain root
+
+
+# 'amrecover' connects to 'amandaidx', which uses the bare machine
+# name w/o domain name when access is done from the same machine.
+# 'amrecover' must be run by user 'root', so we allow access by user
+# 'root'.
+
+# replace mymachine by the correct value and uncomment
+# mymachine root
|
|
[-]
[+]
|
Added |
disklist
^
|
| @@ -0,0 +1,69 @@
+# sample Amanda2 disklist file, derived from CS.UMD.EDU's disklist
+#
+# If your configuration is called, say, "csd2", then this file normally goes
+# in /etc/amanda/csd2/disklist.
+#
+# File format is:
+#
+# hostname diskdev dumptype
+#
+# where the dumptypes are defined by you in amanda.conf.
+
+
+# At our site, root partitions have a different dumptype because they
+# are of lower priority; they don't contain user data, and don't change
+# much from the department prototype. In a crunch, they can be left for
+# last or skipped.
+
+## A SPARCstation 1+
+#salty sd0a comp-root
+#salty sd0g comp-user
+#salty sd1g comp-user
+#salty sd2a comp-root
+#salty sd2g comp-user
+#salty sd3c comp-user
+#
+## A DECstation 3100
+#slithy rz1a comp-root
+#slithy rz1g comp-user
+#slithy rz3a comp-root
+#slithy rz3g comp-user
+#
+## We don't run compression on the master host since it is going to be
+## busy enough running amanda.
+#master sd0a nocomp-root -1 local
+#master sd0g nocomp-user -1 local
+## note: -1 is a placeholder for the spindle number
+## the holding disk can't be dumped to itself, it uses a disktype that
+## specifies the "no-hold" option (see amanda.conf).
+#master sd1c holding-disk -1 local
+#
+## The chairman's disk is high priority to make sure it gets done.
+#bigwig sd0a comp-root
+#bigwig sd0g comp-high
+## Likewise the named databases in the root partition on our primary
+## nameserver. Also, compression is turned off because we don't want
+## to create any unnecessary load on this baby (it's only a Sun3).
+#bozo sd0a nocomp-high
+#bozo sd0g nocomp-user
+#bozo sd4c nocomp-user
+#
+## Dump Joe's NetBSD machine, with the mounted MS-DOS partition dumped
+## using tar.
+#joespc wd0a comp-root
+#joespc wd0e comp-user
+#joespc /msdos comp-user-tar
+#
+## Some really slow machines, like Sun2's and some Vaxstations, take
+## forever to compress their dumps: it's just not worth it.
+#
+## A Sun2
+#cleo sd0a nocomp-root
+#cleo sd0g nocomp-user
+## A VaxStation
+#susie rz8a nocomp-root
+#susie rz8g nocomp-user
+#
+## and so on ... well, you get the idea
+
+localhost /etc comp-root-tar
|
