Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Puppet Camptocamp Postfix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Projets publics
Puppet Camptocamp Postfix
Commits
22901939
Commit
22901939
authored
11 years ago
by
Raphaël Pinson
Browse files
Options
Downloads
Patches
Plain Diff
Add maincf_source and mastercf_source parameters
parent
42d21322
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
manifests/files.pp
+12
-5
12 additions, 5 deletions
manifests/files.pp
manifests/init.pp
+2
-0
2 additions, 0 deletions
manifests/init.pp
with
14 additions
and
5 deletions
manifests/files.pp
+
12
−
5
View file @
22901939
...
...
@@ -37,15 +37,22 @@ class postfix::files {
}
# Config files
if
$postfix::mastercf_source
{
$mastercf_content
=
undef
}
else
{
$mastercf_content
=
template
(
$postfix::params::master_os_template
,
"
${module_name}
/master.cf.common.erb"
)
}
file
{
'/etc/postfix/master.cf'
:
ensure
=>
present
,
owner
=>
'root'
,
group
=>
'root'
,
mode
=>
'0644'
,
content
=>
template
(
$postfix::params::master_os_template
,
"
${module_name}
/master.cf.common.erb"
),
source
=>
$postfix::mastercf_source
,
content
=>
$mastercf_content
,
seltype
=>
$postfix::params::seltype
,
}
...
...
@@ -55,7 +62,7 @@ class postfix::files {
owner
=>
'root'
,
group
=>
'root'
,
mode
=>
'0644'
,
source
=>
"puppet:///modules/
${module_name}
/
main
.
cf
"
,
source
=>
$postfix::
maincf
_source
,
replace
=>
false
,
seltype
=>
$postfix::params::seltype
,
}
...
...
This diff is collapsed.
Click to expand it.
manifests/init.pp
+
2
−
0
View file @
22901939
...
...
@@ -52,6 +52,8 @@ class postfix (
$inet_interfaces
=
'all'
,
$mail_user
=
'vmail'
,
# postfix_mail_user
$mailman
=
false
,
$maincf_source
=
"puppet:///modules/
${module_name}
/main.cf"
,
$mastercf_source
=
undef
,
$master_smtp
=
undef
,
# postfix_master_smtp
$master_smtps
=
undef
,
# postfix_master_smtps
$master_submission
=
undef
,
# postfix_master_submission
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment