Merge pull request #1 from roles-ansible/actions

update github actions

.github/workflows/ansible-debian-buster.yml

@@ -1,18 +0,0 @@
----
-name: Ansible check debian:buster
-
-# yamllint disable-line rule:truthy
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: ansible check with debian:buster
-        uses: roles-ansible/check-ansible-debian-buster-action@master
-        with:
-          targets: "./"

.github/workflows/ansible-debian-latest.yml

@@ -1,18 +0,0 @@
----
-name: Ansible check debian:latest
-
-# yamllint disable-line rule:truthy
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: ansible check with debian:latest
-        uses: roles-ansible/check-ansible-debian-latest-action@master
-        with:
-          targets: "./"

.github/workflows/ansible-debian-sid.yml

@@ -1,18 +0,0 @@
----
-name: Ansible check debian:sid
-
-# yamllint disable-line rule:truthy
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: ansible check with debian:sid
-        uses: roles-ansible/check-ansible-debian-sid-action@master
-        with:
-          targets: "./"

.github/workflows/ansible-debian-stable.yml

@@ -1,18 +0,0 @@
----
-name: Ansible check debian:stable
-
-# yamllint disable-line rule:truthy
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: ansible check with debian:stable
-        uses: roles-ansible/check-ansible-debian-stable-action@master
-        with:
-          targets: "./"

.github/workflows/ansible-debian-stretch.yml

@@ -1,18 +0,0 @@
----
-name: Ansible check debian:stretch
-
-# yamllint disable-line rule:truthy
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: ansible check with debian:stretch
-        uses: roles-ansible/check-ansible-debian-stretch-action@master
-        with:
-          targets: "./"

.github/workflows/ansible-linting-check.yml

@@ -2,21 +2,21 @@
 name: Ansible Lint check
 
 # yamllint disable-line rule:truthy
-on: [push, pull_request]
+on:
+  push:
+    branches: '*'
+  pull_request:
+    branches: '*'
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: 'checkout git repo'
+        uses: actions/checkout@v3
 
-      - name: Lint Ansible Playbook
+      - name: 'Lint Ansible Playbook'
-        uses: ansible/ansible-lint-action@master
+        uses: ansible/ansible-lint-action@v6
         with:
           targets: "."
-          # [required]
-          # Paths to ansible files (i.e., playbooks, tasks, handlers etc..)
-          args: ""
-          # [optional]

.github/workflows/yamllint.yaml

@@ -2,21 +2,22 @@
 name: 'Yamllint GitHub Actions'
 
 # yamllint disable-line rule:truthy
-on: [push, pull_request]
+on:
+  push:
+    branches: '*'
+  pull_request:
+    branches: '*'
 
 jobs:
   yamllint:
     name: 'Yamllint'
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout'
+      - name: 'checkout git repo'
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
+
       - name: 'Yamllint'
-        uses: karancode/yamllint-github-action@master
+        uses: karancode/yamllint-github-action@v2.0.0
         with:
           yamllint_file_or_dir: '.'
           yamllint_config_filepath: './.yamllint'
-          yamllint_strict: false
-          yamllint_comment: true
-#       env:
-#         GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }

defaults/main.yml

@@ -9,6 +9,10 @@ rspamd__redis_server: '127.0.0.1'
 rspamd__default_owner: '_rspamd'
 rspamd__default_group: '_rspamd'
 
+# configure options
+rspamd__configure_redis: true
+rspamd__configure_dkim: true
+
 # rspamd config file path
 rspamd__multimap_conf_file: 'files/multimap.conf'
 rspamd__whitelist_ip_file: 'files/whitelist_ip.map'

handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: sudo apt update
   become: true
-  apt:
+  ansible.builtin.apt:
     update_cache: true
 
 - name: systemctl restart rspamd

tasks/configure.yml

@@ -12,7 +12,7 @@
       notify: systemctl restart rspamd
   rescue:
     - name: you have to install passlib
-      fail:
+      ansible.builtin.fail:
         msg: 'I caught an error. Maybe you have to install passlib via pip3'
 
 - name: Einstellung des logging

tasks/main.yml

@@ -11,6 +11,8 @@
 
 - name: rspamd dkim signing
   include_tasks: dkim.yml
+  when: rspamd__configure_dkim | bool
 
 - name: redis backend
   include_tasks: redis.yml
+  when: rspamd__configure_redis | bool

tasks/packages.yml

@@ -1,13 +1,13 @@
 ---
 - name: update repo-cache for debian/ubuntu
   become: true
-  apt:
+  ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
 
 - name: install requirements to add new package repos
   become: true
-  apt:
+  ansible.builtin.apt:
     name:
       - lsb-release
       - wget
@@ -40,10 +40,11 @@
   notify: sudo apt update
 
 - name: run update if something changed
-  meta: flush_handlers
+  ansible.builtin.meta: flush_handlers
 
 - name: install rspamd
   become: true
-  apt:
+  ansible.builtin.apt:
     name: rspamd
     state: present
+  notify: systemctl restart rspamd

tasks/redis.yml

@@ -1,6 +1,6 @@
 ---
 - name: install redis backend
   become: true
-  apt:
+  ansible.builtin.apt:
     name: redis
     state: present