Some syntax cleanup, add missing tags.

This commit is contained in:
Andrea Dell'Amico 2026-09-15 12:57:55 +02:00
parent 0773fef2ac
commit 74303e5340
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
3 changed files with 32 additions and 19 deletions

View File

@ -1,10 +1,10 @@
---
- name: Install the distribution dependencies
block:
- name: mailman distribution dependencies, RH/CentOS
- name: Install Mailman distribution dependencies on Red Hat systems
yum: pkg={{ mailman_rh_dependencies }} state=present
- name: postorius distribution dependencies, RH/CentOS
- name: Install Postorius distribution dependencies on Red Hat systems
yum: pkg={{ mailman_postorius_rh_dependencies }} state=present
when: ansible_distribution_file_variety == "RedHat"
@ -12,7 +12,7 @@
- name: Create the mailman user
block:
- name: mailman user
- name: Create the Mailman system user
user: name={{ mailman_srv_user }} createhome=no shell=/usr/sbin/nologin system=yes comment='Mailman User' generate_ssh_key=yes home={{ mailman_home }}
- name: Create the mailman user directory

View File

@ -1,5 +1,10 @@
---
- import_tasks: mailman.yml
- import_tasks: postorius-hyperkitty.yml
- import_tasks: mailman-postorius-hyperkitty-upgrade.yml
- name: Import Mailman Core tasks
ansible.builtin.import_tasks: mailman.yml
- name: Import Postorius and HyperKitty tasks
ansible.builtin.import_tasks: postorius-hyperkitty.yml
- name: Import Mailman, Postorius, and HyperKitty upgrade tasks
ansible.builtin.import_tasks: mailman-postorius-hyperkitty-upgrade.yml
when: mailman_upgrade_all_the_distribution

View File

@ -46,28 +46,36 @@
group: '{{ mailman_user }}'
mode: '0750'
when: mailman_manage_postorius_site | bool
tags: [ 'mailman_postorius_site' ]
tags: [mailman_postorius_site]
- name: Configure the canonical Django Site used by archive links
become: true
become_user: '{{ mailman_user }}'
ansible.builtin.command:
argv:
- '{{ mailman_postorius_site_config_script }}'
argv: >-
{{ [mailman_postorius_site_config_script]
+ (ansible_check_mode | ternary(['--check'], [])) }}
register: mailman_postorius_site_config_result
changed_when: "'CHANGED:' in mailman_postorius_site_config_result.stdout"
when:
- mailman_manage_postorius_site | bool
- not ansible_check_mode
tags: [ 'mailman_postorius_site' ]
changed_when: >-
'CHANGED:' in mailman_postorius_site_config_result.stdout or
'WOULD CHANGE:' in mailman_postorius_site_config_result.stdout
check_mode: false
when: mailman_manage_postorius_site | bool
tags: [mailman_postorius_site]
- name: Install the hyperkitty configuration file
template: src=mailman-hyperkitty.cfg.j2 dest={{ mailman_conf_dir }}/mailman-hyperkitty.cfg owner=root group={{ mailman_user }} mode=0440
ansible.builtin.template:
src: mailman-hyperkitty.cfg.j2
dest: '{{ mailman_conf_dir }}/mailman-hyperkitty.cfg'
owner: root
group: '{{ mailman_user }}'
mode: '0440'
when: mailman_use_hyperkitty_archiver | bool
register: mailman_hyperkitty_install
notify: Restart mailman
tags: [mailman_postorius_site]
tags: [ 'mailman', 'postorius', 'hyperkitty', 'mailman_conf' ]
tags: [mailman, postorius, hyperkitty, mailman_conf]
- name: Manage the postorius and hyperkitty services
block:
@ -300,7 +308,7 @@
- name: Setup the postorius cron jobs
block:
- name: add a cron job that syncs the mailman core and postorius settings
- name: Add a cron job that syncs the Mailman Core and Postorius settings
cron:
job: "{{ mailman_postorius_dir }}/manage.py runjobs {{ item }} > {{ mailman_postorius_log_dir }}/runjobs-{{ item }}.log 2>&1"
special_time: '{{ item }}'
@ -311,7 +319,7 @@
disabled: no
with_items: '{{ mailman_postorius_cronjob_frequency }}'
- name: postorius cron job that runs every 15 minutes
- name: Add the Postorius cron job that runs every 15 minutes
cron:
job: "{{ mailman_postorius_dir }}/manage.py runjobs quarter_hourly > {{ mailman_postorius_log_dir }}/runjobs-quarter_hourly.log 2>&1"
minute: "3,18,33,48"
@ -321,7 +329,7 @@
disabled: no
state: present
- name: postorius cron job that runs every minute
- name: Add the Postorius cron job that runs every minute
cron:
job: "{{ mailman_postorius_dir }}/manage.py runjobs minutely > {{ mailman_postorius_log_dir }}/runjobs-minutely.log 2>&1"
minute: "*"