compiler.rb: Switch to modern facts

All of those are available at least since Facter 3.
puppetlabs · Sep 13, 2024 · bf2b13c · bf2b13c
1 parent fd9f03b
commit bf2b13c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/ruby/puppetserver-lib/puppet/server/compiler.rb b/src/ruby/puppetserver-lib/puppet/server/compiler.rb
@@ -239,9 +239,9 @@ def set_server_facts
         @server_facts['serverversion'] = Puppet.version.to_s
 
         # And then add the server name and IP
-        { 'servername' => 'fqdn',
-          'serverip' => 'ipaddress',
-          'serverip6' => 'ipaddress6'
+        { 'servername' => 'networking.fqdn',
+          'serverip' => 'networking.ip',
+          'serverip6' => 'networking.ip6'
         }.each do |var, fact|
           value = Facter.value(fact)
           if value
@@ -250,10 +250,10 @@ def set_server_facts
         end
 
         if @server_facts['servername'].nil?
-          host = Facter.value(:hostname)
+          host = Facter.value('networking.hostname')
           if host.nil?
             Puppet.warning _("Could not retrieve fact servername")
-          elsif domain = Facter.value(:domain)
+          elsif domain = Facter.value('networking.domain')
             @server_facts['servername'] = [host, domain].join('.')
           else
             @server_facts['servername'] = host