svn commit: r568899 - in head/sysutils/puppetserver7: . files

[Romain Tartière]

Author: romain
Date: Sun Mar 21 00:53:50 2021
New Revision: 568899
URL: https://svnweb.freebsd.org/changeset/ports/568899

Log:
  Update to 7.1.0
  
  Release notes:
  https://puppet.com/docs/puppet/7.5/server/release_notes.html#puppet-server-710
  
  With hat:	puppet

Modified:
  head/sysutils/puppetserver7/Makefile
  head/sysutils/puppetserver7/distinfo
  head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf

Modified: head/sysutils/puppetserver7/Makefile
==============================================================================
--- head/sysutils/puppetserver7/Makefile	Sun Mar 21 00:52:57 2021	(r568898)
+++ head/sysutils/puppetserver7/Makefile	Sun Mar 21 00:53:50 2021	(r568899)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
-PORTVERSION=	7.0.3
+PORTVERSION=	7.1.0
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/:upstream \
 		https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi

Modified: head/sysutils/puppetserver7/distinfo
==============================================================================
--- head/sysutils/puppetserver7/distinfo	Sun Mar 21 00:52:57 2021	(r568898)
+++ head/sysutils/puppetserver7/distinfo	Sun Mar 21 00:53:50 2021	(r568899)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1612946654
-SHA256 (puppetserver-7.0.3.tar.gz) = e0430925ad68cc66e580e10987845ed7397d333dccd1329c2ffe7c9df4bbbefb
-SIZE (puppetserver-7.0.3.tar.gz) = 62780509
+TIMESTAMP = 1616187255
+SHA256 (puppetserver-7.1.0.tar.gz) = e278eea1e65d1abcf8503ef05553af262f70d80be32d029b622773f4afadaa70
+SIZE (puppetserver-7.1.0.tar.gz) = 62812783
 SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93
 SIZE (ffi.rb) = 5893

Modified: head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf
==============================================================================
--- head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf	Sun Mar 21 00:52:57 2021	(r568898)
+++ head/sysutils/puppetserver7/files/patch-ext__config__conf.d__puppetserver.conf	Sun Mar 21 00:53:50 2021	(r568899)
@@ -1,4 +1,4 @@
---- ext/config/conf.d/puppetserver.conf.orig	2020-10-16 14:28:08 UTC
+--- ext/config/conf.d/puppetserver.conf.orig	2021-03-12 18:01:54 UTC
 +++ ext/config/conf.d/puppetserver.conf
 @@ -2,16 +2,20 @@
  jruby-puppet: {
@@ -28,28 +28,28 @@
  
      # (optional) path to puppet conf dir; if not specified, will use
      # /etc/puppetlabs/puppet
--    master-conf-dir: /etc/puppetlabs/puppet
-+    master-conf-dir: %%PREFIX%%/etc/puppet
+-    server-conf-dir: /etc/puppetlabs/puppet
++    server-conf-dir: %%PREFIX%%/etc/puppet
  
      # (optional) path to puppet code dir; if not specified, will use
      # /etc/puppetlabs/code
--    master-code-dir: /etc/puppetlabs/code
-+    master-code-dir: %%PREFIX%%/etc/puppet/code
+-    server-code-dir: /etc/puppetlabs/code
++    server-code-dir: %%PREFIX%%/etc/puppet/code
  
      # (optional) path to puppet var dir; if not specified, will use
      # /opt/puppetlabs/server/data/puppetserver
--    master-var-dir: /opt/puppetlabs/server/data/puppetserver
-+    master-var-dir: /var/puppet/server/data/puppetserver
+-    server-var-dir: /opt/puppetlabs/server/data/puppetserver
++    server-var-dir: /var/puppet/server/data/puppetserver
  
      # (optional) path to puppet run dir; if not specified, will use
      # /var/run/puppetlabs/puppetserver
--    master-run-dir: /var/run/puppetlabs/puppetserver
-+    master-run-dir: /var/run/puppetserver
+-    server-run-dir: /var/run/puppetlabs/puppetserver
++    server-run-dir: /var/run/puppetserver
  
      # (optional) path to puppet log dir; if not specified, will use
      # /var/log/puppetlabs/puppetserver
--    master-log-dir: /var/log/puppetlabs/puppetserver
-+    master-log-dir: /var/log/puppetserver
+-    server-log-dir: /var/log/puppetlabs/puppetserver
++    server-log-dir: /var/log/puppetserver
  
      # (optional) maximum number of JRuby instances to allow
      #max-active-instances: 1