svn commit: r467077 - in head/sysutils: puppet4 puppet4/files puppet5 puppet5/files

[Romain Tartière]

Author: romain
Date: Wed Apr 11 14:54:38 2018
New Revision: 467077
URL: https://svnweb.freebsd.org/changeset/ports/467077

Log:
  Improve the puppetmaster rc-scripts
  
  - Only check manifests syntax if the puppetmaster service is enabled (which is
    not recommended);
  - Silent `puppet config print` on Puppet 5;
  - Bump PORTREVISION.
  
  With hat:	puppet
  PR:		227440
  Submitted by:	sasaki at fcc.ad.jp

Modified:
  head/sysutils/puppet4/Makefile
  head/sysutils/puppet4/files/puppetmaster.in
  head/sysutils/puppet5/Makefile
  head/sysutils/puppet5/files/puppetmaster.in

Modified: head/sysutils/puppet4/Makefile
==============================================================================
--- head/sysutils/puppet4/Makefile	Wed Apr 11 14:51:03 2018	(r467076)
+++ head/sysutils/puppet4/Makefile	Wed Apr 11 14:54:38 2018	(r467077)
@@ -2,7 +2,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	4.10.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	4

Modified: head/sysutils/puppet4/files/puppetmaster.in
==============================================================================
--- head/sysutils/puppet4/files/puppetmaster.in	Wed Apr 11 14:51:03 2018	(r467076)
+++ head/sysutils/puppet4/files/puppetmaster.in	Wed Apr 11 14:54:38 2018	(r467077)
@@ -28,11 +28,11 @@ command_args="master ${puppetmaster_flags}"
 unset puppetmaster_flags
 
 pidfile="${puppetmaster_rundir}/master.pid"
-puppet_manifest="$($command config print manifest)"
 
 start_precmd="puppetmaster_checkconfig"
 restart_precmd="puppetmaster_checkconfig"
 puppetmaster_checkconfig() {
+	puppet_manifest="$($command config print manifest)"
 	cat << EOT
 ================================================================================
 The Rack and WEBrick Puppet master servers are deprecated and will be removed

Modified: head/sysutils/puppet5/Makefile
==============================================================================
--- head/sysutils/puppet5/Makefile	Wed Apr 11 14:51:03 2018	(r467076)
+++ head/sysutils/puppet5/Makefile	Wed Apr 11 14:54:38 2018	(r467077)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	5.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5

Modified: head/sysutils/puppet5/files/puppetmaster.in
==============================================================================
--- head/sysutils/puppet5/files/puppetmaster.in	Wed Apr 11 14:51:03 2018	(r467076)
+++ head/sysutils/puppet5/files/puppetmaster.in	Wed Apr 11 14:54:38 2018	(r467077)
@@ -28,11 +28,11 @@ command_args="master ${puppetmaster_flags}"
 unset puppetmaster_flags
 
 pidfile="${puppetmaster_rundir}/master.pid"
-puppet_manifest="$($command config print manifest)"
 
 start_precmd="puppetmaster_checkconfig"
 restart_precmd="puppetmaster_checkconfig"
 puppetmaster_checkconfig() {
+	puppet_manifest="$($command config print --section=main manifest 2> /dev/null)"
 	cat << EOT
 ================================================================================
 The Rack and WEBrick Puppet master servers are deprecated and will be removed