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

Merge pull request #191 from SearchLightNZ/183-rework-manifests-to-enable-os-independent-testing 

Rework resources to have OS-independent names
parents 31db98a1 ae121cf3

manifests/attr.pp

+6 −9
Original line number Diff line number Diff line
@@ -6,27 +6,24 @@ define freeradius::attr ( 
  Optional[String] $prefix               = 'filter',

  Optional[Freeradius::Boolean] $relaxed = undef,

) {

  $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

  $fr_modulepath       = $::freeradius::params::fr_modulepath



  # Install the attribute filter snippet

  file { "${fr_moduleconfigpath}/attr_filter/${name}":

  file { "freeradius attr_filter/${name}":

    ensure  => $ensure,

    path    => "${fr_moduleconfigpath}/attr_filter/${name}",

    mode    => '0640',

    owner   => 'root',

    group   => $fr_group,

    source  => $source,

    require => [Package[$fr_package], Group[$fr_group]],

    notify  => Service[$fr_service],

    require => [Package['freeradius'], Group['radiusd']],

    notify  => Service['radiusd'],

  }



  # Reference all attribute snippets in one file

  concat::fragment { "attr-${name}":

    target  => "${fr_basepath}/mods-available/attr_filter",

  concat::fragment { "freeradius attr-${name}":

    target  => 'freeradius mods-available/attr_filter',

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

    order   => 20,

  }

manifests/blank.pp

+9 −10
Original line number Diff line number Diff line 
# Blank unneeded config files to reduce complexity

define freeradius::blank {

  $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}/${name}":

  file { "freeradius ${name}":

    path    => "${fr_basepath}/${name}",

    mode    => '0644',

    owner   => 'root',

    group   => $fr_group,

    require => [File[$fr_basepath], Package[$fr_package], Group[$fr_group]],

    notify  => Service[$fr_service],

    require => [File['freeradius raddb'], Package['freeradius'], Group['radiusd']],

    notify  => Service['radiusd'],

    content => @(BLANK/L),

               # This file is intentionally left blank to reduce complexity. \

               Blanking it but leaving it present is safer than deleting it, \

manifests/cert.pp

+4 −5
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ define freeradius::cert ( 
  Optional[String] $type     = 'key',

  Freeradius::Ensure $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
@@ -16,15 +14,16 @@ define freeradius::cert ( 
    default => '0644',

  }



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

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

    ensure    => $ensure,

    path      => "${fr_basepath}/certs/${name}",

    mode      => $permission,

    owner     => 'root',

    group     => $fr_group,

    source    => $source,

    content   => $content,

    show_diff => false,

    require   => [File["${fr_basepath}/certs"], Package[$fr_package], Group[$fr_group]],

    notify    => Service[$fr_service],

    require   => [File['freeradius certs'], Package['freeradius'], Group['radiusd']],

    notify    => Service['radiusd'],

  }

}

manifests/client.pp

+4 −5
Original line number Diff line number Diff line
@@ -37,19 +37,18 @@ define freeradius::client ( 
  Variant[Array, Hash, String] $attributes           = [],

  Optional[String] $huntgroups                       = undef,

) {

  $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}/clients.d/${name}.conf":

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

    ensure  => $ensure,

    path    => "${fr_basepath}/clients.d/${shortname}.conf",

    mode    => '0640',

    owner   => 'root',

    group   => $fr_group,

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

    require => [File["${fr_basepath}/clients.d"], Group[$fr_group]],

    notify  => Service[$fr_service],

    require => [File['freeradius clients.d'], Group['radiusd']],

    notify  => Service['radiusd'],

  }



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

manifests/config.pp

+4 −5
Original line number Diff line number Diff line
@@ -4,19 +4,18 @@ define freeradius::config ( 
  Optional[String] $content  = undef,

  Freeradius::Ensure $ensure = present,

) {

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

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

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

  $fr_moduleconfigpath = $::freeradius::params::fr_moduleconfigpath



  file { "${fr_moduleconfigpath}/${name}":

  file { "freeradius mods-config/${name}":

    ensure  => $ensure,

    path    => "${fr_moduleconfigpath}/${name}",

    mode    => '0640',

    owner   => 'root',

    group   => $fr_group,

    source  => $source,

    content => $content,

    require => [Package[$fr_package], Group[$fr_group]],

    notify  => Service[$fr_service],

    require => [Package['freeradius'], Group['radiusd']],

    notify  => Service['radiusd'],

  }

}