cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hello PuppetServer 7!

Browse Source 
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
This commit is contained in:
Romain Tartière 2020-12-04 20:45:20 +00:00
parent 2944f974d5
commit 75b43c8606
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=557018
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/Makefile
View File

@ -969,6 +969,7 @@
SUBDIR += puppet7
SUBDIR += puppetserver5
SUBDIR += puppetserver6
SUBDIR += puppetserver7
SUBDIR += pv
SUBDIR += pwd_unmkdb
SUBDIR += pwgen

2
sysutils/puppetserver5/Makefile
View File

@ -26,7 +26,7 @@ NO_ARCH= yes
NO_BUILD= yes
JAVA_VERSION= 1.8+
CONFLICTS_INSTALL= puppetserver-* puppetserver6-*
CONFLICTS_INSTALL= puppetserver6-* puppetserver7-*
SHEBANG_FILES= ext/bin/puppetserver

4
sysutils/puppetserver6/Makefile
View File

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

1
sysutils/puppetserver6/pkg-plist
View File

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

9
sysutils/puppetserver7/Makefile
View File

@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= puppetserver
PORTVERSION= 6.14.1
PORTVERSION= 7.0.0
CATEGORIES= sysutils java
MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \
https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi
PKGNAMESUFFIX= 6
PKGNAMESUFFIX= 7
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:upstream \
ffi.rb:ffi
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@ -16,7 +16,7 @@ COMMENT= Puppet Server running in the JVM
LICENSE= APACHE20
RUN_DEPENDS= bash>=0:shells/bash \
puppet6>=0:sysutils/puppet6 \
puppet7>=0:sysutils/puppet7 \
rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \
rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \
sudo>=1:security/sudo
@ -30,7 +30,7 @@ NO_ARCH= yes
NO_BUILD= yes
JAVA_VERSION= 1.8+
CONFLICTS_INSTALL= puppetserver-* puppetserver5-*
CONFLICTS_INSTALL= puppetserver5-* puppetserver6-*
SHEBANG_FILES= ext/bin/puppetserver
@ -70,6 +70,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

6
sysutils/puppetserver7/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1604551702
SHA256 (puppetserver-6.14.1.tar.gz) = 82bfa2306f990dd75e011b00d51406e92f0cac173a9fca9cdba2e7d1949b6436
SIZE (puppetserver-6.14.1.tar.gz) = 61960154
TIMESTAMP = 1605813620
SHA256 (puppetserver-7.0.0.tar.gz) = 709988ac64c50e0ae0f51f9fc850e608327ac327ccac29828b76e84e746974da
SIZE (puppetserver-7.0.0.tar.gz) = 61949278
SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93
SIZE (ffi.rb) = 5893

1
sysutils/puppetserver7/pkg-plist
View File

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