Revert "use puppetlabs-hocon for product.conf"

This reverts commit 0a45dd1.

manifests/server/puppetserver.pp

@@ -349,24 +349,15 @@
     require => File[$webserver_conf],
   }
 
-  $product_conf = "${server_puppetserver_dir}/conf.d/product.conf"
-
   if versioncmp($server_puppetserver_version, '2.7') >= 0 {
     $product_conf_ensure = file
-
-    hocon_setting { 'product.check-for-updates':
-      ensure  => present,
-      path    => $product_conf,
-      setting => 'product.check-for-updates',
-      value   => $server_check_for_updates,
-      require => File[$product_conf],
-    }
   } else {
     $product_conf_ensure = absent
   }
 
-  file { $product_conf:
-    ensure => $product_conf_ensure,
+  file { "${server_puppetserver_dir}/conf.d/product.conf":
+    ensure  => $product_conf_ensure,
+    content => template('puppet/server/puppetserver/conf.d/product.conf.erb'),
   }
 
   if versioncmp($server_puppetserver_version, '5.0') >= 0 {

spec/classes/puppet_server_puppetserver_spec.rb

@@ -516,14 +516,7 @@
           end
           it {
             should contain_file('/etc/custom/puppetserver/conf.d/product.conf').
-              with_ensure('file')
-          }
-          it {
-            should contain_hocon_setting('product.check-for-updates').
-              with_path('/etc/custom/puppetserver/conf.d/product.conf').
-              with_setting('product.check-for-updates').
-              with_value(false).
-              with_ensure('present')
+              with_content(/^\s+check-for-updates: false/)
           }
         end
 
@@ -535,7 +528,6 @@
             )
           end
           it { should contain_file('/etc/custom/puppetserver/conf.d/product.conf').with_ensure('absent') }
-          it { should_not contain_hocon_setting('product.check-for-updates') }
         end
       end
 

templates/server/puppetserver/conf.d/product.conf.erb

@@ -0,0 +1,4 @@
+product: {
+  # automatic update checks and corresponding analytic data collection
+  check-for-updates: <%= @server_check_for_updates %>
+}