diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f124bc..7a45484 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,9 +13,10 @@ on: # * is a special character in YAML so you have to quote this string # first of each month - cron: "0 0 1 * *" - workflow_dispatch: jobs: integration: name: Integration - uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.2.0 + uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.2.3 + with: + distros: '[ "debian11", "debian12" ]' diff --git a/defaults/main.yml b/defaults/main.yml index 3998010..10d8e42 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -49,9 +49,6 @@ dovecot_vmail_path: /var/vmail dovecot_openmetrics_enabled: false dovecot_openmetrics_port: 9900 -# enable dovecot munin plugins -dovecot_munin: false - # enable dovecot backup dovecot_backup_lead: false dovecot_backup_follower: false diff --git a/handlers/main.yml b/handlers/main.yml index 10f9a43..9d25477 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,9 +1,4 @@ --- -- name: Restart munin-node - service: - name: munin-node - state: restarted - - name: Restart opendkim service: name: opendkim diff --git a/meta/main.yml b/meta/main.yml index 29547e8..f4064d5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,4 +16,5 @@ galaxy_info: versions: - buster - bullseye + - bookworm dependencies: [] diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index fc0e889..959d6ad 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -5,8 +5,8 @@ driver: name: virtualbox platforms: - - name: dovecot-bullseye64 - box: debian/bullseye64 + - name: dovecot-bookworm64 + box: debian/bookworm64 lint: | set -e @@ -15,4 +15,6 @@ lint: | provisioner: name: ansible + ansible_args: + - --diff become: true diff --git a/tasks/main.yml b/tasks/main.yml index 184ac4f..f8dc4b7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -137,11 +137,6 @@ when: dovecot_openmetrics_enabled tags: openmetrics -- name: Import munin tasks - import_tasks: munin.yml - when: dovecot_munin - tags: munin - - name: Import backup leader tasks import_tasks: dovecot_backup_lead.yml when: dovecot_backup_lead diff --git a/tasks/munin.yml b/tasks/munin.yml deleted file mode 100644 index f75b7b2..0000000 --- a/tasks/munin.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -- name: Link shared munin-plugins mail_connections - file: - src: "/usr/local/share/munin-plugins/plugins/mail/mail_connections" - dest: "/etc/munin/plugins/mail_connections" - state: link - notify: Restart munin-node - -- name: Link shared munin-plugins for dovecot - file: - src: "/usr/local/share/munin-plugins/plugins/dovecot/dovecot" - dest: "/etc/munin/plugins/dovecot" - state: link - notify: Restart munin-node - -- name: Copy config for dovecot munin plugin - copy: - src: dovecot.munin - dest: "/etc/munin/plugin-conf.d/dovecot" - owner: root - group: root - mode: 0644 - notify: Restart munin-node diff --git a/templates/10-ssl.conf.j2 b/templates/10-ssl.conf.j2 index fa5587a..c1fd32f 100644 --- a/templates/10-ssl.conf.j2 +++ b/templates/10-ssl.conf.j2 @@ -55,7 +55,10 @@ ssl_client_ca_dir = /etc/ssl/certs ssl_dh = <{{ '/usr/share/dovecot/dh.pem' if __testing|d() else '/etc/dovecot/dh.pem' }} # Minimum SSL protocol version to use. Potentially recognized values are SSLv3, -# TLSv1, TLSv1.1, and TLSv1.2, depending on the OpenSSL version used. +# TLSv1, TLSv1.1, TLSv1.2 and TLSv1.3, depending on the OpenSSL version used. +# +# Dovecot also recognizes values ANY and LATEST. ANY matches with any protocol +# version, and LATEST matches with the latest version supported by library. ssl_min_protocol = {{ dovecot_ssl_min_protocol | default('TLSv1.2') }} # SSL ciphers to use, the default is: