Merge pull request #96 from amateo/huntgroup

Huntgroup

manifests/huntgroup.pp

@@ -13,7 +13,6 @@ define freeradius::huntgroup (
   $content    = "${huntgroup}\t${conditionals}\n"
 
   concat::fragment { "huntgroup.${title}":
-    ensure  => $ensure,
     target  => "${fr_basepath}/mods-config/preprocess/huntgroups",
     content => $content,
     order   => $order,

manifests/module/huntgroup.pp

@@ -3,11 +3,12 @@
 define freeradius::module::huntgroup (
   Variant[String,Array] $conditions,
   Variant[String,Integer] $order     = 50,
-  String $huntgroup                  = 'huntgroup',
+  Optional[String] $huntgroup        = undef,
 ) {
-  concat::fragment {"Huntgroup ${name}":
-    target  => $huntgroup,
-    order   => $order,
-    content => template('freeradius/huntgroup.erb'),
+  warning('Use of freeradius::module::huntgroup is deprecated. Use freeradius::huntgroup instead')
+
+  freeradius::huntgroup {$name:
+    conditions => $conditions,
+    order      => $order,
   }
 }

manifests/module/preprocess.pp

@@ -19,20 +19,4 @@ class freeradius::module::preprocess (
     ensure  => $ensure,
     content => template('freeradius/preprocess.erb'),
   }
-
-
-  $huntgroup_path = $huntgroups ? {
-    "\${moddir}/huntgroups" => "${fr_moduleconfigpath}/preprocess/huntgroups",
-    default                 => $huntgroups,
-  }
-
-  concat {'huntgroup':
-    ensure  => $ensure,
-    path    => $huntgroup_path,
-    owner   => 'root',
-    group   => $fr_group,
-    mode    => '0640',
-    require => Freeradius::Module['preprocess'],
-    notify  => Service[$fr_service],
-  }
 }