Commit 919f4429 authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Manage pidfile location and use it to template logrotate blocks

parent 2aa73c46

manifests/init.pp

+3 −3
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ class freeradius ( 
    create        => false,

    missingok     => true,

    compress      => true,

    postrotate    => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',

    postrotate    => "kill -HUP `cat ${freeradius::fr_pidfile}`",

    sharedscripts => true,

  }
@@ -322,7 +322,7 @@ class freeradius ( 
    create        => true,

    missingok     => true,

    compress      => true,

    postrotate    => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',

    postrotate    => "kill -HUP `cat ${freeradius::fr_pidfile}`",

    sharedscripts => true,

  }
@@ -333,7 +333,7 @@ class freeradius ( 
    create        => true,

    missingok     => true,

    compress      => true,

    postrotate    => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',

    postrotate    => "kill -HUP `cat ${freeradius::fr_pidfile}`",

    sharedscripts => true,

  }

manifests/params.pp

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ class freeradius::params { 
    default  => false,

  }



  # Default pid file location

  $fr_pidfile = "/var/run/${fr_service}/${fr_service}.pid"



  # Default base path for FreeRADIUS configs

  $fr_basepath = $::osfamily ? {

    'RedHat' => '/etc/raddb',

manifests/sql.pp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ define freeradius::sql ( 
      create       => true,

      compress     => true,

      missingok    => true,

      postrotate   => 'kill -HUP `cat /var/run/radiusd/radiusd.pid`',

      postrotate   => "kill -HUP `cat ${freeradius::fr_pidfile}`",

    }

  }

}