$OpenBSD: patch-lib_puppet_defaults_rb,v 1.9 2012/12/11 17:26:51 ajacoutot Exp $
--- lib/puppet/defaults.rb.orig	Sun Oct 28 19:09:38 2012
+++ lib/puppet/defaults.rb	Sun Oct 28 19:10:05 2012
@@ -729,11 +729,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 => {
@@ -804,7 +804,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 ';'.)",
