diff options
| author | bouyer <bouyer@pkgsrc.org> | 1999-02-25 15:54:00 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 1999-02-25 15:54:00 +0000 |
| commit | a60779479660a86f6b20f7217bf7d5459dfe8e87 (patch) | |
| tree | 945395c369fe8aed38838daeebb1efd486f8a6f2 /sysutils/amanda-server | |
| parent | 08649fd6965eea7bbbd5ad1aeee33333cf79be5e (diff) | |
| download | pkgsrc-a60779479660a86f6b20f7217bf7d5459dfe8e87.tar.gz | |
Add a new make variable, AMANDA_VAR, to tell the default place of the
status and log files (default to /var/amanda). Change the example
amanda.conf to use this path.
Add --with-owner=root to CONFIGURE_ARGS so that executables get installed as
root, not AMANDA_USER (better for security!).
Diffstat (limited to 'sysutils/amanda-server')
| -rw-r--r-- | sysutils/amanda-server/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/amanda-server/patches/patch-ah | 28 |
2 files changed, 34 insertions, 1 deletions
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index 2650ea41ae5..ec27e88a1d9 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/02/23 17:03:41 bouyer Exp $ +# $NetBSD: Makefile,v 1.2 1999/02/25 15:54:00 bouyer Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -15,16 +15,21 @@ DEPENDS+= gnuplot-3.7:../../graphics/gnuplot DEPENDS+= amanda-common-2.4.1p1:../amanda-common USE_PERL5= yes +.include "../../mk/bsd.prefs.mk" AMANDA_USER?= backup AMANDA_GROUP= operator +AMANDA_VAR?= /var/amanda USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=${AMANDA_USER} \ --with-group=${AMANDA_GROUP} \ + --with-owner=root \ --with-mmap --with-amandahosts \ --with-includes=${PREFIX}/include \ --with-libraries=${PREFIX}/lib \ + --localstatedir=${AMANDA_VAR} \ + --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists \ --with-dump-honor-nodump \ --without-client CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah new file mode 100644 index 00000000000..bdcf30e5fe9 --- /dev/null +++ b/sysutils/amanda-server/patches/patch-ah @@ -0,0 +1,28 @@ +--- example/amanda.conf.in.old Thu Feb 25 15:56:29 1999 ++++ example/amanda.conf.in Tue Nov 17 20:17:36 1998 +@@ -59,8 +59,8 @@ + tpchanger "chg-manual" # the tape-changer glue script + tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used + rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only) +-changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer" +-changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer-status" ++changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer" ++changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status" + changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf" + changerdev "@DEFAULT_CHANGER_DEVICE@" + +@@ -130,10 +130,10 @@ + # Note that, although the keyword below is infofile, it is only so for + # historic reasons, since now it is supposed to be a directory (unless + # you have selected some database format other than the `text' default) +-infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY +-logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory +-indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory +-#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes ++infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY ++logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory ++indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory ++#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes + # tapelist is stored, by default, in the directory that contains amanda.conf + + |