$OpenBSD: patch-lib_puppet_defaults_rb,v 1.16 2015/08/11 20:19:45 jasper Exp $
--- lib/puppet/defaults.rb.orig	Thu Aug  6 18:17:42 2015
+++ lib/puppet/defaults.rb	Sat Aug  8 10:37:45 2015
@@ -1040,11 +1040,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 => {
@@ -1167,7 +1167,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
