Update to trixie

journal-postfix/files/srv/settings.py

@@ -9,6 +9,7 @@ import datetime
 from typing import Union, Optional
 from systemd import journal
 from yaml import load
+from yaml import CLoader as Loader
 
 
 main_config_file: str = '/etc/journal-postfix/main.yml'
@@ -85,7 +86,7 @@ def get_config() -> Optional[dict]:
         journal.send(msg, PRIORITY=journal.LOG_CRIT)
         return None
     try:
-        config = load(config_raw)
+        config = load(config_raw, Loader=Loader)
     except Exception as err:
         msg = f'ERROR: invalid yaml syntax in {filename}: {err}'
         journal.send(msg, PRIORITY=journal.LOG_CRIT)

journal-postfix/tasks/main.yml

@@ -1,42 +1,42 @@
-- name: user journal-postfix
-  user:
+- name: User journal-postfix
+  ansible.builtin.user:
     name: journal-postfix
     group: systemd-journal
     state: present
-    system: yes
+    system: true
     uid: 420
-    create_home: no
+    create_home: false
     home: /srv/journal-postfix
     password: '!'
-    password_lock: yes
+    password_lock: true
     comment: created by ansible role journal-postfix
 
-- name: directories /srv/journal-postfix, /etc/journal-postfix
-  file:
+- name: Directories /srv/journal-postfix, /etc/journal-postfix
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     owner: journal-postfix
     group: systemd-journal
-    mode: 0755
+    mode: "0755"
   loop:
     - /srv/journal-postfix
     - /etc/journal-postfix
 
-- name: install dependencies
-  apt:
+- name: Install dependencies
+  ansible.builtin.apt:
     name: python3-psycopg2,python3-systemd,python3-yaml
     state: present
-    update_cache: yes
-    install_recommends: no
+    update_cache: true
+    install_recommends: false
 
-- name: files in /srv/journal-postfix
-  copy:
+- name: Files in /srv/journal-postfix
+  ansible.builtin.copy:
     src: "srv/{{ item }}"
     dest: "/srv/journal-postfix/{{ item }}"
     owner: journal-postfix
     group: systemd-journal
-    mode: 0644
-    force: yes
+    mode: "0644"
+    force: true
   loop:
     - run.py
     - settings.py
@@ -47,44 +47,49 @@
     - README.md
     - setup.cfg
 
-- name: make some files executable
-  file:
+- name: Make some files executable
+  ansible.builtin.file:
     path: "{{ item }}"
-    mode: 0755
+    mode: "0755"
   loop:
     - /srv/journal-postfix/run.py
     - /srv/journal-postfix/settings.py
 
-- name: determine whether to startup
-  set_fact:
-    startup: "{{ mailserver.postgresql.host is defined and mailserver.postgresql.port is defined and mailserver.postgresql.dbname is defined and mailserver.postgresql.username is defined and mailserver.postgresql.password is defined }}"
+- name: Determine whether to startup
+  ansible.builtin.set_fact:
+    startup: >-
+      {{ (mailserver.postgresql.host is defined
+      and mailserver.postgresql.port is defined
+      and mailserver.postgresql.dbname is defined
+      and mailserver.postgresql.username is defined
+      and mailserver.postgresql.password is defined) | bool }}
 
-- name: file /etc/journal-postfix/main.yml
-  template:
+- name: File /etc/journal-postfix/main.yml
+  ansible.builtin.template:
     src: main.yml
     dest: /etc/journal-postfix/main.yml
     owner: journal-postfix
     group: systemd-journal
-    mode: 0600
-    force: no
+    mode: "0600"
+    force: false
 
-- name: file journal-postfix.service
-  copy:
+- name: File journal-postfix.service
+  ansible.builtin.copy:
     src: journal-postfix.service
     dest: /etc/systemd/system/journal-postfix.service
     owner: root
     group: root
-    mode: 0644
-    force: yes
+    mode: "0644"
+    force: true
 
-- name: enable systemd unit journal-postfix.service
-  systemd:
-    enabled: yes
-    daemon_reload: yes
+- name: Enable systemd unit journal-postfix.service
+  ansible.builtin.systemd:
+    enabled: true
+    daemon_reload: true
     name: journal-postfix.service
 
-- name: restart systemd unit journal-postfix.service
-  systemd:
+- name: Restart systemd unit journal-postfix.service
+  ansible.builtin.systemd:
     state: restarted
     name: journal-postfix.service
   when: startup

journal-postfix/templates/main.yml

@@ -1,7 +1,7 @@
 # Configuration for journal-postfix, see /srv/journal-postfix
 
-# To enable startup of systemd unit journal-postfix set this to yes:
-startup: {{ 'yes' if startup else 'no' }}
+# startup of systemd unit journal-postfix
+startup: true if startup else false
 
 # PostgreSQL database connection parameters
 postgresql: