mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-16 03:24:07 +00:00
Code Issues Releases Activity

Improve the puppetmaster rc-scripts

Browse Source 
- 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@fcc.ad.jp
This commit is contained in:
Romain Tartière 2018-04-11 14:54:38 +00:00
parent 00c0a54a85
commit eafa270e9f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=467077
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/puppet4/Makefile
View File

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

2
sysutils/puppet4/files/puppetmaster.in
View File

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

1
sysutils/puppet5/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= puppet
PORTVERSION= 5.5.0
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
PKGNAMESUFFIX= 5

2
sysutils/puppet5/files/puppetmaster.in
View File

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