infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

[mailman3] Fix ansible-lint issues

Browse source 
Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2024-10-18 12:56:54 +02:00 • committed by kevin
parent c83cd910bf
commit f239f3db02
2 changed files with 137 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

43
roles/mailman3/handlers/main.yml
View file

@ -1,18 +1,37 @@
--- ---
- name: restart mailman3 - name: Restart mailman3
service: name=mailman3 state=restarted ansible.builtin.systemd_service:
name: mailman3
state: restarted
- name: reload apache - name: Reload apache
service: name=httpd state=reloaded ansible.builtin.systemd_service:
name: httpd
state: reloaded
- name: restart apache - name: Restart apache
service: name=httpd state=restarted ansible.builtin.systemd_service:
name: httpd
state: restarted
- name: restart memcached - name: Restart memcached
service: name=memcached state=restarted ansible.builtin.systemd_service:
name: memcached
state: restarted
- name: systemctl daemon-reload - name: Systemctl daemon-reload
command: /usr/bin/systemctl daemon-reload ansible.builtin.systemd_service:
daemon-reload: true
- name: restart mailmanweb - name: Restart mailmanweb
service: name=mailmanweb state=restarted ansible.builtin.systemd_service:
name: mailmanweb
state: restarted
- name: Initialize authentication providers
ansible.builtin.command:
cmd: mailman-web loaddata "{{ mailman_webui_confdir }}/initial-data.json"
chdir: /etc/mailman3
become_user: mailman
become: true
changed_when: true

167
roles/mailman3/tasks/main.yml
View file

