$OpenBSD: patch-lib_puppet_defaults_rb,v 1.10 2014/06/19 12:27:39 jasper Exp $
--- lib/puppet/defaults.rb.orig	Mon Jun  9 23:08:19 2014
+++ lib/puppet/defaults.rb	Fri Jun 20 00:25:10 2014
@@ -900,11 +900,11 @@ EOT
 
   define_settings(:master,
     :user => {
-      :default    => "puppet",
+      :default    => "_puppet",
       :desc       => "The user puppet master should run as.",
     },
     :group => {
-      :default    => "puppet",
+      :default    => "_puppet",
       :desc       => "The group puppet master should run as.",
     },
     :manifestdir => {
@@ -989,7 +989,7 @@ EOT
       :desc       => "Whether the master should function as a certificate authority.",
     },
     :basemodulepath => {
-      :default => "$confdir/modules#{File::PATH_SEPARATOR}/usr/share/puppet/modules",
+      :default => "$confdir/modules#{File::PATH_SEPARATOR}${TRUEPREFIX}/share/puppet/modules",
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
