Commit 0cc56ab5 authored by Nathan Ward's avatar Nathan Ward
Browse files

Update templates to be based on FreeRADIUS 3.0.21 config files

Fix indent things

Revert
parent e1dec8c7
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ describe 'freeradius::krb5' do

  it do
    is_expected.to contain_file('/etc/raddb/mods-available/test')
      .with_content(%r{^krb5 test \{\n\s+keytab = test_keytab\n\s+service_principal = test_principal\n})
      .with_content(%r{^\s+keytab = test_keytab$})
      .with_content(%r{^\s+service_principal = test_principal$})
      .with_ensure('present')
      .with_group('radiusd')
      .with_mode('0640')
+1 −1
Original line number Diff line number Diff line
# -*- text -*-
#
#  $Id$
#  $Id: 1caff077b2429c948a04777fcd619be901ac83dc $

#
#  This file defines a number of instances of the "attr_filter" module.
+99 −86
Original line number Diff line number Diff line
# File managed by puppet
##############################################################
# -*- text -*-
#
#  $Id: e91e12d0b4de8f3cb084c179b321924d0248cfbb $

# Write a detailed log of all accounting records received.
#
detail <%= @name %> {
detail {
	#  Note that we do NOT use NAS-IP-Address here, as
	#  that attribute MAY BE from the originating NAS, and
	#  NOT from the proxy which actually sent us the
@@ -15,8 +16,8 @@ detail <%= @name %> {
	#  day, so that the detail file doesn't have to go
	#  through a 'log rotation'
	#
  #  If your detail files are large, you may also want
  #  to add a ':%H' (see doc/variables.txt) to the end
	#  If your detail files are large, you may also want to add
	#  a ':%H' (see doc/configuration/variables.rst) to the end
	#  of it, to create a new detail file every hour, e.g.:
	#
	#   ..../detail-%Y%m%d:%H
@@ -30,8 +31,10 @@ detail <%= @name %> {
	#  be ONE "listen" section reading detail files from a
	#  particular directory.
	#
# filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/detail-%Y%m%d
	filename = <%= @filename %>


	#
	#  If you are using radrelay, delete the above line for "file",
	#  and use this one instead:
@@ -43,6 +46,7 @@ detail <%= @name %> {
	#  characters.  Ones that can deal with a limited range should
	#  set this to "yes".
	#
# escape_filenames = no
	escape_filenames = <%= @escape_filenames %>

	#
@@ -52,14 +56,16 @@ detail <%= @name %> {
	#  information about users.  So by keeping the file
	#  permissions restrictive, we can prevent unwanted
	#  people from seeing that information.
#	permissions = 0600
	permissions = <%= @permissions %>

<%- if @group -%>
	# The Unix group of the log file.
	#
	# The user that the server runs as must be in the specified
	# system group otherwise this will fail to work.
	#
#	group = ${security.group}
<%- if @group -%>
	group = <%= @group %>
<%- end -%>

@@ -69,28 +75,30 @@ detail <%= @name %> {
	#  format (see "man ctime" for details).
	#
	#  The header can be customised by editing this
  #  string.  See "doc/variables.txt" for a description
  #  of what can be put here.
	#  string.  See "doc/configuration/variables.rst" for a
	#  description of what can be put here.
	#
#	header = "%t"
	header = "<%= @header %>"

<%- if @locking -%>
	#
	#  Uncomment this line if the detail file reader will be
	#  reading this detail file.
	#
#	locking = yes
<%- if @locking -%>
	locking = <%= @locking == true %>
<%- end -%>

<%- if @log_packet_header -%>
	#
	#  Log the Packet src/dst IP/port.  This is disabled by
	#  default, as that information isn't used by many people.
	#
#	log_packet_header = yes
<%- if @log_packet_header -%>
	log_packet_header = <%= @log_packet_header == true %>
<%- end -%>

<%- if !@suppress.empty? -%>
	#
	# Certain attributes such as User-Password may be
	# "sensitive", so they should not be printed in the
@@ -99,8 +107,13 @@ detail <%= @name %> {
	#
	# The attributes should be listed one to a line.
	#
	#suppress {
		# User-Password
	#}
<%- if !@suppress.empty? -%>
	suppress {
    <%= @suppress.join("\n    ") %>
		<%= @suppress.join("\n\t\t") %>
	}
<%- end -%>

}
+34 −16
Original line number Diff line number Diff line
#
#	This is the master dictionary file, which references the
#	pre-defined dictionary files included with the server.
#	This is the local dictionary file which can be
#	edited by local administrators.  It will be loaded
#	AFTER the main dictionary files are loaded.
#
#	Any new/changed attributes MUST be placed in this file, as
#	the pre-defined dictionaries SHOULD NOT be edited.
#	As of version 3.0.2, FreeRADIUS will automatically
#	load the main dictionary files from
#
#	$Id$
#		${prefix}/share/freeradius/dictionary
#

#	It is no longer necessary for this file to $INCLUDE
#	the main dictionaries.  However, if the $INCLUDE
#	line is here, nothing bad will happen.
#
#	The filename given here should be an absolute path. 
#	Any new/changed attributes MUST be placed in this file.
#	The pre-defined dictionaries SHOULD NOT be edited.
#
$INCLUDE	/usr/share/freeradius/dictionary
$INCLUDE	<%= @fr_basepath %>/dictionary.custom

#	See "man dictionary" for documentation on its format.
#
#	Place additional attributes or $INCLUDEs here.  They will
#	over-ride the definitions in the pre-defined dictionaries.
#	$Id: eed5d70f41b314f9ed3f006a22d9f9a2be2c9516 $
#
#	See the 'man' page for 'dictionary' for information on
#	the format of the dictionary files.

#
#	All local attributes and $INCLUDE's should go into
#	this file.
#

$INCLUDE	<%= @fr_basepath %>/dictionary.custom

#	If you want to add entries to the dictionary file,
#	which are NOT going to be placed in a RADIUS packet,
#	add them here.  The numbers you pick should be between
#	3000 and 4000.
#	add them to the 'dictionary.local' file.
#
#	The numbers you pick should be between 3000 and 4000.
#	These attributes will NOT go into a RADIUS packet.
#
#	If you want that, you will need to use VSAs.  This means
#	requesting allocation of a Private Enterprise Code from
#	http://iana.org.  We STRONGLY suggest doing that only if
#	you are a vendor of RADIUS equipment.
#
#	See RFC 6158 for more details.
#	http://ietf.org/rfc/rfc6158.txt
#

#
#	These attributes are examples
#
#ATTRIBUTE	My-Local-String		3000	string
#ATTRIBUTE	My-Local-IPAddr		3001	ipaddr
#ATTRIBUTE	My-Local-Integer	3002	integer
+1000 −860

File changed.

Preview size limit exceeded, changes collapsed.

Loading