Skip to content

Commit

Permalink
Merge pull request #53 from systemli/feat/debian12
Browse files Browse the repository at this point in the history
Add debian12 support
  • Loading branch information
doobry-systemli authored Jan 1, 2024
2 parents ae5ff47 + 38cfcca commit 6de7c48
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 42 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
uses: systemli/github-ansible-workflow/.github/workflows/[email protected]
with:
distros: '[ "debian11", "debian12" ]'
3 changes: 0 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
- name: Restart munin-node
service:
name: munin-node
state: restarted

- name: Restart opendkim
service:
name: opendkim
Expand Down
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ galaxy_info:
versions:
- buster
- bullseye
- bookworm
dependencies: []
6 changes: 4 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ driver:
name: virtualbox

platforms:
- name: dovecot-bullseye64
box: debian/bullseye64
- name: dovecot-bookworm64
box: debian/bookworm64

lint: |
set -e
Expand All @@ -15,4 +15,6 @@ lint: |
provisioner:
name: ansible
ansible_args:
- --diff
become: true
5 changes: 0 additions & 5 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 0 additions & 24 deletions tasks/munin.yml

This file was deleted.

5 changes: 4 additions & 1 deletion templates/10-ssl.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 6de7c48

Please sign in to comment.