summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/common-web/tasks/main.yml2
-rw-r--r--roles/common/templates/etc/iptables/services.j26
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/common-web/tasks/main.yml b/roles/common-web/tasks/main.yml
index ac42af3..41cfa46 100644
--- a/roles/common-web/tasks/main.yml
+++ b/roles/common-web/tasks/main.yml
@@ -4,7 +4,7 @@
- name: Limit Nginx logging
lineinfile: "dest=/etc/logrotate.d/nginx create=yes
regexp='^\\s*rotate\\s'
- line='\trotate 3'"
+ line='\trotate 1'"
tags:
- logrotate
diff --git a/roles/common/templates/etc/iptables/services.j2 b/roles/common/templates/etc/iptables/services.j2
index 25a20f7..8812537 100644
--- a/roles/common/templates/etc/iptables/services.j2
+++ b/roles/common/templates/etc/iptables/services.j2
@@ -52,13 +52,13 @@ in tcp {{ postfix_instance.lists.port }}
{% if 'MSA' in group_names %}
in tcp 587 # SMTP-AUTH
{% endif %}
-{% if 'webmail' in group_names or 'lists' in group_names %}
+{% if 'webmail' in group_names or 'lists' in group_names or 'website' in group_names %}
in tcp 80,443 # HTTP/HTTPS
-{% if 'IMAP' not in group_names %}
+{% endif %}
+{% if 'webmail' in group_names and 'IMAP' not in group_names %}
out tcp 993 # IMAP
out tcp 4190
{% endif %}
-{% endif %}
{% if 'LDAP-provider' in group_names %}
out tcp 11371 # HKP