Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
communication
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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
infra
ansible-shared
communication
Commits
0b5a40e5
Commit
0b5a40e5
authored
5 years ago
by
Hinrikus Wolf
Browse files
Options
Downloads
Patches
Plain Diff
make postscreen optional (default is activated)
parent
3a61c9f3
No related branches found
No related tags found
1 merge request
!5
make postscreen optional (default is activated)
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
postfix/defaults/main.yml
+2
-0
2 additions, 0 deletions
postfix/defaults/main.yml
postfix/templates/main.cf.j2
+5
-3
5 additions, 3 deletions
postfix/templates/main.cf.j2
postfix/templates/master.cf.j2
+5
-2
5 additions, 2 deletions
postfix/templates/master.cf.j2
with
12 additions
and
5 deletions
postfix/defaults/main.yml
+
2
−
0
View file @
0b5a40e5
...
@@ -12,6 +12,8 @@ postfix_tls_key: /etc/ssl/private/privkey.pem
...
@@ -12,6 +12,8 @@ postfix_tls_key: /etc/ssl/private/privkey.pem
postfix_tls_configuration
:
'
previous'
postfix_tls_configuration
:
'
previous'
postfix_prefer_lmtp
:
false
postfix_prefer_lmtp
:
false
postfix_enable_postscreen
:
true
postfix_enable_memcached
:
false
postfix_enable_memcached
:
false
postfix_login_suffix
:
'
'
postfix_login_suffix
:
'
'
postfix_dnsbl_sites
:
postfix_dnsbl_sites
:
...
...
This diff is collapsed.
Click to expand it.
postfix/templates/main.cf.j2
+
5
−
3
View file @
0b5a40e5
...
@@ -78,6 +78,7 @@ virtual_transport = lmtp:unix:private/dovecot-lmtp
...
@@ -78,6 +78,7 @@ virtual_transport = lmtp:unix:private/dovecot-lmtp
virtual_gid_maps = static:5000
virtual_gid_maps = static:5000
{% endif %}
{% endif %}
{% if postfix_enable_postscreen %}
postscreen_access_list = permit_mynetworks
postscreen_access_list = permit_mynetworks
cidr:/etc/postfix/postscreen_access.cidr
cidr:/etc/postfix/postscreen_access.cidr
{% if postfix_enable_memcached %}
{% if postfix_enable_memcached %}
...
@@ -105,3 +106,4 @@ postscreen_dnsbl_sites =
...
@@ -105,3 +106,4 @@ postscreen_dnsbl_sites =
{% for site in postfix_dnsbl_sites %}
{% for site in postfix_dnsbl_sites %}
{{ site.name }}*{{ site.modifier|default(1) }}
{{ site.name }}*{{ site.modifier|default(1) }}
{% endfor %}
{% endfor %}
{% endif %}
This diff is collapsed.
Click to expand it.
postfix/templates/master.cf.j2
+
5
−
2
View file @
0b5a40e5
...
@@ -9,8 +9,11 @@
...
@@ -9,8 +9,11 @@
# (yes) (yes) (no) (never) (100)
# (yes) (yes) (no) (never) (100)
# ==========================================================================
# ==========================================================================
#smtp inet n - y - - smtpd
{% if postfix_enable_postscreen %}
smtp inet n - y - 1 postscreen
smtp inet n - y - 1 postscreen
{% else %}
smtp inet n - y - - smtpd
{% endif %}
smtpd pass - - y - - smtpd
smtpd pass - - y - - smtpd
{% if postfix_content_filter %}
{% if postfix_content_filter %}
-o content_filter={{ postfix_content_filter }}
-o content_filter={{ postfix_content_filter }}
...
...
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