- Fix auth.conf confusion

- Use ETCDIR
- Fix minor typo

Reported by:    QAT
Submitted by:   ohauer
Approved by:    Russell Jackson <raj@csub.edu> (maintainer)
This commit is contained in:
Philip M. Gollucci 2010-12-11 23:49:52 +00:00
parent aaa83d38a7
commit 6eca8a5c71
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=266079
3 changed files with 10 additions and 9 deletions

View file

@ -50,7 +50,8 @@ RUN_DEPENDS+= rubygem-mongrel>=0:${PORTSDIR}/www/rubygem-mongrel
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \
@${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
${WRKSRC}/install.rb \
${WRKSRC}/lib/puppet/reference/configuration.rb \
${WRKSRC}/lib/puppet/defaults.rb \
${WRKSRC}/lib/puppet/util/run_mode.rb
@ -66,16 +67,16 @@ pre-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
do-install:
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb
@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs
post-install:
${INSTALL} -d ${PREFIX}/etc/${PORTNAME}
${INSTALL} -d ${ETCDIR}
${RUBY} -I ${RUBY_SITELIBDIR} ${PREFIX}/sbin/puppetmasterd \
--confdir=${PREFIX}/etc/${PORTNAME} \
--confdir=${ETCDIR} \
--rundir=${PUPPET_RUNDIR} \
--genconfig | \
${SED} -e 's/genconfig = true/# genconfig = false/' \
> ${PREFIX}/etc/${PORTNAME}/puppet.conf-dist
> ${ETCDIR}/puppet.conf-dist
@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
@ -89,6 +90,7 @@ post-install:
.endif
.if !defined(NOPORTEXAMPLES)
cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
${INSTALL} ${WRKSRC}/conf/auth.conf ${EXAMPLESDIR}/etc
.endif
@${CAT} ${PKGMESSAGE}

View file

@ -8,7 +8,7 @@ To enable the puppetmaster, add the following to /etc/rc.conf:
puppetmaster_enable="YES"
Individual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
deprecated. Use a single file, %%PREFIX%%/etc/puppet/puppet.conf.
deprecated. Use a single file, %%ETCDIR%%/puppet.conf.
The default PID directory is %%PUPPET_RUNDIR%%.

View file

@ -9,6 +9,5 @@ sbin/puppetd
sbin/puppetmasterd
sbin/puppetqd
sbin/puppetrun
etc/puppet/puppet.conf-dist
etc/puppet/auth.conf
@dirrmtry etc/puppet
%%ETCDIR%%/puppet.conf-dist
@dirrmtry %%ETCDIR%%