1 diff --git a/example/amanda-client-postgresql.conf.in b/example/amanda-client-postgresql.conf.in
2 index f917a5b..bd32b3d 100644
3 --- a/example/amanda-client-postgresql.conf.in
4 +++ b/example/amanda-client-postgresql.conf.in
5 @@ -25,7 +25,7 @@ ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover"
6 # Use /etc/amanda/pgpassfile for authentication credentials
7 # (Note: for PostgreSQL 8.0.x, you must use PG-PASSWORD instead)
8 # Should contain an appropriate line for foo (below).Example:
9 -# localhost:*:*:amandabackup:my_backup_password
10 +# localhost:*:*:backup:my_backup_password
11 # The file must be owned by the Amanda user with permissions 0600
12 property "PG-PASSFILE" "/etc/amanda/pgpassfile"
14 @@ -34,8 +34,8 @@ property "PG-PASSFILE" "/etc/amanda/pgpassfile"
15 property "foo-PG-HOST" "localhost"
16 # Connect to port 5432 (PostgreSQL's default)
17 property "foo-PG-PORT" "5432"
18 -# Connect as user amandabackup (Note: must be a superuser)
19 -property "foo-PG-USER" "amandabackup"
20 +# Connect as user backup (Note: must be a superuser)
21 +property "foo-PG-USER" "backup"
22 # Connect to database template1 (exists by default)
23 property "foo-PG-DB" "template1"
24 # Database's data directory
25 diff --git a/example/inetd.conf.amandaclient.in b/example/inetd.conf.amandaclient.in
26 index 9d60e06..9b8f8a0 100644
27 --- a/example/inetd.conf.amandaclient.in
28 +++ b/example/inetd.conf.amandaclient.in
30 -#amanda stream tcp nowait amandabackup @amlibexecdir@/amandad -auth=bsdtcp amdump
31 -amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
32 +#amanda stream tcp nowait backup @amlibexecdir@/amandad -auth=bsdtcp amdump
33 +amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
34 diff --git a/example/inetd.conf.amandaserver.in b/example/inetd.conf.amandaserver.in
35 index 3228c79..f964b43 100644
36 --- a/example/inetd.conf.amandaserver.in
37 +++ b/example/inetd.conf.amandaserver.in
39 -amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
40 +amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
41 diff --git a/example/xinetd.amandaclient.in b/example/xinetd.amandaclient.in
42 index a97c8e1..5cfc8e0 100644
43 --- a/example/xinetd.amandaclient.in
44 +++ b/example/xinetd.amandaclient.in
45 @@ -10,7 +10,7 @@ service amanda
53 server = @amlibexecdir@/amandad
54 diff --git a/example/xinetd.amandaserver.in b/example/xinetd.amandaserver.in
55 index a665efe..cc33c18 100644
56 --- a/example/xinetd.amandaserver.in
57 +++ b/example/xinetd.amandaserver.in
58 @@ -10,7 +10,7 @@ service amanda
66 server = @amlibexecdir@/amandad
67 diff --git a/installcheck/Amanda_Config.pl b/installcheck/Amanda_Config.pl
68 index 362dcb5..27c1ace 100644
69 --- a/installcheck/Amanda_Config.pl
70 +++ b/installcheck/Amanda_Config.pl
71 @@ -212,7 +212,7 @@ $testconf->add_script('my_script', [
72 'plugin' => '"script-email"',
73 'execute-on' => 'pre-host-backup, post-host-backup',
74 'execute-where' => 'client',
75 - 'property' => '"mailto" "amandabackup" "amanda"',
76 + 'property' => '"mailto" "backup" "amanda"',
78 $testconf->add_device('my_device', [
79 'comment' => '"my device is mine, not yours"',
80 diff --git a/installcheck/catalogs/chunker-partial.cat b/installcheck/catalogs/chunker-partial.cat
81 index 621b73f..25b0be2 100644
82 --- a/installcheck/catalogs/chunker-partial.cat
83 +++ b/installcheck/catalogs/chunker-partial.cat
84 @@ -28,7 +28,7 @@ planner: DEFAULT_TAPE_SERVER="localhost" DEFAULT_TAPE_DEVICE=""
85 planner: HAVE_MMAP NEED_STRSTR HAVE_SYSVSHM AMFLOCK_POSIX AMFLOCK_LOCKF
86 planner: AMFLOCK_LNLOCK SETPGRP_VOID ASSERTIONS AMANDA_DEBUG_DAYS=4
87 planner: BSD_SECURITY RSH_SECURITY USE_AMANDAHOSTS
88 -planner: CLIENT_LOGIN="amandabackup" CHECK_USERID HAVE_GZIP
89 +planner: CLIENT_LOGIN="backup" CHECK_USERID HAVE_GZIP
90 planner: COMPRESS_SUFFIX=".gz" COMPRESS_FAST_OPT="--fast"
91 planner: COMPRESS_BEST_OPT="--best" UNCOMPRESS_OPT="-dc"
93 diff --git a/man/amaddclient.8 b/man/amaddclient.8
94 index 775c21c..8a892bd 100644
95 --- a/man/amaddclient.8
96 +++ b/man/amaddclient.8
97 @@ -56,7 +56,7 @@ for detail\&.)
101 -must be run by user amandabackup\&.
102 +must be run by user backup\&.
104 \-\-config, \-\-client and \-\-diskdev must be specified\&.
106 @@ -172,7 +172,7 @@ Amanda configuration template files install location
108 \fB/var/lib/amanda\fR
110 -amandabackup home directory
111 +backup home directory
114 \fB/var/lib/amanda/\&.amandahosts\fR
115 diff --git a/man/amanda-auth.7 b/man/amanda-auth.7
116 index c4d9db1..d44f5b0 100644
117 --- a/man/amanda-auth.7
118 +++ b/man/amanda-auth.7
119 @@ -124,7 +124,7 @@ parameter selects a communication/authentication method to use between the clien
121 When Amanda is built, a username is specified with the
123 -option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqamandabackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqamandabackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
124 +option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqbackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqbackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
125 .SS "Authenticated Peer Hostnames"
127 Amanda\*(Aqs authentication mechanisms provide an authenticated hostname of the system on the other end of the connection, which is used to restrict access to only particular hosts\&. The degree of "authentication" performed on this hostname varies with the authentication mechanism, and is discussed below\&.
128 @@ -192,10 +192,10 @@ If service is omitted, it defaults to
129 (which is equivalent to
132 -Example of the \&.amandahosts file on an Amanda client, where \*(Aqamandabackup\*(Aq is the Amanda dumpuser\&.
133 +Example of the \&.amandahosts file on an Amanda client, where \*(Aqbackup\*(Aq is the Amanda dumpuser\&.
136 - \fBamandaserver\&.example\&.com amandabackup amdump\fR
137 + \fBamandaserver\&.example\&.com backup amdump\fR
140 Example of the \&.amandahosts file on an Amanda server
141 @@ -211,7 +211,7 @@ The authentication is done using \&.amandahosts file in the Amanda user\*(Aqs ho
142 The authentication is done using \&.amandahosts files in the Amanda user\*(Aqs home directory\&. It uses UDP protocol between Amanda server and client for data and hence the number of DLEs is limited by the UDP packet size\&. It uses one TCP port to establish the connection and multiplexes all data streams using one port on the server (see PORT USAGE below)\&.
143 .SS "bsdtcp communication and authentication"
145 -The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: amandabackup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
146 +The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: backup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
147 .SS "USING INETD SERVER"
149 Template for Amanda client inetd service entry
150 @@ -222,10 +222,10 @@ Template for Amanda client inetd service entry
152 Client example of using
154 -authorization for inetd server given Amanda user is "amandabackup":
155 +authorization for inetd server given Amanda user is "backup":
158 -\fB amanda dgram udp wait amandabackup /path/to/amandad amandad \-auth=bsd amdump\fR
159 +\fB amanda dgram udp wait backup /path/to/amandad amandad \-auth=bsd amdump\fR
162 The same could be used for
163 @@ -234,10 +234,10 @@ if specifying \-auth=bsdudp instead of \-auth=bsd\&.
165 Client example of using
167 -authorization for inetd server given Amanda user is "amandabackup":
168 +authorization for inetd server given Amanda user is "backup":
171 -\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
172 +\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
176 @@ -249,10 +249,10 @@ server arguments for an Amanda server\&.
178 Server example of using
180 -authorization for inetd server given Amanda user is "amandabackup":
181 +authorization for inetd server given Amanda user is "backup":
184 -\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
185 +\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
188 For Amanda version 2\&.5\&.0 and earlier, remember that neither
189 @@ -286,8 +286,8 @@ instead and, again, the server must be running the amandaidx and amidxtape netwo
190 Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2\&.5\&.0 or earlier server or a newer server having 2\&.5\&.0 or earlier clients
193 -\fB amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd\fR
194 -\fB amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
195 +\fB amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd\fR
196 +\fB amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
198 .SS "USING XINETD SERVER"
200 @@ -315,7 +315,7 @@ parameter can be used with xinetd but is usually in addition to the primary form
202 Client example of using
204 -authorization for xinetd server and for Amanda user "amandabackup":
205 +authorization for xinetd server and for Amanda user "backup":
209 @@ -324,7 +324,7 @@ service amanda
213 - user = amandabackup
217 server = /path/to/amandad
218 @@ -339,7 +339,7 @@ if specifying \-auth=bsdudp instead of \-auth=bsd\&.
220 Client example of using
222 -authorization for xinetd server and for Amanda user "amandabackup":
223 +authorization for xinetd server and for Amanda user "backup":
227 @@ -348,7 +348,7 @@ service amanda
231 - user = amandabackup
235 server = /path/to/amandad
236 @@ -589,7 +589,7 @@ For example:
237 define dumptype rsh_example {
240 - client\-username "amandabackup"
241 + client\-username "backup"
242 amandad\-path "/usr/lib/exec/amandad"
245 @@ -616,7 +616,7 @@ When you use a public key on the client to do data encryption (see http://wiki\&
246 Enable SSH authentication and set the \fBssh\-keys\fR option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda\&.conf:
249 - ssh\-keys "/home/amandabackup/\&.ssh/id_rsa_amdump"
250 + ssh\-keys "/home/backup/\&.ssh/id_rsa_amdump"
252 \fBssh\-keys\fR is the path to the private key on the client\&. If the username to which Amanda should connect is different from the default, then you should also add
254 diff --git a/man/amgpgcrypt.8 b/man/amgpgcrypt.8
255 index 6489a6d..3ea03b2 100644
256 --- a/man/amgpgcrypt.8
257 +++ b/man/amgpgcrypt.8
258 @@ -98,11 +98,11 @@ You need a User\-ID to identify your key; the software constructs the user id
259 from Real Name, Comment and Email Address in this form:
260 "Heinrich Heine (Der Dichter) (heinrichh@duesseldorf\&.de)"
262 -Real name: amandabackup
265 -Comment: gpg keys for amandabackup
266 +Comment: gpg keys for backup
267 You selected this USER\-ID:
268 - "amandabackup (gpg keys for amandabackup)"
269 + "backup (gpg keys for backup)"
271 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
272 You need a Passphrase to protect your secret key\&.
273 @@ -120,7 +120,7 @@ generator a better chance to gain enough entropy\&.
274 public and secret key created and signed\&.
275 key marked as ultimately trusted\&.
277 -pub 1024D/4417A8CB 2006\-02\-07 amandabackup (gpg keys for amandabackup)
278 +pub 1024D/4417A8CB 2006\-02\-07 backup (gpg keys for backup)
279 Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
280 sub 1024g/8C3A6A78 2006\-02\-07 [expires: 2006\-08\-06]
282 diff --git a/man/amserverconfig.8 b/man/amserverconfig.8
283 index fb5607d..b6d433e 100644
284 --- a/man/amserverconfig.8
285 +++ b/man/amserverconfig.8
286 @@ -40,7 +40,7 @@ will setup initial Amanda configuration files\&. It will create /var/lib/amanda/
288 does not change existing Amanda configurations\&.
290 -must be run by user amandabackup\&.
291 +must be run by user backup\&.
294 Options may be abbreviated, as long as the abbreviation is not ambiguous\&. Option argument can either separated by \*(Aq=\*(Aq or a space\&. Example: \-\-templ=harddisk \-\-tapedev /dev/nst0
295 @@ -61,7 +61,7 @@ are the valid inputs for this option\&. Pre\-configured template files can be fo
297 If tape\-changer is chosen for this option, program mtx is required\&.
299 -will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and amandabackup\*(Aqs PATH\&.
300 +will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and backup\*(Aqs PATH\&.
302 If harddisk is chosen and \-\-no\-vtape is not specified,
304 @@ -107,7 +107,7 @@ The type of tape drive associated with tapedev or tpchanger\&. default [HARDDISK
306 \fB\-\-mailto mailto\fR
308 -A space separated list of recipients for mail reports\&. default [amandabackup]
309 +A space separated list of recipients for mail reports\&. default [backup]
312 \fB\-\-dumpcycle dumpcycle\fR
313 @@ -143,7 +143,7 @@ Amanda configuration template files install location
315 \fB/var/lib/amanda\fR
317 -amandabackup home directory
318 +backup home directory
321 \fB/var/lib/amanda/gnutar\-lists\fR
322 diff --git a/man/amsuntar.8 b/man/amsuntar.8
323 index 6e10904..54da0f0 100644
326 @@ -37,7 +37,7 @@ The
328 in the disklist (DLE) must be the directory to backup\&.
330 -Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like amandabackup, amandabackup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" amandabackup\*(Aq command\&.
331 +Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like backup, backup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" backup\*(Aq command\&.
334 This section lists the properties that control amsuntar\*(Aqs functionality\&. See
335 diff --git a/man/xml-source/amaddclient.8.xml b/man/xml-source/amaddclient.8.xml
336 index f0bbbbf..6966d53 100644
337 --- a/man/xml-source/amaddclient.8.xml
338 +++ b/man/xml-source/amaddclient.8.xml
339 @@ -61,7 +61,7 @@ the client.
340 (See <refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum> and
341 <refentrytitle>ssh-add</refentrytitle><manvolnum>1</manvolnum> for detail.)</para>
343 -&amaddclient; must be run by user amandabackup.</para>
344 +&amaddclient; must be run by user backup.</para>
345 <para> --config, --client and --diskdev must be specified.
348 @@ -218,7 +218,7 @@ Specify either --excludefile or --excludelist. </para>
350 <term><option>/var/lib/amanda</option></term>
352 -<para>amandabackup home directory</para>
353 +<para>backup home directory</para>
357 diff --git a/man/xml-source/amaespipe.8.xml b/man/xml-source/amaespipe.8.xml
360 diff --git a/man/xml-source/amanda-auth.7.xml b/man/xml-source/amanda-auth.7.xml
361 index 3d27fbb..04e3eb0 100644
362 --- a/man/xml-source/amanda-auth.7.xml
363 +++ b/man/xml-source/amanda-auth.7.xml
364 @@ -85,7 +85,7 @@ Authentication Configure option(s)
365 <option>--with-user</option> option. Most Amanda processes run under
366 this user's identity, to minimize security risks. In binary
367 distributions, this username is usually one of 'amanda',
368 -'amandabackup', or 'backup'. The examples below use 'amandabackup'
369 +'backup', or 'backup'. The examples below use 'backup'
370 since it is unambiguous. You may need to adjust accordingly for your
373 @@ -147,10 +147,10 @@ configuration file.</para>
375 <para>If service is omitted, it defaults to <emphasis remap='B'>noop selfcheck sendsize sendbackup</emphasis> (which is equivalent to <emphasis remap='B'>amdump</emphasis>).</para>
377 - <para>Example of the .amandahosts file on an Amanda client, where 'amandabackup' is the Amanda dumpuser.
378 + <para>Example of the .amandahosts file on an Amanda client, where 'backup' is the Amanda dumpuser.
381 - <emphasis remap='B'>amandaserver.example.com amandabackup amdump</emphasis>
382 + <emphasis remap='B'>amandaserver.example.com backup amdump</emphasis>
386 @@ -171,7 +171,7 @@ configuration file.</para>
389 <refsect2><title>bsdtcp communication and authentication</title>
390 - <para>The authentication is done using .amandahosts files in the backup user's (for example: amandabackup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
391 + <para>The authentication is done using .amandahosts files in the backup user's (for example: backup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
394 <refsect2><title>USING INETD SERVER</title>
395 @@ -181,24 +181,24 @@ configuration file.</para>
396 <emphasis remap='I'> service_name</emphasis> <emphasis remap='I'>socket_type</emphasis> <emphasis remap='I'>protocol</emphasis> <emphasis remap='I'>wait/nowait</emphasis> <emphasis remap='I'>amanda_backup_user</emphasis> <emphasis remap='I'>absolute_path_to_amandad</emphasis> amandad <emphasis remap='I'>server_args</emphasis>
399 - <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "amandabackup":
400 + <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "backup":
403 -<emphasis remap='B'> amanda dgram udp wait amandabackup /path/to/amandad amandad -auth=bsd amdump</emphasis>
404 +<emphasis remap='B'> amanda dgram udp wait backup /path/to/amandad amandad -auth=bsd amdump</emphasis>
407 <para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
408 - <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
409 + <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
412 -<emphasis remap='B'> amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
413 +<emphasis remap='B'> amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
416 <para><emphasis remap='B'>amindexd</emphasis> and <emphasis remap='B'>amidxtaped</emphasis> would typically be added at the end of the line as &amandad; server arguments for an Amanda server.</para>
417 - <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
418 + <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
421 -<emphasis remap='B'> amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
422 +<emphasis remap='B'> amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
425 <para>For Amanda version 2.5.0 and earlier, remember that neither <emphasis remap='B'>bsdudp</emphasis> nor <emphasis remap='B'>bsdtcp</emphasis> are supported and the Amanda daemon &amandad; accepts no arguments. Because of the latter, &amrecover; as of Amanda version 2.5.1 is not compatible with 2.5.0 and earlier servers. Thus, servers that are 2.5.0 or earlier must, in addition to the <emphasis remap='I'>amanda</emphasis> service, run <emphasis remap='I'>amindexd</emphasis> and <emphasis remap='I'>amidxtaped</emphasis> Amanda services as their own network services, amandaidx and amidxtape, respectively (see below).</para>
426 @@ -208,8 +208,8 @@ configuration file.</para>
427 <para>Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2.5.0 or earlier server or a newer server having 2.5.0 or earlier clients
430 -<emphasis remap='B'> amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd</emphasis>
431 -<emphasis remap='B'> amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
432 +<emphasis remap='B'> amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd</emphasis>
433 +<emphasis remap='B'> amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
437 @@ -234,7 +234,7 @@ service amanda
440 <para>The <emphasis remap='I'>only_from</emphasis> parameter can be used with xinetd but is usually in addition to the primary form of access control via the .amandahosts file.</para>
441 - <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
442 + <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "backup":
446 @@ -243,7 +243,7 @@ service amanda
450 - user = amandabackup
454 server = /path/to/amandad
455 @@ -253,7 +253,7 @@ service amanda
458 <para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
459 - <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
460 + <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "backup":
464 @@ -262,7 +262,7 @@ service amanda
468 - user = amandabackup
472 server = /path/to/amandad
473 @@ -473,7 +473,7 @@ For example:
474 define dumptype rsh_example {
477 - client-username "amandabackup"
478 + client-username "backup"
479 amandad-path "/usr/lib/exec/amandad"
482 @@ -506,7 +506,7 @@ When you use a public key on the client to do data encryption (see http://wiki.z
483 Enable SSH authentication and set the <amkeyword>ssh-keys</amkeyword> option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda.conf:
486 - ssh-keys "/home/amandabackup/.ssh/id_rsa_amdump"
487 + ssh-keys "/home/backup/.ssh/id_rsa_amdump"
489 <amkeyword>ssh-keys</amkeyword> is the path to the private key on the client. If the username to which Amanda should connect is different from the default, then you should also add
491 diff --git a/man/xml-source/amcrypt.8.xml b/man/xml-source/amcrypt.8.xml
494 diff --git a/man/xml-source/amgpgcrypt.8.xml b/man/xml-source/amgpgcrypt.8.xml
495 index 3dd7140..d6b9db1 100644
496 --- a/man/xml-source/amgpgcrypt.8.xml
497 +++ b/man/xml-source/amgpgcrypt.8.xml
498 @@ -92,11 +92,11 @@ You need a User-ID to identify your key; the software constructs the user id
499 from Real Name, Comment and Email Address in this form:
500 "Heinrich Heine (Der Dichter) (heinrichh@duesseldorf.de)"
502 -Real name: amandabackup
505 -Comment: gpg keys for amandabackup
506 +Comment: gpg keys for backup
507 You selected this USER-ID:
508 - "amandabackup (gpg keys for amandabackup)"
509 + "backup (gpg keys for backup)"
511 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
512 You need a Passphrase to protect your secret key.
513 @@ -114,7 +114,7 @@ generator a better chance to gain enough entropy.
514 public and secret key created and signed.
515 key marked as ultimately trusted.
517 -pub 1024D/4417A8CB 2006-02-07 amandabackup (gpg keys for amandabackup)
518 +pub 1024D/4417A8CB 2006-02-07 backup (gpg keys for backup)
519 Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
520 sub 1024g/8C3A6A78 2006-02-07 [expires: 2006-08-06]
522 diff --git a/man/xml-source/amserverconfig.8.xml b/man/xml-source/amserverconfig.8.xml
523 index 2871fcf..99875a3 100644
524 --- a/man/xml-source/amserverconfig.8.xml
525 +++ b/man/xml-source/amserverconfig.8.xml
527 It will create /var/lib/amanda/guntar-lists directory if one does
529 &amserverconfig; does not change existing Amanda configurations.
530 -&amserverconfig; must be run by user amandabackup.
531 +&amserverconfig; must be run by user backup.
535 @@ -73,7 +73,7 @@ Example: --templ=harddisk --tapedev /dev/nst0</para>
537 <para>If tape-changer is chosen for this option, program mtx is required. &amserverconfig; will
538 search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin",
539 -"/usr/local/bin", "/usr/bin", "/bin" and amandabackup's PATH.
540 +"/usr/local/bin", "/usr/bin", "/bin" and backup's PATH.
543 If harddisk is chosen and --no-vtape is not specified, &amserverconfig; will create and label virtual tape
544 @@ -138,7 +138,7 @@ is supported.</para>
546 <term><option>--mailto mailto</option></term>
548 -<para> A space separated list of recipients for mail reports. default [amandabackup] </para>
549 +<para> A space separated list of recipients for mail reports. default [backup] </para>
553 @@ -193,7 +193,7 @@ is supported.</para>
555 <term><option>/var/lib/amanda</option></term>
557 -<para>amandabackup home directory</para>
558 +<para>backup home directory</para>
562 diff --git a/man/xml-source/amsuntar.8.xml b/man/xml-source/amsuntar.8.xml
563 index 47ff3d5..f11afc5 100644
564 --- a/man/xml-source/amsuntar.8.xml
565 +++ b/man/xml-source/amsuntar.8.xml
566 @@ -39,9 +39,9 @@ must be the directory to backup.</para>
568 <para>Solaris 10 supports Role Based Access Control(RBAC) which is enabled
569 by default. To run backup operations using sun tar utility by under
570 -privileged user like amandabackup, amandabackup user need to have proper
571 +privileged user like backup, backup user need to have proper
572 roles and profiles, specially "Media Backup" profile/role. This can be done
573 -using 'usermod -P "Media Backup" amandabackup' command.</para>
574 +using 'usermod -P "Media Backup" backup' command.</para>