Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
P
Puppet Camptocamp Postfix
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Projets publics
Puppet Camptocamp Postfix
Commits
4f935088
Unverified
Commit
4f935088
authored
Oct 02, 2020
by
Julian
Committed by
GitHub
Oct 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feature/allow specify master cf content & template (#217)
Add possibility to specify a template for master.cf Closes #91
parent
a3bbeb96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
3 deletions
+75
-3
manifests/files.pp
manifests/files.pp
+9
-3
manifests/init.pp
manifests/init.pp
+13
-0
spec/classes/postfix_spec.rb
spec/classes/postfix_spec.rb
+53
-0
No files found.
manifests/files.pp
View file @
4f935088
...
...
@@ -8,6 +8,8 @@ class postfix::files {
$manage_conffiles
=
$postfix::manage_conffiles
$maincf_source
=
$postfix::maincf_source
$mastercf_source
=
$postfix::mastercf_source
$mastercf_content
=
$postfix::mastercf_content
$mastercf_template
=
$postfix::mastercf_template
$master_smtp
=
$postfix::master_smtp
$master_smtps
=
$postfix::master_smtps
$master_submission
=
$postfix::master_submission
...
...
@@ -58,9 +60,13 @@ class postfix::files {
# Config files
if
$mastercf_source
{
$mastercf_content
=
undef
$_mastercf_content
=
undef
}
elsif
$mastercf_content
{
$_mastercf_content
=
$mastercf_content
}
elsif
$mastercf_template
{
$_mastercf_content
=
epp
(
$mastercf_template
)
}
else
{
$mastercf_content
=
template
(
$
_
mastercf_content
=
template
(
$postfix::params::master_os_template
,
'postfix/master.cf.common.erb'
)
...
...
@@ -68,7 +74,7 @@ class postfix::files {
file
{
'/etc/postfix/master.cf'
:
ensure
=>
'file'
,
content
=>
$mastercf_content
,
content
=>
$
_
mastercf_content
,
group
=>
'root'
,
mode
=>
'0644'
,
owner
=>
'root'
,
...
...
manifests/init.pp
View file @
4f935088
...
...
@@ -34,6 +34,10 @@
#
# [*mastercf_source*] - (string)
#
# [*mastercf_content*] - (string)
#
# [*mastercf_template*] - (string)
#
# [*master_smtp*] - (string)
#
# [*master_smtps*] - (string)
...
...
@@ -101,6 +105,8 @@ class postfix (
Boolean
$manage_conffiles
=
true
,
Boolean
$manage_mailx
=
true
,
Optional
[
String
]
$mastercf_source
=
undef
,
Optional
[
String
]
$mastercf_content
=
undef
,
Optional
[
String
]
$mastercf_template
=
undef
,
Optional
[
String
]
$master_smtp
=
undef
,
# postfix_master_smtp
Optional
[
String
]
$master_smtps
=
undef
,
# postfix_master_smtps
Optional
[
String
]
$master_submission
=
undef
,
# postfix_master_submission
...
...
@@ -128,6 +134,13 @@ class postfix (
Boolean
$service_enabled
=
true
,
)
inherits
postfix::params
{
if
((
$mastercf_source
and
$mastercf_content
)
or
(
$mastercf_source
and
$mastercf_template
)
or
(
$mastercf_content
and
$mastercf_template
)
or
(
$mastercf_source
and
$mastercf_content
and
$mastercf_template
)){
fail
(
'mastercf_source, mastercf_content and mastercf_template are mutually exclusive'
)
}
$_smtp_listen
=
$mailman
?
{
true
=>
'0.0.0.0'
,
default
=>
$smtp_listen
,
...
...
spec/classes/postfix_spec.rb
View file @
4f935088
...
...
@@ -221,6 +221,59 @@ describe 'postfix' do
skip
'need to write this still'
end
end
context
'when specifying a custom mastercf_content'
do
let
(
:params
)
{
{
:mastercf_content
=>
'testy'
}
}
it
'should do stuff'
do
skip
'need to write this still'
end
end
context
'when specifying a custom mastercf_template'
do
let
(
:params
)
{
{
:mastercf_template
=>
'testy'
}
}
it
'should do stuff'
do
skip
'need to write this still'
end
end
context
'when specifying a custom mastercf_source and mastercf_content'
do
let
(
:params
)
{
{
:mastercf_source
=>
'testy_1'
,
:mastercf_content
=>
'testy_2'
}
}
it
'should fail'
do
expect
{
should
compile
}.
to
raise_error
(
/mutually exclusive/
)
end
end
context
'when specifying a custom mastercf_source and mastercf_template'
do
let
(
:params
)
{
{
:mastercf_source
=>
'testy_1'
,
:mastercf_template
=>
'testy_2'
}
}
it
'should fail'
do
expect
{
should
compile
}.
to
raise_error
(
/mutually exclusive/
)
end
end
context
'when specifying a custom mastercf_content and mastercf_template'
do
let
(
:params
)
{
{
:mastercf_content
=>
'testy_1'
,
:mastercf_template
=>
'testy_2'
}
}
it
'should fail'
do
expect
{
should
compile
}.
to
raise_error
(
/mutually exclusive/
)
end
end
context
'when specifying a mastercf_source and custom mastercf_content and mastercf_template'
do
let
(
:params
)
{
{
:mastercf_source
=>
'testy_1'
,
:mastercf_content
=>
'testy_2'
,
:mastercf_template
=>
'testy_3'
}
}
it
'should fail'
do
expect
{
should
compile
}.
to
raise_error
(
/mutually exclusive/
)
end
end
context
'when specifying a custom master_smtp'
do
let
(
:params
)
do
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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