diff options
| author | kardel <kardel@pkgsrc.org> | 2021-02-10 11:27:19 +0000 |
|---|---|---|
| committer | kardel <kardel@pkgsrc.org> | 2021-02-10 11:27:19 +0000 |
| commit | 5f6d15b3fd06c7a46d9a0892a54ff96d410fdb09 (patch) | |
| tree | 9859adf7785dfb33cff03791faaca0afd103849e | |
| parent | de3bcce6964b0b1e0d2bb0390201468327852474 (diff) | |
| download | pkgsrc-5f6d15b3fd06c7a46d9a0892a54ff96d410fdb09.tar.gz | |
sysutils/bareos{,-clientonly}: rework config file permissions and users
bareos-clientonly does not need to install the bareosdir and bareossd users.
avoid installing config files twice
adjust sysutils/bareos/Makefile{,.common} for the above.
| -rw-r--r-- | sysutils/bareos-clientonly/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/bareos/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/bareos/Makefile.common | 13 |
3 files changed, 15 insertions, 19 deletions
diff --git a/sysutils/bareos-clientonly/Makefile b/sysutils/bareos-clientonly/Makefile index 18cf3a304e3..c427e06f677 100644 --- a/sysutils/bareos-clientonly/Makefile +++ b/sysutils/bareos-clientonly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2021/02/01 09:08:44 kardel Exp $ +# $NetBSD: Makefile,v 1.3 2021/02/10 11:27:19 kardel Exp $ COMMENT= Backup Archiving REcovery Open Sourced - client @@ -21,11 +21,6 @@ DISTINFO_FILE= ${.CURDIR}/../../sysutils/bareos/distinfo .include "../../mk/bsd.pkg.mk" CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null | sed -e 's/ /\\ /g' -CONF_FILES?= - -.for l in ${CONFIG_TEMPLATES} -CONF_FILES+= ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//} -.endfor BUILD_DEFS+= VARBASE # to keep pkglint happy diff --git a/sysutils/bareos/Makefile b/sysutils/bareos/Makefile index 1d00c869201..1acbe89b8f3 100644 --- a/sysutils/bareos/Makefile +++ b/sysutils/bareos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2021/02/01 09:08:43 kardel Exp $ +# $NetBSD: Makefile,v 1.5 2021/02/10 11:27:19 kardel Exp $ CONFLICTS= bareos-clientonly-[0-9]* bacula-clientonly-[0-9]* bacula-[0-9]* @@ -11,6 +11,18 @@ USE_TOOLS+= perl:run # strange: pkglint complains about VARBASE not defined in BUILD_DEFS, but it is defined in Makefile.common BUILD_DEFS+= VARBASE +BAREOS_SD_USER?= bareossd +PKG_GECOS.${BAREOS_SD_USER}= Bareos Storage User +PKG_HOME.${BAREOS_SD_USER}= ${BAREOS_WORKINGDIR} +PKG_SHELL.${BAREOS_SD_USER}= /bin/sh + +BAREOS_DIR_USER?= bareosdir +PKG_GECOS.${BAREOS_DIR_USER}= Bareos Director User +PKG_HOME.${BAREOS_DIR_USER}= ${BAREOS_WORKINGDIR} +PKG_SHELL.${BAREOS_DIR_USER}= /bin/sh + +PKG_USERS= ${BAREOS_DIR_USER}:${BAREOS_GROUP} ${BAREOS_SD_USER}:${BAREOS_GROUP} + .include "options.mk" .include "Makefile.common" diff --git a/sysutils/bareos/Makefile.common b/sysutils/bareos/Makefile.common index 892a91393be..94370eb9af0 100644 --- a/sysutils/bareos/Makefile.common +++ b/sysutils/bareos/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2021/02/01 09:08:43 kardel Exp $ +# $NetBSD: Makefile.common,v 1.3 2021/02/10 11:27:19 kardel Exp $ # used by sysutils/bareos-clientonly/Makefile GITHUB_PROJECT= bareos @@ -52,18 +52,7 @@ BUILD_DEFS+= BAREOS_PIDDIR BAREOS_WORKINGDIR # user/group information BAREOS_GROUP?= bareos -BAREOS_SD_USER?= bareossd -PKG_GECOS.${BAREOS_SD_USER}= Bareos Storage User -PKG_HOME.${BAREOS_SD_USER}= ${BAREOS_WORKINGDIR} -PKG_SHELL.${BAREOS_SD_USER}= /bin/sh - -BAREOS_DIR_USER?= bareosdir -PKG_GECOS.${BAREOS_DIR_USER}= Bareos Director User -PKG_HOME.${BAREOS_DIR_USER}= ${BAREOS_WORKINGDIR} -PKG_SHELL.${BAREOS_DIR_USER}= /bin/sh - PKG_GROUPS= ${BAREOS_GROUP} -PKG_USERS= ${BAREOS_DIR_USER}:${BAREOS_GROUP} ${BAREOS_SD_USER}:${BAREOS_GROUP} CONFIG_TEMPLATE_PATH= share/examples/${PKG_SYSCONFSUBDIR}/configtemplates |