kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix configuration paths by not specifying PREFIX as installation root.

Browse source 
Move file server root paths to VARBASE/salt.
Bump PKGREVISION
This commit is contained in:
sborrill 2017-02-09 15:01:20 +00:00
parent 219cb85728
commit b8f6a9bf71
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sysutils/salt/Makefile
View file

@ -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'