From 4bb85f345f85ba2793e9783fe343ce4d8fb2d28e Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 4 Dec 2019 17:49:46 +0100
Subject: [PATCH] Move parameters to advanced

Most parameters are actually not touched by most users. This makes it
clear.
---
 manifests/init.pp | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 65df17ed..43a9362f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,6 +4,14 @@
 #
 # === Parameters:
 #
+# $show_diff::                              Show and report changed files with diff output
+#
+# $ca_server::                              Use a different ca server. Should be either
+#                                           a string with the location of the ca_server
+#                                           or 'false'.
+#
+# == Advanced puppet parameters
+#
 # $version::                                Specify a specific version of a package to
 #                                           install. The version should be the exact
 #                                           match for your distro.
@@ -76,14 +84,8 @@
 #                                           (in seconds) to the timer. Only relevant when
 #                                           runmode is 'systemd.timer'.
 #
-# $show_diff::                              Show and report changed files with diff output
-#
 # $module_repository::                      Use a different puppet module repository
 #
-# $ca_server::                              Use a different ca server. Should be either
-#                                           a string with the location of the ca_server
-#                                           or 'false'.
-#
 # $ca_port::                                Puppet CA port
 #
 # $ca_crl_filepath::                        Path to CA CRL file, dynamically resolves based on
@@ -111,8 +113,6 @@
 #                                           read after the elapsed interval then the
 #                                           connection will be closed.
 #
-# == Advanced puppet parameters
-#
 # $user::                                   Override the name of the puppet user.
 #
 # $group::                                  Override the name of the puppet group.
@@ -248,18 +248,11 @@
 # $server_git_branch_map::                  Git branch to puppet env mapping for the
 #                                           default post receive hook
 #
-# $server_storeconfigs_backend::            Do you use storeconfigs? (note: not required)
-#                                           false if you don't, "active_record" for 2.X
-#                                           style db, "puppetdb" for puppetdb
+# $server_storeconfigs_backend::            Do you use storeconfigs?
+#                                           false if you don't, "puppetdb" for puppetdb
 #
 # $server_certname::                        The name to use when handling certificates.
 #
-# $server_strict_variables::                if set to true, it will throw parse errors
-#                                           when accessing undeclared variables.
-#
-# $server_additional_settings::             A hash of additional settings.
-#                                           Example: {trusted_node_data => true, ordering => 'manifest'}
-#
 # $server_puppetdb_host::                   PuppetDB host
 #
 # $server_puppetdb_port::                   PuppetDB port
@@ -268,6 +261,12 @@
 #
 # === Advanced server parameters:
 #
+# $server_strict_variables::                if set to true, it will throw parse errors
+#                                           when accessing undeclared variables.
+#
+# $server_additional_settings::             A hash of additional settings.
+#                                           Example: {trusted_node_data => true, ordering => 'manifest'}
+#
 # $server_manage_user::                     Whether to manage the server user resource
 #
 # $server_user::                            Name of the puppetmaster user.
@@ -528,7 +527,7 @@
 #
 #   class {'puppet':
 #     agent_noop => true,
-#     version    => '2.7.20-1',
+#     version    => '6.11.0-1',
 #   }
 #
 class puppet (