Skip to content
Snippets Groups Projects
Unverified Commit 25e0fc42 authored by Nathan Ward's avatar Nathan Ward Committed by GitHub
Browse files

Merge pull request #164 from SearchLightNZ/fix_concat_newlines

Use ensure_newline for concats fragments
parents 7338d283 86ad33ff
No related branches found
No related tags found
No related merge requests found
...@@ -32,7 +32,7 @@ define freeradius::dictionary ( ...@@ -32,7 +32,7 @@ define freeradius::dictionary (
if ($ensure == 'present') { if ($ensure == 'present') {
concat::fragment { "dictionary.${name}": concat::fragment { "dictionary.${name}":
target => "${fr_basepath}/dictionary", target => "${fr_basepath}/dictionary",
content => "\$INCLUDE ${fr_basepath}/dictionary.d/dictionary.${name}\n", content => "\$INCLUDE ${fr_basepath}/dictionary.d/dictionary.${name}",
order => $order, order => $order,
require => File["${fr_basepath}/dictionary.d/dictionary.${name}"], require => File["${fr_basepath}/dictionary.d/dictionary.${name}"],
} }
......
...@@ -150,6 +150,7 @@ class freeradius ( ...@@ -150,6 +150,7 @@ class freeradius (
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
mode => '0640', mode => '0640',
ensure_newline => true,
require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]], require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]],
notify => Service[$freeradius::fr_service], notify => Service[$freeradius::fr_service],
} }
...@@ -169,6 +170,7 @@ class freeradius ( ...@@ -169,6 +170,7 @@ class freeradius (
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
mode => '0640', mode => '0640',
ensure_newline => true,
require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]], require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]],
notify => Service[$freeradius::fr_service], notify => Service[$freeradius::fr_service],
} }
...@@ -189,12 +191,13 @@ class freeradius ( ...@@ -189,12 +191,13 @@ class freeradius (
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
mode => '0640', mode => '0640',
ensure_newline => true,
require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]], require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]],
notify => Service[$freeradius::fr_service], notify => Service[$freeradius::fr_service],
} }
concat::fragment { 'proxy_header': concat::fragment { 'proxy_header':
target => "${freeradius::fr_basepath}/proxy.conf", target => "${freeradius::fr_basepath}/proxy.conf",
content => "# Proxy config\n", content => '# Proxy config',
order => '05', order => '05',
} }
...@@ -203,6 +206,7 @@ class freeradius ( ...@@ -203,6 +206,7 @@ class freeradius (
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
mode => '0640', mode => '0640',
ensure_newline => true,
require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]], require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]],
notify => Service[$freeradius::fr_service], notify => Service[$freeradius::fr_service],
} }
...@@ -241,6 +245,7 @@ class freeradius ( ...@@ -241,6 +245,7 @@ class freeradius (
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
mode => '0644', mode => '0644',
ensure_newline => true,
require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]], require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]],
} }
concat::fragment { 'dictionary_header': concat::fragment { 'dictionary_header':
...@@ -259,6 +264,7 @@ class freeradius ( ...@@ -259,6 +264,7 @@ class freeradius (
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
mode => '0640', mode => '0640',
ensure_newline => true,
require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]], require => [Package[$freeradius::fr_package], Group[$freeradius::fr_group]],
notify => Service[$freeradius::fr_service], notify => Service[$freeradius::fr_service],
} }
...@@ -454,7 +460,7 @@ class freeradius ( ...@@ -454,7 +460,7 @@ class freeradius (
"${freeradius::fr_basepath}/clients.conf", "${freeradius::fr_basepath}/clients.conf",
"${freeradius::fr_basepath}/sql.conf", "${freeradius::fr_basepath}/sql.conf",
]: ]:
content => "# FILE INTENTIONALLY BLANK\n", content => '# FILE INTENTIONALLY BLANK',
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => $freeradius::fr_group, group => $freeradius::fr_group,
......
...@@ -25,7 +25,7 @@ define freeradius::policy ( ...@@ -25,7 +25,7 @@ define freeradius::policy (
if ($ensure == 'present') { if ($ensure == 'present') {
concat::fragment { "policy-${name}": concat::fragment { "policy-${name}":
target => "${fr_basepath}/policy.conf", target => "${fr_basepath}/policy.conf",
content => "\t\$INCLUDE ${fr_basepath}/policy.d/${name}\n", content => "\t\$INCLUDE ${fr_basepath}/policy.d/${name}",
order => $order, order => $order,
require => File["${fr_basepath}/policy.d/${name}"], require => File["${fr_basepath}/policy.d/${name}"],
} }
......
...@@ -83,6 +83,7 @@ describe 'freeradius' do ...@@ -83,6 +83,7 @@ describe 'freeradius' do
'mode' => '0640', 'mode' => '0640',
'notify' => 'Service[radiusd]', 'notify' => 'Service[radiusd]',
'owner' => 'root', 'owner' => 'root',
'ensure_newline' => true,
) )
.that_requires('Package[freeradius]') .that_requires('Package[freeradius]')
.that_requires('Group[radiusd]') .that_requires('Group[radiusd]')
...@@ -113,6 +114,7 @@ describe 'freeradius' do ...@@ -113,6 +114,7 @@ describe 'freeradius' do
'mode' => '0640', 'mode' => '0640',
'notify' => 'Service[radiusd]', 'notify' => 'Service[radiusd]',
'owner' => 'root', 'owner' => 'root',
'ensure_newline' => true,
) )
.that_requires('Package[freeradius]') .that_requires('Package[freeradius]')
.that_requires('Group[radiusd]') .that_requires('Group[radiusd]')
...@@ -121,7 +123,7 @@ describe 'freeradius' do ...@@ -121,7 +123,7 @@ describe 'freeradius' do
it do it do
is_expected.to contain_concat__fragment('proxy_header') is_expected.to contain_concat__fragment('proxy_header')
.with( .with(
'content' => "# Proxy config\n", 'content' => '# Proxy config',
'order' => '05', 'order' => '05',
'target' => '/etc/raddb/proxy.conf', 'target' => '/etc/raddb/proxy.conf',
) )
...@@ -134,6 +136,7 @@ describe 'freeradius' do ...@@ -134,6 +136,7 @@ describe 'freeradius' do
'mode' => '0640', 'mode' => '0640',
'notify' => 'Service[radiusd]', 'notify' => 'Service[radiusd]',
'owner' => 'root', 'owner' => 'root',
'ensure_newline' => true,
) )
.that_requires('Package[freeradius]') .that_requires('Package[freeradius]')
.that_requires('Group[radiusd]') .that_requires('Group[radiusd]')
...@@ -153,6 +156,7 @@ describe 'freeradius' do ...@@ -153,6 +156,7 @@ describe 'freeradius' do
'group' => 'radiusd', 'group' => 'radiusd',
'mode' => '0644', 'mode' => '0644',
'owner' => 'root', 'owner' => 'root',
'ensure_newline' => true,
) )
.that_requires('Package[freeradius]') .that_requires('Package[freeradius]')
.that_requires('Group[radiusd]') .that_requires('Group[radiusd]')
...@@ -364,7 +368,7 @@ describe 'freeradius' do ...@@ -364,7 +368,7 @@ describe 'freeradius' do
].each do |file| ].each do |file|
is_expected.to contain_file(file) is_expected.to contain_file(file)
.with( .with(
'content' => "# FILE INTENTIONALLY BLANK\n", 'content' => '# FILE INTENTIONALLY BLANK',
'group' => 'radiusd', 'group' => 'radiusd',
'mode' => '0644', 'mode' => '0644',
'notify' => 'Service[radiusd]', 'notify' => 'Service[radiusd]',
......
...@@ -25,7 +25,7 @@ describe 'freeradius::policy' do ...@@ -25,7 +25,7 @@ describe 'freeradius::policy' do
it do it do
is_expected.to contain_concat__fragment('policy-test') is_expected.to contain_concat__fragment('policy-test')
.with_content(%r{\s+\$INCLUDE /etc/raddb/policy.d/test\n}) .with_content(%r{\s+\$INCLUDE /etc/raddb/policy.d/test$})
.with_order('50') .with_order('50')
.with_target('/etc/raddb/policy.conf') .with_target('/etc/raddb/policy.conf')
.that_requires('File[/etc/raddb/policy.d/test]') .that_requires('File[/etc/raddb/policy.d/test]')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment