diff options
| -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 @@ -1,27 +1,27 @@ - name: Install Nginx apt: pkg=nginx - name: Limit Nginx logging lineinfile: "dest=/etc/logrotate.d/nginx create=yes regexp='^\\s*rotate\\s' - line='\trotate 3'" + line='\trotate 1'" tags: - logrotate - name: Delete /etc/nginx/*_params file: path=/etc/nginx/{{ item }}_params state=absent with_items: - fastcgi - proxy - scgi - uwsgi - name: Delete /etc/nginx/sites-{available,enabled}/default file: path=/etc/nginx/sites-{{ item }}/default state=absent with_items: - enabled - available - name: Create directory /etc/nginx/{fastcgi,ssl} file: path=/etc/nginx/{{ item }} state=directory 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 @@ -35,32 +35,32 @@ out tcp {{ postfix_instance.lists.port }} {% if groups.all | difference([inventory_hostname]) %} in tcp {{ postfix_instance.out.port }} {% endif %} out tcp 25 # SMTP {% else %} out tcp {{ postfix_instance.out.port }} {% endif %} {% if 'IMAP' in group_names %} in tcp 993 # IMAPS in tcp 4190 # ManageSieve {% endif %} {% if 'MDA' in group_names and 'MX' not in group_names %} in tcp {{ postfix_instance.IMAP.port }} {% endif %} {% if 'lists' in group_names and 'MX' not in group_names %} in tcp {{ postfix_instance.lists.port }} {% endif %} {% 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 out tcp 43 # WHOIS {% endif %} |