From a429255c635b7e92b6537e664764a9d0666c4342 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Fri, 3 May 2024 20:07:02 +1000
Subject: [PATCH] feat: puppet server agent

- add [agent] settings for puppetservers
---
 site/profiles/manifests/puppet/server.pp      | 44 ++++++++++++-------
 .../templates/puppet/server/puppet.conf.epp   |  9 +++-
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/site/profiles/manifests/puppet/server.pp b/site/profiles/manifests/puppet/server.pp
index ecf1f97..7cf2731 100644
--- a/site/profiles/manifests/puppet/server.pp
+++ b/site/profiles/manifests/puppet/server.pp
@@ -15,25 +15,32 @@
 #   autosign - Path to the autosign script.
 #
 class profiles::puppet::server (
-  Stdlib::Absolutepath $vardir = '/opt/puppetlabs/server/data/puppetserver',
-  Stdlib::Absolutepath $logdir = '/var/log/puppetlabs/puppetserver',
-  Stdlib::Absolutepath $rundir = '/var/run/puppetlabs/puppetserver',
-  Stdlib::Absolutepath $pidfile = '/var/run/puppetlabs/puppetserver/puppetserver.pid',
-  Stdlib::Absolutepath $codedir = '/etc/puppetlabs/code',
-  Array[String] $dns_alt_names = [
+  Stdlib::Absolutepath $vardir    = '/opt/puppetlabs/server/data/puppetserver',
+  Stdlib::Absolutepath $logdir    = '/var/log/puppetlabs/puppetserver',
+  Stdlib::Absolutepath $rundir    = '/var/run/puppetlabs/puppetserver',
+  Stdlib::Absolutepath $pidfile   = '/var/run/puppetlabs/puppetserver/puppetserver.pid',
+  Stdlib::Absolutepath $codedir   = '/etc/puppetlabs/code',
+  Array[String] $dns_alt_names    = [
     $facts['networking']['fqdn'],
     $facts['networking']['hostname'],
   ],
-  Stdlib::Fqdn $agent_server = 'puppetmaster',
-  String $node_terminus = 'exec',
-  String $external_nodes = '/opt/cobbler-enc/cobbler-enc',
-  String $default_environment = 'develop',
-  Stdlib::Absolutepath $autosign = '/etc/puppetlabs/puppet/autosign.conf',
+  Stdlib::Fqdn $agent_server      = 'puppetmaster',
+  Stdlib::Fqdn $report_server     = $agent_server,
+  Stdlib::Fqdn $ca_server         = 'puppetca',
+  String  $node_terminus          = 'exec',
+  String  $external_nodes         = '/opt/cobbler-enc/cobbler-enc',
+  String  $default_environment    = 'develop',
+  String  $environment            = 'develop',
+  Stdlib::Absolutepath $autosign  = '/etc/puppetlabs/puppet/autosign.conf',
   Stdlib::Absolutepath $default_manifest = "${codedir}/environments/${default_environment}/manifests",
-  Boolean $storeconfigs = true,
-  String $storeconfigs_backend = 'puppetdb',
-  String $reports = 'puppetdb',
-  Boolean $usecacheonfailure = false,
+  String  $reports                = 'puppetdb',
+  Boolean $storeconfigs           = true,
+  String  $storeconfigs_backend   = 'puppetdb',
+  Boolean $usecacheonfailure      = false,
+  Boolean $report                 = true,
+  Integer $runinterval            = 1800,
+  Integer $runtimeout             = 3600,
+  Boolean $show_diff              = true,
 ) {
 
   file { '/etc/puppetlabs/puppet/puppet.conf':
@@ -49,6 +56,13 @@ class profiles::puppet::server (
       'codedir'              => $codedir,
       'dns_alt_names'        => join(sort($dns_alt_names), ','),
       'server'               => $agent_server,
+      'ca_server'            => $ca_server,
+      'environment'          => $environment,
+      'report'               => $report,
+      'runinterval'          => $runinterval,
+      'runtimeout'           => $runtimeout,
+      'show_diff'            => $show_diff,
+      'report_server'        => $report_server,
       'node_terminus'        => $node_terminus,
       'external_nodes'       => $external_nodes,
       'autosign'             => $autosign,
diff --git a/site/profiles/templates/puppet/server/puppet.conf.epp b/site/profiles/templates/puppet/server/puppet.conf.epp
index 226346d..dbb93ee 100644
--- a/site/profiles/templates/puppet/server/puppet.conf.epp
+++ b/site/profiles/templates/puppet/server/puppet.conf.epp
@@ -10,9 +10,16 @@ dns_alt_names = <%= $dns_alt_names %>
 
 [agent]
 server = <%= $server %>
+ca_server = <%= $ca_server %>
+environment = <%= $environment %>
+report = <%= $report %>
+report_server = <%= $report_server %>
+runinterval = <%= $runinterval %>
+runtimeout = <%= $runtimeout %>
+show_diff = <%= $show_diff %>
 
 [master]
-node_terminus = exec
+node_terminus = <%= $node_terminus %>
 external_nodes = <%= $external_nodes %>
 autosign = <%= $autosign %>
 default_manifest = <%= $default_manifest %>