$OpenBSD: patch-lib_puppet_defaults_rb,v 1.5 2018/11/12 07:17:36 sebastia Exp $
Index: lib/puppet/defaults.rb
--- lib/puppet/defaults.rb.orig
+++ lib/puppet/defaults.rb
@@ -1209,13 +1209,13 @@ EOT
 
   define_settings(:master,
     :user => {
-      :default    => "puppet",
+      :default    => "_puppet",
       :desc       => "The user Puppet Server will run as. Used to ensure
       the agent side processes (agent, apply, etc) create files and
       directories readable by Puppet Server when necessary.",
     },
     :group => {
-      :default    => "puppet",
+      :default    => "_puppet",
       :desc       => "The group Puppet Server will run as. Used to ensure
       the agent side processes (agent, apply, etc) create files and
       directories readable by Puppet Server when necessary.",
@@ -1320,7 +1320,7 @@ EOT
         if Puppet::Util::Platform.windows?
           '$codedir/modules'
         else
-          '$codedir/modules:/opt/puppetlabs/puppet/modules'
+          '$codedir/modules:/var/puppetlabs/puppet/modules'
         end
       end,
       :type => :path,
