--- ext/config/conf.d/puppetserver.conf.orig	2015-10-27 17:03:52 UTC
+++ ext/config/conf.d/puppetserver.conf
@@ -2,11 +2,14 @@
 jruby-puppet: {
     # Where the puppet-agent dependency places puppet, facter, etc...
     # Puppet server expects to load Puppet from this location
-    ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
+    ruby-load-path: [
+        %%RUBY_SITELIBDIR%%,
+        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.4/lib/,
+    ]
 
     # This setting determines where JRuby will look for gems.  It is also
     # used by the `puppetserver gem` command line tool.
-    gem-home: /opt/puppetlabs/server/data/puppetserver/jruby-gems
+    gem-home: /var/puppet/server/data/puppetserver/jruby-gems
 
 
     # PLEASE NOTE: Use caution when modifying the below settings. Modifying
@@ -22,23 +25,23 @@
 
     # (optional) path to puppet conf dir; if not specified, will use
     # /etc/puppetlabs/puppet
-    master-conf-dir: /etc/puppetlabs/puppet
+    master-conf-dir: %%PREFIX%%/etc/puppet
 
     # (optional) path to puppet code dir; if not specified, will use
     # /etc/puppetlabs/code
-    master-code-dir: /etc/puppetlabs/code
+    master-code-dir: %%PREFIX%%/etc/puppet/code
 
     # (optional) path to puppet var dir; if not specified, will use
     # /opt/puppetlabs/server/data/puppetserver
-    master-var-dir: /opt/puppetlabs/server/data/puppetserver
+    master-var-dir: /var/puppet/server/data/puppetserver
 
     # (optional) path to puppet run dir; if not specified, will use
     # /var/run/puppetlabs/puppetserver
-    master-run-dir: /var/run/puppetlabs/puppetserver
+    master-run-dir: /var/run/puppetserver
 
     # (optional) path to puppet log dir; if not specified, will use
     # /var/log/puppetlabs/puppetserver
-    master-log-dir: /var/log/puppetlabs/puppetserver
+    master-log-dir: /var/log/puppetserver
 
     # (optional) maximum number of JRuby instances to allow
     #max-active-instances: 1