$OpenBSD: patch-lib_puppet_defaults_rb,v 1.3 2013/07/17 14:18:38 jasper Exp $
--- lib/puppet/defaults.rb.orig	Fri Jul 12 02:15:45 2013
+++ lib/puppet/defaults.rb	Wed Jul 17 16:11:07 2013
@@ -737,11 +737,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 => {
@@ -814,7 +814,7 @@ EOT
       :desc       => "Whether the master should function as a certificate authority.",
     },
     :modulepath => {
-      :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 modules, as a list of directories separated by the system path separator character. " +
           "(The POSIX path separator is ':', and the Windows path separator is ';'.)",
