diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2018-04-11 14:54:38 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2018-04-11 14:54:38 +0000 |
| commit | eafa270e9f8825e9023c2387426ad6c940d08af9 (patch) | |
| tree | b01a6c24eb50e962238f630e0fbd6df189b36497 /sysutils/puppet5/files | |
| parent | Update to 3.2.4 (diff) | |
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@fcc.ad.jp
Notes
Notes:
svn path=/head/; revision=467077
Diffstat (limited to 'sysutils/puppet5/files')
| -rw-r--r-- | sysutils/puppet5/files/puppetmaster.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/puppet5/files/puppetmaster.in b/sysutils/puppet5/files/puppetmaster.in index 7d39ffcd6e57..ec0bc9684a68 100644 --- a/sysutils/puppet5/files/puppetmaster.in +++ b/sysutils/puppet5/files/puppetmaster.in @@ -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 |