@ -4,7 +4,7 @@
- name: Install needed packages - name: Install needed packages
ansible.builtin.package: ansible.builtin.package:
name: "{{item}}" name: "{{ item }}"
state: present state: present
with_items: with_items:
- httpd - httpd
@ -42,30 +42,31 @@
dest: /etc/mailman.cfg dest: /etc/mailman.cfg
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0640 mode: "0640"
tags: tags:
- config - config
- mailman - mailman
notify: notify:
- restart mailman3 - Restart mailman3
- name: Install configuration for fedmsg-plugin - name: Install configuration for fedmsg-plugin
ansible.builtin.template: ansible.builtin.template:
src: fedmsg-plugin.toml.j2 src: fedmsg-plugin.toml.j2
dest: "/etc/fedora-messaging/config.toml" dest: "/etc/fedora-messaging/config.toml"
mode: "0644"
tags: tags:
- config - config
- mailman - mailman
- fedora-messaging - fedora-messaging
notify: notify:
- restart mailman3 - Restart mailman3
- name: Create folder where we'll place the certs - name: Create folder where we'll place the certs
ansible.builtin.file: ansible.builtin.file:
path: /etc/pki/rabbitmq/mailman/ path: /etc/pki/rabbitmq/mailman/
owner: root owner: root
group: root group: root
mode: 0755 mode: "0755"
state: directory state: directory
tags: tags:
- mailman - mailman
@ -73,20 +74,20 @@
- name: Deploy mailman/rabbitmq certificate - name: Deploy mailman/rabbitmq certificate
ansible.builtin.copy: ansible.builtin.copy:
src: "{{item.src}}" src: "{{ item.src }}"
dest: "/etc/pki/rabbitmq/mailman/{{item.dest}}" dest: "/etc/pki/rabbitmq/mailman/{{ item.dest }}"
owner: root owner: root
group: mailman group: mailman
mode: "{{item.mode}}" mode: "{{ item.mode }}"
when: env == 'staging' when: env == 'staging'
with_items: with_items:
- src: "{{private}}/files/rabbitmq/staging/pki/issued/mailman.stg.crt" - src: "{{ private }}/files/rabbitmq/staging/pki/issued/mailman.stg.crt"
dest: mailman.crt dest: mailman.crt
mode: "444" mode: "444"
- src: "{{private}}/files/rabbitmq/staging/pki/private/mailman.stg.key" - src: "{{ private }}/files/rabbitmq/staging/pki/private/mailman.stg.key"
dest: mailman.key dest: mailman.key
mode: "440" mode: "440"
- src: "{{private}}/files/rabbitmq/staging/pki/ca.crt" - src: "{{ private }}/files/rabbitmq/staging/pki/ca.crt"
dest: mailman.ca dest: mailman.ca
mode: "444" mode: "444"
tags: tags:
@ -95,20 +96,20 @@
- name: Deploy mailman/rabbitmq certificate - name: Deploy mailman/rabbitmq certificate
ansible.builtin.copy: ansible.builtin.copy:
src: "{{item.src}}" src: "{{ item.src }}"
dest: "/etc/pki/rabbitmq/mailman/{{item.dest}}" dest: "/etc/pki/rabbitmq/mailman/{{ item.dest }}"
owner: root owner: root
group: mailman group: mailman
mode: "{{item.mode}}" mode: "{{ item.mode }}"
when: env != 'staging' when: env != 'staging'
with_items: with_items:
- src: "{{private}}/files/rabbitmq/production/pki/issued/mailman.crt" - src: "{{ private }}/files/rabbitmq/production/pki/issued/mailman.crt"
dest: mailman.crt dest: mailman.crt
mode: "444" mode: "444"
- src: "{{private}}/files/rabbitmq/production/pki/private/mailman.key" - src: "{{ private }}/files/rabbitmq/production/pki/private/mailman.key"
dest: mailman.key dest: mailman.key
mode: "440" mode: "440"
- src: "{{private}}/files/rabbitmq/production/pki/ca.crt" - src: "{{ private }}/files/rabbitmq/production/pki/ca.crt"
dest: mailman.ca dest: mailman.ca
mode: "444" mode: "444"
tags: tags:
@ -124,6 +125,7 @@
state: directory state: directory
owner: mailman owner: mailman
group: mailman group: mailman
mode: "0755"
tags: tags:
- logging - logging
- mailman - mailman
@ -132,6 +134,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: mailman3.logrotate.conf src: mailman3.logrotate.conf
dest: /etc/logrotate.d/mailman3 dest: /etc/logrotate.d/mailman3
mode: "0644"
tags: tags:
- logging - logging
- mailman - mailman
@ -151,6 +154,7 @@
ansible.builtin.file: ansible.builtin.file:
state: directory state: directory
path: /var/lib/mailman3/templates/site/en path: /var/lib/mailman3/templates/site/en
mode: "0755"
tags: tags:
- config - config
- mailman - mailman
@ -162,7 +166,7 @@
dest: /var/lib/mailman3/templates/site/en/list:member:generic:footer.txt dest: /var/lib/mailman3/templates/site/en/list:member:generic:footer.txt
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0644 mode: "0644"
tags: tags:
- config - config
- mailman - mailman
@ -174,7 +178,7 @@
dest: /var/lib/mailman3/templates/site/en/list:admin:action:post.txt dest: /var/lib/mailman3/templates/site/en/list:admin:action:post.txt
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0644 mode: "0644"
tags: tags:
- config - config
- mailman - mailman
@ -184,6 +188,7 @@
ansible.builtin.file: ansible.builtin.file:
state: directory state: directory
path: /var/lib/mailman3/templates/lists/users.lists.fedoraproject.org/en path: /var/lib/mailman3/templates/lists/users.lists.fedoraproject.org/en
mode: "0755"
tags: tags:
- config - config
- mailman - mailman
@ -192,10 +197,11 @@
- name: Set list:user:notice:hold template for users list - name: Set list:user:notice:hold template for users list
ansible.builtin.copy: ansible.builtin.copy:
src: mailman-template-users-list-user-notice-hold.txt src: mailman-template-users-list-user-notice-hold.txt
dest: /var/lib/mailman3/templates/lists/users.lists.fedoraproject.org/en/list:user:notice:hold.txt dest: |
/var/lib/mailman3/templates/lists/users.lists.fedoraproject.org/en/list:user:notice:hold.txt
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0644 mode: "0644"
tags: tags:
- config - config
- mailman - mailman
@ -205,6 +211,7 @@
ansible.builtin.template: ansible.builtin.template:
src: "{{ item }}.j2" src: "{{ item }}.j2"
dest: "{{ mailman_webui_confdir }}/{{ item }}" dest: "{{ mailman_webui_confdir }}/{{ item }}"
mode: "0644"
with_items: with_items:
- settings.py - settings.py
- settings_admin.py - settings_admin.py
@ -213,18 +220,19 @@
- mailman - mailman
- hyperkitty - hyperkitty
notify: notify:
- restart mailmanweb - Restart mailmanweb
- name: Install the hyperkitty/postorius urls file - name: Install the hyperkitty/postorius urls file
ansible.builtin.copy: ansible.builtin.copy:
src: urls.py src: urls.py
dest: "{{ mailman_webui_confdir }}/urls.py" dest: "{{ mailman_webui_confdir }}/urls.py"
mode: "0644"
tags: tags:
- config - config
- mailman - mailman
- hyperkitty - hyperkitty
notify: notify:
- restart mailmanweb - Restart mailmanweb
- name: Create the fulltext index dir - name: Create the fulltext index dir
ansible.builtin.file: ansible.builtin.file:
@ -232,7 +240,7 @@
state: directory state: directory
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0755 mode: "0755"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -243,7 +251,7 @@
state: directory state: directory
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0755 mode: "0755"
with_items: with_items:
- static - static
- static-fedora - static-fedora
@ -258,10 +266,11 @@
state: directory state: directory
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0755 mode: "0755"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
notify: handle static files
- name: Create the hyperkitty templates override dirs - name: Create the hyperkitty templates override dirs
ansible.builtin.file: ansible.builtin.file:
@ -269,7 +278,7 @@
state: directory state: directory
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0755 mode: "0755"
with_items: with_items:
- hyperkitty - hyperkitty
- django_mailman3 - django_mailman3
@ -283,20 +292,13 @@
dest: "{{ mailman_webui_confdir }}/initial-data.json" dest: "{{ mailman_webui_confdir }}/initial-data.json"
owner: root owner: root
group: mailman group: mailman
mode: 0640 mode: "0640"
tags: register: initial_data
- mailman
- hyperkitty
- name: Initialize authentication providers
ansible.builtin.command:
cmd: mailman-web loaddata "{{ mailman_webui_confdir }}/initial-data.json"
chdir: /etc/mailman3
become_user: mailman
become: true
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
notify:
- Initialize authentication providers
# Add the Nest banner # Add the Nest banner
# See issue https://pagure.io/fedora-infrastructure/issue/10103 # See issue https://pagure.io/fedora-infrastructure/issue/10103
@ -304,8 +306,9 @@
ansible.builtin.copy: ansible.builtin.copy:
src: top.html src: top.html
dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/top.html" dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/top.html"
mode: "0644"
notify: notify:
- restart mailmanweb - Restart mailmanweb
tags: tags:
- mailman - mailman
- banner - banner
@ -315,6 +318,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: logo-hyperkitty-fedora.png src: logo-hyperkitty-fedora.png
dest: "{{ mailman_webui_basedir }}/static-fedora/logo-hyperkitty-fedora.png" dest: "{{ mailman_webui_basedir }}/static-fedora/logo-hyperkitty-fedora.png"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -323,6 +327,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: favicon.ico src: favicon.ico
dest: "{{ mailman_webui_basedir }}/static-fedora/favicon.ico" dest: "{{ mailman_webui_basedir }}/static-fedora/favicon.ico"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -331,6 +336,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: robots.txt src: robots.txt
dest: "{{ mailman_webui_basedir }}/static-fedora/robots.txt" dest: "{{ mailman_webui_basedir }}/static-fedora/robots.txt"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -339,6 +345,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: navbar-brand.html src: navbar-brand.html
dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/navbar-brand.html" dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/navbar-brand.html"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -347,6 +354,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: headers.html src: headers.html
dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/headers.html" dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/headers.html"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -355,6 +363,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: login_extra_top.html src: login_extra_top.html
dest: "{{ mailman_webui_basedir }}/templates/django_mailman3/login_extra_top.html" dest: "{{ mailman_webui_basedir }}/templates/django_mailman3/login_extra_top.html"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -365,7 +374,7 @@
state: directory state: directory
owner: root owner: root
group: root group: root
mode: 0755 mode: "0755"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -374,6 +383,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: signup_closed.html src: signup_closed.html
dest: "{{ mailman_webui_basedir }}/templates/account/signup_closed.html" dest: "{{ mailman_webui_basedir }}/templates/account/signup_closed.html"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -381,7 +391,8 @@
- name: Install our fedmenu js hook - name: Install our fedmenu js hook
ansible.builtin.template: ansible.builtin.template:
src: bottom.html src: bottom.html
dest: "{{mailman_webui_basedir }}/templates/hyperkitty/bottom.html" dest: "{{ mailman_webui_basedir }}/templates/hyperkitty/bottom.html"
mode: "0644"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -389,10 +400,18 @@
- name: Ensuring we have correct DB schema for django apps - name: Ensuring we have correct DB schema for django apps
ansible.builtin.command: ansible.builtin.command:
cmd: mailman-web migrate --pythonpath {{ mailman_webui_confdir }} --settings settings_admin --no-input cmd: |
mailman-web migrate
--pythonpath {{ mailman_webui_confdir }}
--settings settings_admin
--no-input
chdir: /etc/mailman3 chdir: /etc/mailman3
become_user: mailman become_user: mailman
become: true become: true
register: db_migration_output
vars:
pattern: "No migrations to apply"
changed_when: not "{{ db_migration_output.stdout | regex_search(pattern) }}"
tags: tags:
- mailman - mailman
- db - db
@ -403,13 +422,13 @@
dest: "{{ mailman_webui_confdir }}/django_fedora_nosignup.py" dest: "{{ mailman_webui_confdir }}/django_fedora_nosignup.py"
owner: root owner: root
group: root group: root
mode: 0644 mode: "0644"
tags: tags:
- config - config
- mailman - mailman
- hyperkitty - hyperkitty
notify: notify:
- restart mailmanweb - Restart mailmanweb
# Fix for mailman # Fix for mailman
# https://pagure.io/fedora-infrastructure/issue/12011 # https://pagure.io/fedora-infrastructure/issue/12011
@ -422,15 +441,16 @@
- mailman - mailman
- patch - patch
notify: notify:
- restart mailman3 - Restart mailman3
# Memcached # Memcached
- name: Set the memcached sysconfig file - name: Set the memcached sysconfig file
ansible.builtin.copy: ansible.builtin.copy:
src: memcached.sysconfig src: memcached.sysconfig
dest: /etc/sysconfig/memcached dest: /etc/sysconfig/memcached
mode: "0644"
notify: notify:
- restart memcached - Restart memcached
tags: tags:
- mailman - mailman
- memcached - memcached
@ -454,13 +474,13 @@
dest: "/etc/mailman3.d/hyperkitty.cfg" dest: "/etc/mailman3.d/hyperkitty.cfg"
owner: mailman owner: mailman
group: mailman group: mailman
mode: 0640 mode: "0640"
tags: tags:
- config - config
- mailman - mailman
- hyperkitty - hyperkitty
notify: notify:
- restart mailman3 - Restart mailman3
- name: Populating static_root dir with django files/css - name: Populating static_root dir with django files/css
ansible.builtin.command: ansible.builtin.command:
@ -468,6 +488,10 @@
chdir: /etc/mailman3 chdir: /etc/mailman3
become_user: mailman become_user: mailman
become: true become: true
register: collectstatic_output
vars:
pattern: "^[1-9]\\d* static files copied"
changed_when: "{{ collectstatic_output.stdout | regex_search(pattern) }}"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -478,6 +502,10 @@
chdir: /etc/mailman3 chdir: /etc/mailman3
become_user: mailman become_user: mailman
become: true become: true
register: compress_output
vars:
pattern: "^Compressed [1-9]\\d* block"
changed_when: "{{ compress_output.stdout | regex_search(pattern) }}"
tags: tags:
- mailman - mailman
- hyperkitty - hyperkitty
@ -486,8 +514,9 @@
ansible.builtin.template: ansible.builtin.template:
src: mailmanweb.service.j2 src: mailmanweb.service.j2
dest: /etc/systemd/system/mailmanweb.service dest: /etc/systemd/system/mailmanweb.service
mode: "0644"
register: mailmanweb_systemd register: mailmanweb_systemd
notify: restart mailmanweb notify: Restart mailmanweb
tags: tags:
- mailman - mailman
- systemd - systemd
@ -512,6 +541,7 @@
ansible.builtin.template: ansible.builtin.template:
src: "mailman.logrotate.j2" src: "mailman.logrotate.j2"
dest: /etc/logrotate.d/mailman dest: /etc/logrotate.d/mailman
mode: "0644"
tags: tags:
- logrotate - logrotate
- config - config
@ -526,7 +556,7 @@
state: directory state: directory
owner: root owner: root
group: root group: root
mode: 0755 mode: "0755"
tags: tags:
- mailman - mailman
- scripts - scripts
@ -537,7 +567,7 @@
dest: "{{ mailman_webui_basedir }}/bin/{{ item }}" dest: "{{ mailman_webui_basedir }}/bin/{{ item }}"
owner: root owner: root
group: root group: root
mode: 0755 mode: "0755"
tags: tags:
- mailman - mailman
- scripts - scripts
@ -551,6 +581,10 @@
- name: Run the DMARC mitigation script - name: Run the DMARC mitigation script
ansible.builtin.command: ansible.builtin.command:
cmd: "python {{ mailman_webui_basedir }}/bin/enable_dmarc_mitigation.py" cmd: "python {{ mailman_webui_basedir }}/bin/enable_dmarc_mitigation.py"
register: dmarc_output
vars:
pattern: "^Updated rows: [1-9]\\d*"
changed_when: "{{ collectstatic_output.stdout | regex_search(pattern) }}"
tags: tags:
- mailman - mailman
- scripts - scripts
@ -560,6 +594,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: prod-to-stg.py src: prod-to-stg.py
dest: "{{ mailman_webui_basedir }}/bin/prod-to-stg.py" dest: "{{ mailman_webui_basedir }}/bin/prod-to-stg.py"
mode: "0755"
when: env == "staging" when: env == "staging"
tags: mailman tags: mailman
@ -570,6 +605,7 @@
ansible.builtin.template: ansible.builtin.template:
src: "{{ item }}.service.j2" src: "{{ item }}.service.j2"
dest: "/etc/systemd/system/{{ item }}.service" dest: "/etc/systemd/system/{{ item }}.service"
mode: "0644"
with_items: with_items:
- webui-qcluster - webui-qcluster
- webui-warm-up-cache - webui-warm-up-cache
@ -584,6 +620,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: "systemd/hyperkitty.target" src: "systemd/hyperkitty.target"
dest: "/etc/systemd/system/hyperkitty.target" dest: "/etc/systemd/system/hyperkitty.target"
mode: "0644"
notify: notify:
- systemctl daemon-reload - systemctl daemon-reload
tags: tags:
@ -595,6 +632,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: "systemd/{{ item }}.service" src: "systemd/{{ item }}.service"
dest: "/etc/systemd/system/{{ item }}.service" dest: "/etc/systemd/system/{{ item }}.service"
mode: "0644"
with_items: with_items:
- hyperkitty-daily - hyperkitty-daily
- hyperkitty-hourly - hyperkitty-hourly
@ -614,6 +652,7 @@
ansible.builtin.copy: ansible.builtin.copy:
src: "systemd/{{ item }}.timer" src: "systemd/{{ item }}.timer"
dest: "/etc/systemd/system/{{ item }}.timer" dest: "/etc/systemd/system/{{ item }}.timer"
mode: "0644"
with_items: with_items:
- hyperkitty-daily - hyperkitty-daily
- hyperkitty-hourly - hyperkitty-hourly
@ -632,8 +671,9 @@
# Httpd # Httpd
- name: Import needed httpd configurations - name: Import needed httpd configurations
ansible.builtin.template: ansible.builtin.template:
src: "{{item}}.j2" src: "{{ item }}.j2"
dest: "/etc/httpd/conf.d/{{item}}" dest: "/etc/httpd/conf.d/{{ item }}"
mode: "0644"
with_items: with_items:
- mailmanweb.conf - mailmanweb.conf
notify: notify:
@ -649,7 +689,7 @@
state: yes state: yes
persistent: yes persistent: yes
notify: notify:
- restart apache - Restart apache
tags: tags:
- mailman - mailman
- selinux - selinux
@ -660,7 +700,7 @@
state: yes state: yes
persistent: yes persistent: yes
notify: notify:
- restart apache - Restart apache
tags: tags:
- mailman - mailman
- selinux - selinux
@ -671,8 +711,8 @@
setype: httpd_sys_content_t setype: httpd_sys_content_t
state: present state: present
tags: tags:
- mailman - mailman
- selinux - selinux
- name: Set the SELinux policy for the templates override directory - name: Set the SELinux policy for the templates override directory
community.general.sefcontext: community.general.sefcontext:
@ -680,18 +720,23 @@
setype: httpd_sys_content_t setype: httpd_sys_content_t
state: present state: present
tags: tags:
- mailman - mailman
- selinux - selinux
- name: Apply SELinux changes - name: Apply SELinux changes
command: restorecon -irv "{{ mailman_webui_basedir}}" ansible.builtin.command: restorecon -irv "{{ mailman_webui_basedir }}"
register: restorecon_output
changed_when: restorecon_output.stdout is defined and restorecon_output.stdout | length > 0
tags:
- mailman
- selinux
# Start services # Start services
- name: Start services - name: Start services
ansible.builtin.systemd: ansible.builtin.systemd:
state: started state: started
enabled: yes enabled: yes
name: "{{item}}" name: "{{ item }}"
with_items: with_items:
- httpd - httpd
- hyperkitty-daily.timer - hyperkitty-daily.timer