1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- ext/config/conf.d/puppetserver.conf.orig 2017-08-02 20:01:48.229660631 -0700
+++ ext/config/conf.d/puppetserver.conf 2017-08-04 14:00:29.705675760 -0700
@@ -2,16 +2,20 @@
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/vendor_ruby,
+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.5.0/lib,
+ ]
# This setting determines where JRuby will install gems. It is used for loading gems,
# and also 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
# This setting defines the complete "GEM_PATH" for jruby. If set, it should include
# the gem-home directory as well as any other directories that gems can be loaded
# from (including the vendored gems directory for gems that ship with puppetserver)
- gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems"]
+ gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems"]
# PLEASE NOTE: Use caution when modifying the below settings. Modifying
# these settings will change the value of the corresponding Puppet settings
@@ -26,23 +30,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
|
