Commit 48eb8f52 authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Tidy up all directory creation into one block

parent 52b20f35
......@@ -26,69 +26,19 @@ class freeradius (
notify => Service['radiusd'],
}
# Set up conf.d style clients
file { 'clients.d':
ensure => directory,
name => '/etc/raddb/clients.d',
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
notify => Service['radiusd'],
}
# Set up conf.d style clients for the status server
file { 'statusclients.d':
ensure => directory,
name => '/etc/raddb/statusclients.d',
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
notify => Service['radiusd'],
}
# Set permissions on base dir
file { '/etc/raddb':
ensure => directory,
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
}
# Set up conf.d for module instantiation
file { '/etc/raddb/instantiate':
ensure => directory,
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
notify => Service['radiusd'],
}
# Set up conf.d for generic config snippets
file { '/etc/raddb/conf.d':
ensure => directory,
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
notify => Service['radiusd'],
}
# Set up attr.d for attribute filtering snippets
file { '/etc/raddb/attr.d':
ensure => directory,
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
notify => Service['radiusd'],
}
# Set up users.d for static non-EAP user files
file { '/etc/raddb/users.d':
# Create various directories
file { [
'/etc/raddb/clients.d',
'/etc/raddb/statusclients.d',
'/etc/raddb',
'/etc/raddb/instantiate',
'/etc/raddb/conf.d',
'/etc/raddb/attr.d',
'/etc/raddb/users.d',
'/etc/raddb/policy.d',
'/etc/raddb/scripts',
'/etc/raddb/certs',
]:
ensure => directory,
mode => '0750',
owner => 'root',
......@@ -115,26 +65,6 @@ class freeradius (
order => '99',
}
# Set up policy.d for policies
file { '/etc/raddb/policy.d':
ensure => directory,
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
notify => Service['radiusd'],
}
# Install scripts directory
file { '/etc/raddb/scripts':
ensure => directory,
name => '/etc/raddb/scripts',
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
}
# Define the realms for which we are authoritative
file { 'proxy.conf':
# ensure => absent,
......@@ -225,15 +155,6 @@ class freeradius (
}
}
# Make the cert dir traversable
file { '/etc/raddb/certs':
ensure => directory,
mode => '0750',
owner => 'root',
group => 'radiusd',
require => Package['freeradius'],
}
# Make the radius log dir traversable
file { [
'/var/log/radius',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment