Make ansible-lint happy (no functional changes, only codestyle)

This commit is contained in:
s3lph 2022-05-29 22:50:30 +02:00
parent cdd28ce371
commit fa5165b62b
16 changed files with 41 additions and 47 deletions
.config
galaxy.yml
roles
dovecot/defaults/main
mailman
defaults
handlers
multischleuder/defaults
postfixadmin
postsrsd/defaults
schleuder
spamassassin/tasks

3
.config/ansible-lint.yml Normal file
View file

@ -0,0 +1,3 @@
---
skip_list:
- yaml[truthy]

View file

@ -16,7 +16,7 @@ readme: README.md
# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url) # A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
# @nicks:irc/im.site#channel' # @nicks:irc/im.site#channel'
authors: authors:
- s3lph <1375407-s3lph@users.noreply.gitlab.com> - s3lph <1375407-s3lph@users.noreply.gitlab.com>
### OPTIONAL but strongly recommended ### OPTIONAL but strongly recommended
@ -26,7 +26,7 @@ description: MSA, MTA and MDA with Postfix & Dovecot
# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
# accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file' # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
license: license:
- MIT - MIT
# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
# requirements as 'namespace' and 'name' # requirements as 'namespace' and 'name'
@ -65,4 +65,3 @@ issues: https://gitlab.com/s3lph/ansible-collection-mailserver/-/issues
# uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry', # uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry',
# and '.git' are always filtered # and '.git' are always filtered
build_ignore: [] build_ignore: []

View file

@ -9,4 +9,3 @@ dovecot_postfix_lmtp_socket_filename: /var/spool/postfix/private/dovecot-lmtp
dovecot_postfix_lmtp_socket_mode: "0600" dovecot_postfix_lmtp_socket_mode: "0600"
dovecot_postfix_lmtp_socket_owner: postfix dovecot_postfix_lmtp_socket_owner: postfix
dovecot_postfix_lmtp_socket_group: postfix dovecot_postfix_lmtp_socket_group: postfix

View file

@ -7,4 +7,4 @@ dovecot_tls_dh_filename: /usr/share/dovecot/dh.pem
# generated 2020-12-05, Mozilla Guideline v5.6, Dovecot 2.3.4, OpenSSL 1.1.1d, intermediate configuration # generated 2020-12-05, Mozilla Guideline v5.6, Dovecot 2.3.4, OpenSSL 1.1.1d, intermediate configuration
# https://ssl-config.mozilla.org/#server=dovecot&version=2.3.4&config=intermediate&openssl=1.1.1d&guideline=5.6 # https://ssl-config.mozilla.org/#server=dovecot&version=2.3.4&config=intermediate&openssl=1.1.1d&guideline=5.6
dovecot_tls_min_version: TLSv1.2 dovecot_tls_min_version: TLSv1.2
dovecot_tls_cipher_list: "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384" dovecot_tls_cipher_list: "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384" # noqa yaml[line-length]

View file

@ -34,7 +34,7 @@ mailman_database_class: mailman.database.mysql.MySQLDatabase
# sqlite:///$DATA_DIR/mailman.db # sqlite:///$DATA_DIR/mailman.db
# mysql+pymysql://mailman3:mmpass@localhost/mailman3?charset=utf8&use_unicode=1 # mysql+pymysql://mailman3:mmpass@localhost/mailman3?charset=utf8&use_unicode=1
# postgres://mailman3:mmpass@localhost/mailman3 # postgres://mailman3:mmpass@localhost/mailman3
mailman_database_url: "mysql+pymysql://{{ mailman_mariadb_user }}:{{ mailman_mariadb_password }}@{{ mailman_mariadb_host }}:{{ mailman_mariadb_port }}/{{ mailman_mariadb_database }}?charset=utf8mb4&use_unicode=1" mailman_database_url: "mysql+pymysql://{{ mailman_mariadb_user }}:{{ mailman_mariadb_password }}@{{ mailman_mariadb_host }}:{{ mailman_mariadb_port }}/{{ mailman_mariadb_database }}?charset=utf8mb4&use_unicode=1" # noqa yaml[line-length]
mailman_database_debug: "no" mailman_database_debug: "no"
mailman_logging_format: "%(asctime)s (%(process)d) %(message)s" mailman_logging_format: "%(asctime)s (%(process)d) %(message)s"

View file

@ -6,15 +6,15 @@
- name: restart mailman3 - name: restart mailman3
ansible.builtin.service: ansible.builtin.service:
name : mailman3 name: mailman3
state: restarted state: restarted
- name: restart mailman3-web - name: restart mailman3-web
ansible.builtin.service: ansible.builtin.service:
name : mailman3-web name: mailman3-web
state: restarted state: restarted
- name: reload postfix - name: reload postfix
ansible.builtin.service: ansible.builtin.service:
name : postfix name: postfix
state: reloaded state: reloaded

View file

@ -4,15 +4,15 @@ multischleuder_download: yes
multischleuder_service_enabled: yes multischleuder_service_enabled: yes
multischleuder_config: | multischleuder_config: |
# Configure this to talk to your schleuder-api-daemon. # Configure this to talk to your schleuder-api-daemon.
api: api:
url: "https://localhost:4443" url: "https://localhost:4443"
token: "130a8c095d14fa51e73727e9d8ef5db3a3bf0cae7d995c1f" token: "130a8c095d14fa51e73727e9d8ef5db3a3bf0cae7d995c1f"
cafile: /etc/multischleuder/schleuder-ca.pem cafile: /etc/multischleuder/schleuder-ca.pem
lists: [] lists: []
# # The Schleuder list to manage. Must exist # # The Schleuder list to manage. Must exist
# - target: global@schleuder.example.org # - target: global@schleuder.example.org
# unmanaged: # unmanaged:
@ -38,7 +38,7 @@ multischleuder_config: |
# send_conflict_messages: yes # send_conflict_messages: yes
# # Whether to notify the target Schleuder's admins about changes. # # Whether to notify the target Schleuder's admins about changes.
# send_admin_reports: yes # send_admin_reports: yes
# Hook this up to your MTA, # Hook this up to your MTA,
smtp: smtp:
hostname: localhost # default: localhost hostname: localhost # default: localhost
@ -46,7 +46,7 @@ multischleuder_config: |
tls: PLAIN # PLAIN|STARTTLS|SMTPS; default: PLAIN tls: PLAIN # PLAIN|STARTTLS|SMTPS; default: PLAIN
username: admin # optional username: admin # optional
password: password # optional password: password # optional
conflict: conflict:
# How often to notify users about conflicts # How often to notify users about conflicts
interval: 604800 # 1 week interval: 604800 # 1 week
@ -62,29 +62,29 @@ multischleuder_config: |
# in the conflict. # in the conflict.
key_template: | key_template: |
Hi {subscriber}, Hi {subscriber},
While compiling the subscriber list of {schleuder}, your While compiling the subscriber list of {schleuder}, your
address {subscriber} was subscribed on multiple sub-lists with address {subscriber} was subscribed on multiple sub-lists with
different PGP keys. There may be something fishy or malicious going on, different PGP keys. There may be something fishy or malicious going on,
or this may simply have been a mistake by you or a list admin. or this may simply have been a mistake by you or a list admin.
You have only been subscribed to {schleuder} using the key you You have only been subscribed to {schleuder} using the key you
have been subscribed with for the *longest* time: have been subscribed with for the *longest* time:
{chosen} {chosen}
Please review the following keys and talk to the admins of the Please review the following keys and talk to the admins of the
corresponding sub-lists to resolve this issue: corresponding sub-lists to resolve this issue:
Fingerprint Sub-List Fingerprint Sub-List
----------- -------- ----------- --------
{affected} {affected}
For your convenience, this message has been encrypted with *all* of the For your convenience, this message has been encrypted with *all* of the
above keys. If you have any questions, or do not understand this above keys. If you have any questions, or do not understand this
message, please refer to your local Schleuder admin, or reply to this message, please refer to your local Schleuder admin, or reply to this
message. message.
Regards Regards
MultiSchleuder {schleuder} MultiSchleuder {schleuder}
# The template used when sending mails to subscribers involved in a user conflict # The template used when sending mails to subscribers involved in a user conflict
@ -97,28 +97,28 @@ multischleuder_config: |
# in the conflict. # in the conflict.
user_template: | user_template: |
Hi {subscriber}, Hi {subscriber},
While compiling the subscriber list of {schleuder}, your While compiling the subscriber list of {schleuder}, your
key {fingerprint} was used by subscribers on multiple sub-lists with key {fingerprint} was used by subscribers on multiple sub-lists with
different email adresses. There may be something fishy or malicious different email adresses. There may be something fishy or malicious
going on, or this may simply have been a mistake by you or a list admin. going on, or this may simply have been a mistake by you or a list admin.
You have only been subscribed to {schleuder} using the address you You have only been subscribed to {schleuder} using the address you
have been subscribed with for the *longest* time: have been subscribed with for the *longest* time:
{chosen} {chosen}
Please review the following adresses and talk to the admins of the Please review the following adresses and talk to the admins of the
corresponding sub-lists to resolve this issue: corresponding sub-lists to resolve this issue:
Adress Sub-List Adress Sub-List
------ -------- ------ --------
{affected} {affected}
For your convenience, this message has been sent to *all* of the above For your convenience, this message has been sent to *all* of the above
adresses. If you have any questions, or do not understand this adresses. If you have any questions, or do not understand this
message, please refer to your local Schleuder admin, or reply to this message, please refer to your local Schleuder admin, or reply to this
message. message.
Regards Regards
MultiSchleuder {schleuder} MultiSchleuder {schleuder}

View file

@ -63,7 +63,7 @@ postfixadmin_footer_link: 'http://change-this-to-your.domain.tld'
postfixadmin_emailcheck_resolve_domain: yes postfixadmin_emailcheck_resolve_domain: yes
postfixadmin_welcome_text: | postfixadmin_welcome_text: |
Hi, Hi,
Welcome to your new mail account. You can manage your account at Welcome to your new mail account. You can manage your account at
{{ postfixadmin_base_url }}/users/login.php {{ postfixadmin_base_url }}/users/login.php
@ -72,7 +72,6 @@ postfixadmin_welcome_text: |
Regards Regards
{{ postfixadmin_admin_name }} {{ postfixadmin_admin_name }}
postfixadmin_create_mailbox_subdirs_prefix: '' postfixadmin_create_mailbox_subdirs_prefix: ''
postfixadmin_base_url: 'http://localhost/postfixadmin' postfixadmin_base_url: 'http://localhost/postfixadmin'

View file

@ -16,4 +16,4 @@
changed_when: changed_when:
- "'Database is up to date' not in postfixadmin_register_setup_upgrade.content" - "'Database is up to date' not in postfixadmin_register_setup_upgrade.content"
- "' &nbsp; done' in postfixadmin_register_setup_upgrade.content" - "' &nbsp; done' in postfixadmin_register_setup_upgrade.content"
failed_when: '"Something went wrong while trying to apply database updates" in postfixadmin_register_setup_upgrade.content or postfixadmin_register_setup_upgrade.status != 200' failed_when: '"Something went wrong while trying to apply database updates" in postfixadmin_register_setup_upgrade.content or postfixadmin_register_setup_upgrade.status != 200' # noqa yaml[line-length]

View file

@ -22,7 +22,7 @@
src: "https://github.com/postfixadmin/postfixadmin/archive/refs/tags/postfixadmin-{{ postfixadmin_version }}.tar.gz" src: "https://github.com/postfixadmin/postfixadmin/archive/refs/tags/postfixadmin-{{ postfixadmin_version }}.tar.gz"
dest: "{{ postfixadmin_installation_prefix }}/postfixadmin-{{ postfixadmin_version }}" dest: "{{ postfixadmin_installation_prefix }}/postfixadmin-{{ postfixadmin_version }}"
creates: "{{ postfixadmin_installation_prefix }}/postfixadmin-{{ postfixadmin_version }}/config.inc.php" creates: "{{ postfixadmin_installation_prefix }}/postfixadmin-{{ postfixadmin_version }}/config.inc.php"
extra_opts: [ "--strip-components=1" ] extra_opts: ["--strip-components=1"]
owner: root owner: root
group: www-data group: www-data
mode: 0755 mode: 0755

View file

@ -11,4 +11,3 @@ postsrsd_reverse_port: 10002
postsrsd_runas: postsrsd postsrsd_runas: postsrsd
postsrsd_listen_addr: 127.0.0.1 postsrsd_listen_addr: 127.0.0.1
postsrsd_chroot: /var/lib/postsrsd postsrsd_chroot: /var/lib/postsrsd

