Skip to content

Commit 2ef1b86

Browse files
lluaekohl
authored andcommitted
Keep ruby's system Gem.dir in gem-path on FreeBSD
without it puppetserver will not successfully start.
1 parent 5050652 commit 2ef1b86

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

manifests/server/puppetserver.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
$jvm_cmd = strip(join(flatten($jvm_cmd_arr), ' '))
165165

166166
if $facts['os']['family'] == 'FreeBSD' {
167-
$server_gem_paths = ['${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"",] # lint:ignore:single_quote_string_with_variables
167+
$server_gem_paths = ['${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"", sprintf('"%s"', regsubst($facts['ruby']['sitedir'], 'site_ruby', 'gems'))] # lint:ignore:single_quote_string_with_variables
168168
augeas { 'puppet::server::puppetserver::jvm':
169169
context => '/files/etc/rc.conf',
170170
changes => ["set puppetserver_java_opts '\"${jvm_cmd}\"'"],

spec/classes/puppet_server_puppetserver_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@
494494
if ['FreeBSD', 'DragonFly'].include?(facts[:osfamily])
495495
it do
496496
should contain_file(puppetserver_conf)
497-
.with_content(%r{^ gem-path: \[\$\{jruby-puppet.gem-home\}, "#{server_vardir}/vendored-jruby-gems"\]$})
497+
.with_content(%r{^ gem-path: \[\$\{jruby-puppet.gem-home\}, "#{server_vardir}/vendored-jruby-gems", "#{facts[:ruby]['sitedir'].sub(/site_ruby/,'gems')}"\]$})
498498
end
499499
else
500500
it do

0 commit comments

Comments
 (0)