Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep ruby's system Gem.dir in gem-path on FreeBSD #843

Merged
merged 1 commit into from May 16, 2023
Merged

Keep ruby's system Gem.dir in gem-path on FreeBSD #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/server/puppetserver.pp
View file
Open in desktop
Expand Up @@ -164,7 +164,7 @@
$jvm_cmd = strip(join(flatten($jvm_cmd_arr), ' '))

if $facts['os']['family'] == 'FreeBSD' {
$server_gem_paths = ['${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"",] # lint:ignore:single_quote_string_with_variables
$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
augeas { 'puppet::server::puppetserver::jvm':
context => '/files/etc/rc.conf',
changes => ["set puppetserver_java_opts '\"${jvm_cmd}\"'"],
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/puppet_server_puppetserver_spec.rb
View file
Open in desktop
Expand Up @@ -494,7 +494,7 @@
if ['FreeBSD', 'DragonFly'].include?(facts[:osfamily])
it do
should contain_file(puppetserver_conf)
.with_content(%r{^ gem-path: \[\$\{jruby-puppet.gem-home\}, "#{server_vardir}/vendored-jruby-gems"\]$})
.with_content(%r{^ gem-path: \[\$\{jruby-puppet.gem-home\}, "#{server_vardir}/vendored-jruby-gems", "#{facts[:ruby]['sitedir'].sub(/site_ruby/,'gems')}"\]$})
end
else
it do
Expand Down