Commit ceff11cd authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Add 'ensure' parameter to all defined types

parent 06a82abc

manifests/attr.pp

+5 −1
Original line number Diff line number Diff line 
# Install FreeRADIUS config snippets

define freeradius::attr ($source) {

define freeradius::attr (

  $source,

  $ensure = present,

) {

  $fr_package  = $::freeradius::params::fr_package

  $fr_service  = $::freeradius::params::fr_service

  $fr_basepath = $::freeradius::params::fr_basepath

  $fr_group    = $::freeradius::params::fr_group



  file { "${fr_basepath}/attr.d/${name}":

    ensure  => $ensure,

    mode    => '0640',

    owner   => 'root',

    group   => $fr_group,

manifests/cert.pp

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
define freeradius::cert (

  $source,

  $type = 'key',

  $ensure = present,

) {

  $fr_package  = $::freeradius::params::fr_package

  $fr_service  = $::freeradius::params::fr_service
@@ -9,6 +10,7 @@ define freeradius::cert ( 
  $fr_group    = $::freeradius::params::fr_group



  file { "${fr_basepath}/certs/${name}":

    ensure  => $ensure,

    mode    => $type ? {

      'key'   => '0640',

      'cert'  => '0644',

manifests/client.pp

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ define freeradius::client ( 
  $port           = undef,

  $srcip          = undef,

  $firewall       = false,

  $ensure         = present,

) {

  $fr_package  = $::freeradius::params::fr_package

  $fr_service  = $::freeradius::params::fr_service
@@ -18,6 +19,7 @@ define freeradius::client ( 
  $fr_group    = $::freeradius::params::fr_group



  file { "${fr_basepath}/clients.d/${shortname}.conf":

    ensure  => $ensure,

    mode    => '0640',

    owner   => 'root',

    group   => $fr_group,
@@ -26,7 +28,7 @@ define freeradius::client ( 
    notify  => Service[$fr_service],

  }



  if $firewall {

  if ($firewall and $ensure == 'present') {

    if $port {

      if $ip {

        firewall { "100-${shortname}-${port}-v4":

manifests/config.pp

+5 −1
Original line number Diff line number Diff line 
# Install FreeRADIUS config snippets

define freeradius::config ($source) {

define freeradius::config (

  $source,

  $ensure = present,

) {

  $fr_package  = $::freeradius::params::fr_package

  $fr_service  = $::freeradius::params::fr_service

  $fr_basepath = $::freeradius::params::fr_basepath

  $fr_group    = $::freeradius::params::fr_group



  file { "${fr_basepath}/conf.d/${name}":

    ensure  => $ensure,

    mode    => '0640',

    owner   => 'root',

    group   => $fr_group,

manifests/dictionary.pp

+14 −6
Original line number Diff line number Diff line 
# Install FreeRADIUS custom dictionaries

define freeradius::dictionary ($source, $order = 50) {

define freeradius::dictionary (

  $source,

  $order = 50,

  $ensure = present,

) {

  $fr_package  = $::freeradius::params::fr_package

  $fr_service  = $::freeradius::params::fr_service

  $fr_basepath = $::freeradius::params::fr_basepath
@@ -7,6 +11,7 @@ define freeradius::dictionary ($source, $order = 50) { 


  # Install dictionary in dictionary.d

  file { "${fr_basepath}/dictionary.d/dictionary.${name}":

    ensure  => $ensure,

    mode    => '0644',

    owner   => 'root',

    group   => $fr_group,
@@ -17,6 +22,8 @@ define freeradius::dictionary ($source, $order = 50) { 


  # Reference policy.d in the global includes file

  # If no order priority is given, assume 50



  if ($ensure == 'present') {

    concat::fragment { "dictionary.${name}":

      target  => "${fr_basepath}/dictionary",

      content => "\$INCLUDE ${fr_basepath}/dictionary.d/dictionary.${name}\n",
@@ -24,3 +31,4 @@ define freeradius::dictionary ($source, $order = 50) { 
      require => File["${fr_basepath}/dictionary.d/dictionary.${name}"],

    }

  }

}