Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
puppet-freeradius
Commits
c9af2708
Commit
c9af2708
authored
Aug 07, 2017
by
Jonathan
Committed by
GitHub
Aug 07, 2017
Browse files
Merge pull request #84 from paulseward/83_sites_enabled
Deploy modules and sites to their respective *-available directory
parents
39f15ec9
80f3ab1b
Changes
7
Hide whitespace changes
Inline
Side-by-side
manifests/attr.pp
View file @
c9af2708
...
...
@@ -25,7 +25,7 @@ define freeradius::attr (
# Reference all attribute snippets in one file
concat::fragment
{
"attr-
${name}
"
:
target
=>
"
${fr_
modul
epath}
/attr_filter"
,
target
=>
"
${fr_
bas
epath}
/
mods-available/
attr_filter"
,
content
=>
template
(
'freeradius/attr.erb'
),
order
=>
20
,
}
...
...
manifests/init.pp
View file @
c9af2708
...
...
@@ -172,17 +172,21 @@ class freeradius (
}
# Set up attribute filter file
concat
{
"
${freeradius::fr_
modul
epath}
/attr_filter"
:
concat
{
"
${freeradius::fr_
bas
epath}
/
mods-available/
attr_filter"
:
owner
=>
'root'
,
group
=>
$freeradius::fr_group
,
mode
=>
'0640'
,
require
=>
[
Package
[
$freeradius::fr_package
],
Group
[
$freeradius::fr_group
]],
notify
=>
Service
[
$freeradius::fr_service
],
}
file
{
"
${fr_modulepath}
/attr_filter"
:
ensure
=>
link
,
target
=>
"../mods-available/attr_filter"
,
}
# Install default attribute filters
concat::fragment
{
'attr-default'
:
target
=>
"
${freeradius::fr_
modul
epath}
/attr_filter"
,
target
=>
"
${freeradius::fr_
bas
epath}
/
mods-available/
attr_filter"
,
content
=>
template
(
'freeradius/attr_default.erb'
),
order
=>
10
,
}
...
...
manifests/krb5.pp
View file @
c9af2708
...
...
@@ -11,10 +11,11 @@ define freeradius::krb5 (
$fr_package
=
$::freeradius::params::fr_package
$fr_service
=
$::freeradius::params::fr_service
$fr_modulepath
=
$::freeradius::params::fr_modulepath
$fr_basepath
=
$::freeradius::params::fr_basepath
$fr_group
=
$::freeradius::params::fr_group
# Generate a module config
file
{
"
${fr_
modul
epath}
/
${name}
"
:
file
{
"
${fr_
bas
epath}
/
mods-availabe/
${name}
"
:
ensure
=>
$ensure
,
mode
=>
'0640'
,
owner
=>
'root'
,
...
...
@@ -23,4 +24,8 @@ define freeradius::krb5 (
require
=>
[
Package
[
$fr_package
],
Group
[
$fr_group
]],
notify
=>
Service
[
$fr_service
],
}
file
{
"
${fr_modulepath}
/
${name}
"
:
ensure
=>
link
,
target
=>
"../mods-available/
${name}
"
,
}
}
manifests/module.pp
View file @
c9af2708
...
...
@@ -18,8 +18,8 @@ define freeradius::module (
target
=>
"../mods-available/
${name}
"
,
}
}
else
{
# Deploy actual module to
site
s-enabled
file
{
"
${fr_
modul
epath}
/
${name}
"
:
# Deploy actual module to
mods-available, and link it to mod
s-enabled
file
{
"
${fr_
bas
epath}
/
mods-available/
${name}
"
:
ensure
=>
$ensure
,
mode
=>
'0640'
,
owner
=>
'root'
,
...
...
@@ -29,5 +29,9 @@ define freeradius::module (
require
=>
[
Package
[
$fr_package
],
Group
[
$fr_group
]],
notify
=>
Service
[
$fr_service
],
}
file
{
"
${fr_modulepath}
/
${name}
"
:
ensure
=>
link
,
target
=>
"../mods-available/
${name}
"
,
}
}
}
manifests/module/ldap.pp
View file @
c9af2708
...
...
@@ -65,6 +65,7 @@ define freeradius::module::ldap (
$fr_package
=
$::freeradius::params::fr_package
$fr_service
=
$::freeradius::params::fr_service
$fr_modulepath
=
$::freeradius::params::fr_modulepath
$fr_basepath
=
$::freeradius::params::fr_basepath
$fr_group
=
$::freeradius::params::fr_group
# Validate our inputs
...
...
@@ -84,7 +85,7 @@ define freeradius::module::ldap (
}
# Generate a module config, based on ldap.conf
file
{
"
${fr_
modul
epath}
/
${name}
"
:
file
{
"
${fr_
bas
epath}
/
mods-available/
${name}
"
:
ensure
=>
$ensure
,
mode
=>
'0640'
,
owner
=>
'root'
,
...
...
@@ -93,4 +94,8 @@ define freeradius::module::ldap (
require
=>
[
Package
[
$fr_package
],
Group
[
$fr_group
]],
notify
=>
Service
[
$fr_service
],
}
file
{
"
${fr_modulepath}
/
${name}
"
:
ensure
=>
link
,
target
=>
"../mods-available/
${name}
"
,
}
}
manifests/site.pp
View file @
c9af2708
...
...
@@ -26,7 +26,7 @@ define freeradius::site (
default
=>
undef
,
}
file
{
"
${fr_basepath}
/sites-
en
able
d
/
${name}
"
:
file
{
"
${fr_basepath}
/sites-
avail
able/
${name}
"
:
ensure
=>
$ensure
,
mode
=>
'0640'
,
owner
=>
'root'
,
...
...
@@ -36,4 +36,8 @@ define freeradius::site (
require
=>
[
Package
[
$fr_package
],
Group
[
$fr_group
]],
notify
=>
Service
[
$fr_service
],
}
file
{
"
${fr_basepath}
/sites-enabled/
${name}
"
:
ensure
=>
link
,
target
=>
"
${fr_basepath}
/sites-available/
${name}
"
,
}
}
manifests/sql.pp
View file @
c9af2708
...
...
@@ -108,7 +108,7 @@ define freeradius::sql (
}
# Generate a module config, based on sql.conf
file
{
"
${fr_
modul
epath}
/
${name}
"
:
file
{
"
${fr_
bas
epath}
/
mods-available/
${name}
"
:
ensure
=>
$ensure
,
mode
=>
'0640'
,
owner
=>
'root'
,
...
...
@@ -117,6 +117,10 @@ define freeradius::sql (
require
=>
[
Package
[
$fr_package
],
Group
[
$fr_group
]],
notify
=>
Service
[
$fr_service
],
}
file
{
"
${fr_modulepath}
/
${name}
"
:
ensure
=>
link
,
target
=>
"../mods-available/
${name}
"
,
}
# Install rotation for sqltrace if we are using it
if
(
$sqltrace
==
'yes'
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment