Skip to content

Commit ed5d6b4

Browse files
bastelfreakekohl
authored andcommitted
Drop legacy FreeBSD 11 workaround
This was a workaround for legacy facter versions. The factsets in facterdb, for FreeBSD 11 & 12, all contain the ruby hash. Removing this workaround removes a legacy fact, which makes the upgrade in #929 easier.
1 parent c8f3211 commit ed5d6b4

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

manifests/params.pp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,8 @@
8686
$server_puppetserver_vardir = '/var/puppet/server/data/puppetserver'
8787
$server_puppetserver_rundir = '/var/run/puppetserver'
8888
$server_puppetserver_logdir = '/var/log/puppetserver'
89-
if fact('ruby') {
90-
$ruby_gem_dir = regsubst($facts['ruby']['version'], '^(\d+\.\d+).*$', '/usr/local/lib/ruby/gems/\1/gems')
91-
$server_ruby_load_paths = [$facts['ruby']['sitedir'], "${ruby_gem_dir}/facter-${facts['facterversion']}/lib"]
92-
} else {
93-
# On FreeBSD 11 the ruby fact doesn't resolve - at least in facterdb
94-
# lint:ignore:legacy_facts
95-
$ruby_gem_dir = regsubst($facts['rubyversion'], '^(\d+\.\d+).*$', '/usr/local/lib/ruby/gems/\1/gems')
96-
$server_ruby_load_paths = [$facts['rubysitedir'], "${ruby_gem_dir}/facter-${facts['facterversion']}/lib"]
97-
# lint:endignore
98-
}
89+
$ruby_gem_dir = regsubst($facts['ruby']['version'], '^(\d+\.\d+).*$', '/usr/local/lib/ruby/gems/\1/gems')
90+
$server_ruby_load_paths = [$facts['ruby']['sitedir'], "${ruby_gem_dir}/facter-${facts['facterversion']}/lib"]
9991
$server_jruby_gem_home = '/var/puppet/server/data/puppetserver/jruby-gems'
10092
$puppetconf_mode = '0644'
10193
}

0 commit comments

Comments
 (0)