Commit c8847926 authored by Jonathan's avatar Jonathan Committed by GitHub
Browse files

Merge pull request #82 from djjudas21/pidfile 

Manage pidfile
parents 5a7c229e 70ae10a3

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}`",

    }

  }

}

templates/home_server.erb

+3 −3
Original line number Diff line number Diff line 
home_server <%= @name %> {

	type = <%= @type %>

<% if @ipaddr != '' -%>

<% if defined?(@ipaddr) -%>

	ipaddr = <%= @ipaddr %>

<% end -%>

<% if @ipv6addr != '' -%>

<% if defined?(@ipv6addr) -%>

	ipv6addr = <%= @ipv6addr %>

<% end -%>

<% if @virtual_server != '' -%>

<% if defined?(@virtual_server) -%>

	virtual_server = <%= @virtual_server %>

<% end -%>

	port = <%= @port %>

templates/home_server_pool.erb

+2 −2
Original line number Diff line number Diff line 
home_server_pool <%= @name %> {

	type = <%= @type %>

<% if @virtual_server != '' -%>

<% if defined?(@virtual_server) -%>

	virtual_server = <%= @virtual_server %>

<% end -%>

<% @home_server.each do |server| -%>

	home_server = <%= server %>

<% end -%>

<% if @fallback != '' -%>

<% if defined?(@fallback) -%>

	fallback = <%= @fallback %>

<% end -%>

}