View file

@ -25,8 +25,6 @@ schleuder_api_tls_key_file: /etc/schleuder/schleuder-private-key.pem
schleuder_valid_api_keys: [] schleuder_valid_api_keys: []
schleuder_cli_users: {} schleuder_cli_users: {}
schleuder_defaults_send_encrypted_only: true schleuder_defaults_send_encrypted_only: true
schleuder_defaults_receive_encrypted_only: false schleuder_defaults_receive_encrypted_only: false
schleuder_defaults_receive_signed_only: false schleuder_defaults_receive_signed_only: false
@ -65,8 +63,6 @@ schleuder_defaults_logfiles_to_keep: 2
schleuder_defaults_language: en schleuder_defaults_language: en
schleuder_defaults_forward_all_incoming_to_admins: false schleuder_defaults_forward_all_incoming_to_admins: false
# This is the last commit before schleuder 3.5 was required # This is the last commit before schleuder 3.5 was required
schleuder_web_install: no schleuder_web_install: no
schleuder_web_commitish: main schleuder_web_commitish: main
@ -83,4 +79,3 @@ schleuder_web_superadmins: [root@localhost]
schleuder_web_lists_on_which_subscribers_may_delete_keys: ["*"] schleuder_web_lists_on_which_subscribers_may_delete_keys: ["*"]
schleuder_web_db_file: /var/lib/schleuder-web/schleuder-web.sqlite3 schleuder_web_db_file: /var/lib/schleuder-web/schleuder-web.sqlite3

View file

@ -8,7 +8,7 @@
ansible.builtin.service: ansible.builtin.service:
name: schleuder-web name: schleuder-web
state: restarted state: restarted
- name: systemctl restart schleuder-api-daemon - name: systemctl restart schleuder-api-daemon
ansible.builtin.service: ansible.builtin.service:
name: schleuder-api-daemon name: schleuder-api-daemon

View file

@ -14,7 +14,7 @@
ansible.builtin.group: ansible.builtin.group:
name: schleuder name: schleuder
system: yes system: yes
- name: create schleuder user - name: create schleuder user
ansible.builtin.user: ansible.builtin.user:
name: schleuder name: schleuder
@ -22,7 +22,7 @@
home: /var/lib/schleuder home: /var/lib/schleuder
system: yes system: yes
shell: /usr/sbin/nologin shell: /usr/sbin/nologin
- name: gather service facts - name: gather service facts
ansible.builtin.service_facts: ansible.builtin.service_facts:
@ -31,7 +31,7 @@
name: schleuder name: schleuder
state: stopped state: stopped
when: "'schleuder.service' in ansible_facts.services" when: "'schleuder.service' in ansible_facts.services"
- name: install schleuder gem - name: install schleuder gem
become: yes become: yes
become_user: schleuder become_user: schleuder

View file

@ -17,7 +17,7 @@
home: /var/lib/schleuder-web home: /var/lib/schleuder-web
system: yes system: yes
shell: /usr/sbin/nologin shell: /usr/sbin/nologin
- name: gather service facts - name: gather service facts
ansible.builtin.service_facts: ansible.builtin.service_facts:
@ -26,14 +26,15 @@
name: schleuder-web name: schleuder-web
state: stopped state: stopped
when: "'schleuder-web.service' in ansible_facts.services" when: "'schleuder-web.service' in ansible_facts.services"
- name: clone schleuder-web git repo - name: clone schleuder-web git repo
become: yes become: yes
become_user: schleuder-web become_user: schleuder-web
ansible.builtin.command: ansible.builtin.command:
cmd: git clone https://0xacab.org/schleuder/schleuder-web /var/lib/schleuder-web/schleuder-web # noqa command-instead-of-module git module would reset working directory # git module would reset working directory
cmd: git clone https://0xacab.org/schleuder/schleuder-web /var/lib/schleuder-web/schleuder-web # noqa command-instead-of-module
creates: /var/lib/schleuder-web/schleuder-web creates: /var/lib/schleuder-web/schleuder-web
- name: fetch schleuder-web upstream - name: fetch schleuder-web upstream
become: yes become: yes
become_user: schleuder-web become_user: schleuder-web

View file

@ -36,4 +36,3 @@
owner: root owner: root
group: root group: root
mode: 0644 mode: 0644