From owner-freebsd-ports-bugs@freebsd.org Fri Aug 28 04:15:42 2015 Return-Path: Delivered-To: freebsd-ports-bugs@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E63939C3DA1 for ; Fri, 28 Aug 2015 04:15:42 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7A618A7 for ; Fri, 28 Aug 2015 04:15:42 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id t7S4FgaC077233 for ; Fri, 28 Aug 2015 04:15:42 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 202704] [PATCH] sysutils/puppet update puppetmaster rc.d script to use `manifest` instead of `manifestdir`/site.pp Date: Fri, 28 Aug 2015 04:15:42 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: patch X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: yesthanks@lemonia.org X-Bugzilla-Status: New X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: swills@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status keywords bug_severity priority component assigned_to reporter flagtypes.name attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2015 04:15:43 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=202704 Bug ID: 202704 Summary: [PATCH] sysutils/puppet update puppetmaster rc.d script to use `manifest` instead of `manifestdir`/site.pp Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Keywords: patch Severity: Affects Some People Priority: --- Component: Individual Port(s) Assignee: swills@FreeBSD.org Reporter: yesthanks@lemonia.org Keywords: patch Flags: maintainer-feedback?(swills@FreeBSD.org) Assignee: swills@FreeBSD.org Created attachment 160431 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=160431&action=edit patch for puppetmaster rc.d script The `rc.d/puppetmaster` script sanity checks Puppet configuration before starting using `puppet validate `${puppetmaster_manifestdir}/site.pp` Directory-based environments [1] provide a level of indirection for the location of the default site manifest through `environment.conf`. This allows the administrator to set a new location for `site.pp` with the `manifest` directive, but it does not allow for a new `manifestdir` [2][3]. This means it's possible to have `puppet config` report a bogus answer to `print manifestdir` whilst reporting the correct answer to `print manifest`. This prevents the Puppetmaster from starting because it can not validate an absent `/usr/local/etc/puppet/manifests/site.pp`. This small patch makes the script discover and validate the site manifest wherever it has been configured to be. [1] https://docs.puppetlabs.com/puppet/3.8/reference/environments_creating.html [2] https://docs.puppetlabs.com/puppet/3.8/reference/config_file_environment.html#allowed-settings [3] My own motivation is to point Puppet to a Git repository elsewhere and leave /usr/local/etc/puppet (almost) alone -- You are receiving this mail because: You are the assignee for the bug.