Template mod config dir for FR2 and FR3

manifests/config.pp

@@ -6,17 +6,17 @@ define freeradius::config (
 ) {
   $fr_package          = $::freeradius::params::fr_package
   $fr_service          = $::freeradius::params::fr_service
-  $fr_basepath = $::freeradius::params::fr_basepath
   $fr_group            = $::freeradius::params::fr_group
+  $fr_moduleconfigpath = $::freeradius::params::fr_moduleconfigpath
 
-  file { "${fr_basepath}/conf.d/${name}":
+  file { "${fr_moduleconfigpath}/${name}":
     ensure  => $ensure,
     mode    => '0640',
     owner   => 'root',
     group   => $fr_group,
     source  => $source,
     content => $content,
-    require => [File["${fr_basepath}/conf.d"], Package[$fr_package], Group[$fr_group]],
+    require => [File[$fr_moduleconfigpath], Package[$fr_package], Group[$fr_group]],
     notify  => Service[$fr_service],
   }
 }

manifests/params.pp

@@ -46,6 +46,16 @@ class freeradius::params {
   # Default module path
   $fr_modulepath = "${fr_basepath}/${fr_moduledir}"
 
+  # Default module config dir
+  $fr_modconfigdir = $::freeradius_version ? {
+    /^2\./    => 'conf.d',
+    /^3\./    => 'mods-config',
+    default   => 'conf.d',
+  }
+
+  # Default module config path
+  $fr_moduleconfigpath = "${fr_basepath}/${fr_modconfigdir}"
+
   # Path for FreeRADIUS logs
   $fr_logpath = $::osfamily ? {
     'RedHat' => '/var/log/radius',