diff options
author | Romain Tartière <romain@FreeBSD.org> | 2020-12-04 20:45:20 +0000 |
---|---|---|
committer | Romain Tartière <romain@FreeBSD.org> | 2020-12-04 20:45:20 +0000 |
commit | 75b43c86066563308df8560ac276fe0895d8e539 (patch) | |
tree | 8bd67203043d00920d2f48049671432e6ae64548 /sysutils/puppetserver6 | |
parent | 2944f974d5ef9fe59cb698c418b8107a6c984c07 (diff) | |
download | ports-75b43c86066563308df8560ac276fe0895d8e539.tar.gz ports-75b43c86066563308df8560ac276fe0895d8e539.zip |
Hello PuppetServer 7!
Actually update sysutils/puppetserver7 from a copy of sysutils/puppetserver6
and a few minor tweaks.
While here, prepare sysutils/puppetserver6 for allowing to migrate the Puppet
CA in case users of the previous version of Puppet want to migrate it before
switching to Puppet 7.
With hat: puppet
Notes
Notes:
svn path=/head/; revision=557018
Diffstat (limited to 'sysutils/puppetserver6')
-rw-r--r-- | sysutils/puppetserver6/Makefile | 4 | ||||
-rw-r--r-- | sysutils/puppetserver6/pkg-plist | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile index c6371102d211..2258f0b218c3 100644 --- a/sysutils/puppetserver6/Makefile +++ b/sysutils/puppetserver6/Makefile @@ -2,6 +2,7 @@ PORTNAME= puppetserver PORTVERSION= 6.14.1 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \ https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi @@ -30,7 +31,7 @@ NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ -CONFLICTS_INSTALL= puppetserver-* puppetserver5-* +CONFLICTS_INSTALL= puppetserver5-* puppetserver7-* SHEBANG_FILES= ext/bin/puppetserver @@ -70,6 +71,7 @@ do-install: @${MKDIR} ${STAGEDIR}/var/log/puppetserver @${MKDIR} ${STAGEDIR}/var/puppet/server @${MKDIR} ${STAGEDIR}/var/puppet/server/data + @${MKDIR} ${STAGEDIR}/var/puppetserver @${MKDIR} ${STAGEDIR}/var/run/puppetserver ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample diff --git a/sysutils/puppetserver6/pkg-plist b/sysutils/puppetserver6/pkg-plist index 569e25345e6b..4decae04a2cc 100644 --- a/sysutils/puppetserver6/pkg-plist +++ b/sysutils/puppetserver6/pkg-plist @@ -26,4 +26,5 @@ @dir(puppet,puppet,755) /var/puppet @dir(puppet,puppet,750) /var/puppet/server @dir(puppet,puppet,750) /var/puppet/server/data +@dir(puppet,puppet,750) /var/puppetserver @dir(puppet,puppet,750) /var/run/puppetserver |