diff options
| author | sborrill <sborrill@pkgsrc.org> | 2017-02-09 15:01:20 +0000 |
|---|---|---|
| committer | sborrill <sborrill@pkgsrc.org> | 2017-02-09 15:01:20 +0000 |
| commit | f42031a52b2c1b7739e50b947130f16e2191758b (patch) | |
| tree | 41e829f738b0ee8734c61e0ed10a9c2f3d71b40e /sysutils/salt | |
| parent | b9efe25e74fff770e7aa8b20093210e6fef12aa7 (diff) | |
| download | pkgsrc-f42031a52b2c1b7739e50b947130f16e2191758b.tar.gz | |
Fix configuration paths by not specifying PREFIX as installation root.
Move file server root paths to VARBASE/salt.
Bump PKGREVISION
Diffstat (limited to 'sysutils/salt')
| -rw-r--r-- | sysutils/salt/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index eec8a1f2f81..907600edc97 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2017/02/06 12:48:18 sborrill Exp $ +# $NetBSD: Makefile,v 1.47 2017/02/09 15:01:20 sborrill Exp $ DISTNAME= salt-2016.11.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} @@ -25,13 +25,12 @@ BUILD_DEFS+= VARBASE PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-m2crypto -PYSETUPARGS+= --salt-root-dir=${PREFIX} PYSETUPARGS+= --salt-config-dir=${PKG_SYSCONFDIR} PYSETUPARGS+= --salt-cache-dir=${VARBASE}/cache/salt PYSETUPARGS+= --salt-sock-dir=${VARBASE}/run/salt -PYSETUPARGS+= --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states -PYSETUPARGS+= --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar -PYSETUPARGS+= --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master +PYSETUPARGS+= --salt-base-file-roots-dir=${VARBASE}/salt/file-roots +PYSETUPARGS+= --salt-base-pillar-roots-dir=${VARBASE}/salt/pillar-roots +PYSETUPARGS+= --salt-base-master-roots-dir=${VARBASE}/salt/master-roots PYSETUPARGS+= --salt-logs-dir=${VARBASE}/log/salt PYSETUPARGS+= --salt-pidfile-dir=${VARBASE}/run @@ -49,8 +48,9 @@ INSTALLATION_DIRS+= ${EGDIR} CONF_FILES+= ${EGDIR}/master ${PKG_SYSCONFDIR}/master CONF_FILES+= ${EGDIR}/minion ${PKG_SYSCONFDIR}/minion -OWN_DIRS+= ${PKG_SYSCONFDIR}/states ${PKG_SYSCONFDIR}/pillar -OWN_DIRS+= ${PKG_SYSCONFDIR}/salt-master +OWN_DIRS+= ${VARBASE}/salt/file-roots +OWN_DIRS+= ${VARBASE}/salt/pillar-roots +OWN_DIRS+= ${VARBASE}/salt/master-roots OWN_DIRS+= ${VARBASE}/cache/salt ${VARBASE}/run/salt OWN_DIRS+= ${VARBASE}/log/salt @@ -61,8 +61,8 @@ SUBST_FILES.fix-paths= conf/* SUBST_FILES.fix-paths+= doc/man/* salt/modules/munin.py setup.py SUBST_FILES.fix-paths+= salt/utils/rsax931.py salt/grains/core.py SUBST_SED.fix-paths= -e 's,/etc/salt,${PKG_SYSCONFDIR},g' -SUBST_SED.fix-paths+= -e 's,/srv/salt,${PKG_SYSCONFDIR}/states,g' -SUBST_SED.fix-paths+= -e 's,/srv/pillar,${PKG_SYSCONFDIR}/pillar,g' +SUBST_SED.fix-paths+= -e 's,/srv/salt,${VARBASE}/salt/file-roots,g' +SUBST_SED.fix-paths+= -e 's,/srv/pillar,${VARBASE}/salt/pillar-roots,g' SUBST_SED.fix-paths+= -e 's,/etc/munin,${PKG_SYSCONFBASEDIR}/munin,g' SUBST_SED.fix-paths+= -e 's,share/man,${PKGMANDIR},g' SUBST_SED.fix-paths+= -e 's,/opt/local/lib,${PREFIX}/lib,g' |