Merge pull request #6 from roles-ansible/l

Improve rspamd stuff

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

@@ -20,3 +20,4 @@ jobs:
         uses: ansible-actions/ansible-lint-action@v1.0.2
         with:
           target: "./"
+          python_dependency_file: 'requirements.txt'

README.md

@@ -1,18 +1,5 @@
-# ansible_role_template
+# ansible_role_rspamd
-Template for Ansible roles
 
- Testing
+Use at your own risk. Sorry for not having a proper docs.
-----------
-This role is tested with [these github-action](https://github.com/search?q=topic%3Acheck-ansible+topic%3Agithub-actions+org%3Aroles-ansible&type=Repositories) tests for different versions of differen linux systems. Linting is tested via travis-ci and the  [ansible-lint action](https://github.com/marketplace/actions/ansible-lint).
-If you want to find out more about our tests, please have a look at the github marketplace.
 
-| test status | Github Marketplace |
+THis role will be deprecated soon™
-| :---------  | :----------------  |
-| [![Ansible Lint check](https://github.com/roles-ansible/ansible_role_template/workflows/Ansible%20Lint%20check/badge.svg)](https://github.com/roles-ansible/ansible_role_template/actions?query=workflow%3A%22Ansible+Lint+check%22) | [ansible-lint action](https://github.com/marketplace/actions/ansible-lint) |
-| ![Yamllint GitHub Actions](https://github.com/roles-ansible/ansible_role_template/workflows/Yamllint%20GitHub%20Actions/badge.svg) |  [yamllint gitHub actions](https://github.com/marketplace/actions/yamllint-github-action) |
-| | |
-| [![Ansible check debian:stable](https://github.com/roles-ansible/ansible_role_template/workflows/Ansible%20check%20debian:stable/badge.svg)](https://github.com/roles-ansible/ansible_role_template/actions?query=workflow%3A%22Ansible+check+debian%3Astable%22) | [ansible test with debian stable](https://github.com/marketplace/actions/check-ansible-debian-stable) |
-| [![Ansible check debian:latest](https://github.com/roles-ansible/ansible_role_template/workflows/Ansible%20check%20debian:latest/badge.svg)](https://github.com/roles-ansible/ansible_role_template/actions?query=workflow%3A%22Ansible+check+debian%3Alatest%22) | [ansible test with debian latest](https://github.com/marketplace/actions/check-ansible-debian-latest) |
-| [![Ansible check debian:sid](https://github.com/roles-ansible/ansible_role_template/workflows/Ansible%20check%20debian:sid/badge.svg)](https://github.com/roles-ansible/ansible_role_template/actions?query=workflow%3A%22Ansible+check+debian%3Asid%22) | [ansible test with debian sid](https://github.com/marketplace/actions/check-ansible-debian-sid) |
-| [![Ansible check debian:buster](https://github.com/roles-ansible/ansible_role_template/workflows/Ansible%20check%20debian:buster/badge.svg)](https://github.com/roles-ansible/ansible_role_template/actions?query=workflow%3A%22Ansible+check+debian%3Abuster%22) | [ansible test with debian buster](https://github.com/marketplace/actions/check-ansible-debian-buster) |
-| [![Ansible check debian:stretch](https://github.com/roles-ansible/ansible_role_template/workflows/Ansible%20check%20debian:stretch/badge.svg)](https://github.com/roles-ansible/ansible_role_template/actions?query=workflow%3A%22Ansible+check+debian%3Astretch%22) | [ansible test with debian stretch](https://github.com/marketplace/actions/check-ansible-debian-stretch) |

requirements.txt

@@ -0,0 +1 @@
+passlib[bcrypt]>=1.7.4

tasks/packages.yml

@@ -26,12 +26,11 @@
 
 - name: Download /etc/apt/keyrings/rspamd.gpg
   become: true
-  ansible.builtin.get_url:
+  ansible.builtin.apt_key:
-    url: '//rspamd.com/apt-stable/gpg.key'
+    url: 'https://rspamd.com/apt-stable/gpg.key'
-    dest: '/etc/apt/keyrings/rspamd.gpg'
+    keyring: '/etc/apt/keyrings/rspamd.gpg'
-    mode: '0644'
+    state: 'present'
-    owner: 'root'
+  notify: Run sudo apt update
-    group: 'root'
 
 - name: Add rspamd repo
   become: true

vars/main.yml

@@ -5,4 +5,4 @@ playbook_version_path: 'do1jlr.rspamd.version'
 
 # https://github.com/ansible/ansible/issues/36129
 # yamllint disable-line rule:line-length
-rspamd__admin_password_with_salt: "{{ rspamd__admin_password | password_hash('bcrypt', ('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890' | shuffle(seed=inventory_hostname) | join)[:21] + ('Oeu' | shuffle(seed=inventory_hostname) | join)[1], rounds=9) }}"
+rspamd__admin_password_with_salt: "{{ rspamd__admin_password | ansible.builtin.password_hash('bcrypt', ('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890' | shuffle(seed=inventory_hostname) | join)[:21] + ('Oeu' | ansible.builtin.shuffle(seed=inventory_hostname) | join)[1], rounds=9) }}"