Unverified Commit f0d20754 authored by Jonathan's avatar Jonathan Committed by GitHub
Browse files

Merge pull request #96 from amateo/huntgroup 

Huntgroup
parents 9b64187c 9dc7b3eb

manifests/huntgroup.pp

+0 −1
Original line number Diff line number Diff line
@@ -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

+6 −5
Original line number Diff line number Diff line
@@ -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,

  warning('Use of freeradius::module::huntgroup is deprecated. Use freeradius::huntgroup instead')



  freeradius::huntgroup {$name:

    conditions => $conditions,

    order      => $order,

    content => template('freeradius/huntgroup.erb'),

  }

}

manifests/module/preprocess.pp

+0 −16
Original line number Diff line number Diff line
@@ -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],

  }

}