diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2015-05-31 04:05:17 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:53:57 +0200 |
| commit | b1af6a788f24da872d5c33efbd8f572617bc2958 (patch) | |
| tree | c34445430cd0e8bdcd302db17cc82ea59e5f0343 | |
| parent | 0b0f73b7e303a9169224fb42a2210d312c5363ff (diff) | |
typo
| -rw-r--r-- | roles/common-web/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/common/templates/etc/iptables/services.j2 | 6 |
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 |