Merge pull request '🚨 reduce ansible-lint warning count (trivial yaml and jinja warnings)' (#486) from lint into master

Reviewed-on: Netz39_Admin/netz39-infra-ansible#486
Reviewed-by: Stefan Haun <tux@netz39.de>
This commit is contained in:
Stefan Haun 2025-02-20 10:10:01 +01:00
commit 517bf90b7b
13 changed files with 31 additions and 30 deletions

View file

@ -2,6 +2,7 @@
extends: default extends: default
rules: rules:
comments-indentation: disable
line-length: disable line-length: disable
truthy: truthy:
allowed-values: allowed-values:

View file

@ -6,4 +6,4 @@
- name: Ensure nfs-common is installed on k3s VMs - name: Ensure nfs-common is installed on k3s VMs
ansible.builtin.apt: ansible.builtin.apt:
pkg: nfs-common pkg: nfs-common
state: present state: present

View file

@ -22,6 +22,6 @@
ansible.builtin.lineinfile: ansible.builtin.lineinfile:
path: /etc/pve/user.cfg path: /etc/pve/user.cfg
regexp: "^group:Admins:" regexp: "^group:Admins:"
line: "group:Admins:{{ users | map(attribute = 'logname') | join(\"@pam,\") }}@pam::" line: "group:Admins:{{ users | map(attribute='logname') | join(\"@pam,\") }}@pam::"
handlers: handlers:

View file

@ -98,9 +98,9 @@
rule: allow rule: allow
port: '389' port: '389'
proto: tcp proto: tcp
from: "{{ item }}" from: "{{ item }}"
comment: LDAP Docker Access comment: LDAP Docker Access
loop: "{{ docker_ip_ranges }}" loop: "{{ docker_ip_ranges }}"
- name: Allow access to openLDAP from local docker container [2/2] - name: Allow access to openLDAP from local docker container [2/2]
become: true become: true
@ -108,9 +108,9 @@
rule: allow rule: allow
port: '636' port: '636'
proto: tcp proto: tcp
from: "{{ item }}" from: "{{ item }}"
comment: LDAP Docker Access comment: LDAP Docker Access
loop: "{{ docker_ip_ranges }}" loop: "{{ docker_ip_ranges }}"
- name: Ensure container for entities validation service is running - name: Ensure container for entities validation service is running

View file

@ -141,7 +141,7 @@
mode: "0644" mode: "0644"
register: wiringPi_copy register: wiringPi_copy
- name: Install wiringPi library # noqa 503 - name: Install wiringPi library # noqa: no-handler
ansible.builtin.apt: ansible.builtin.apt:
state: present state: present
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb" deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"

View file

@ -22,13 +22,13 @@
# These fixed ports are needed. # These fixed ports are needed.
# https://help.ui.com/hc/en-us/articles/218506997-UniFi-Ports-Used # https://help.ui.com/hc/en-us/articles/218506997-UniFi-Ports-Used
ports: ports:
- "8080:8080/tcp" # Device command/control - "8080:8080/tcp" # Device command/control
- "8443:8443/tcp" # Web interface + API - "8443:8443/tcp" # Web interface + API
- "8843:8843/tcp" # HTTPS portal - "8843:8843/tcp" # HTTPS portal
- "8880:8880/tcp" # HTTP portal - "8880:8880/tcp" # HTTP portal
- "3478:3478/udp" # STUN service - "3478:3478/udp" # STUN service
- "6789:6789/tcp" # Speed Test (unifi5 only) - "6789:6789/tcp" # Speed Test (unifi5 only)
- "10001:10001/udp" # Used for device discovery. - "10001:10001/udp" # Used for device discovery.
volumes: volumes:
- "{{ data_dir }}/unifi-controller/data:/unifi/data" - "{{ data_dir }}/unifi-controller/data:/unifi/data"
- "{{ data_dir }}/unifi-controller/log:/unifi/log" - "{{ data_dir }}/unifi-controller/log:/unifi/log"

View file

@ -94,7 +94,7 @@
force: no force: no
register: wiringPi_download register: wiringPi_download
- name: Install wiringPi library # noqa 503 - name: Install wiringPi library # noqa: no-handler
ansible.builtin.apt: ansible.builtin.apt:
state: present state: present
deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb" deb: "/home/{{ gatekeeper_user }}/wiringpi-latest.deb"
@ -140,13 +140,13 @@
detach: yes detach: yes
restart_policy: unless-stopped restart_policy: unless-stopped
ports: ports:
- "0.0.0.0:{{ spaceapi_host_port }}:8080" # Must be reached by pottwal - "0.0.0.0:{{ spaceapi_host_port }}:8080" # Must be reached by pottwal
# - "127.0.0.1:{{ spaceapi_host_port }}:8080" # - "127.0.0.1:{{ spaceapi_host_port }}:8080"
env: env:
TZ: "{{ timezone }}" TZ: "{{ timezone }}"
MQTT_BROKER: "platon.n39.eu" MQTT_BROKER: "platon.n39.eu"
MQTT_TOPIC_STATUS: "{{ spaceapi_topic_status }}" MQTT_TOPIC_STATUS: "{{ spaceapi_topic_status }}"
MQTT_TOPIC_LASTCHANGE: "{{ spaceapi_topic_lastchange }}" MQTT_TOPIC_LASTCHANGE: "{{ spaceapi_topic_lastchange }}"
tags: tags:
- spaceapi - spaceapi

View file

@ -11,4 +11,3 @@ kiosk_grafana_user: "{{ vault_kiosk_grafana_user }}"
kiosk_grafana_pass: "{{ vault_kiosk_grafana_pass }}" kiosk_grafana_pass: "{{ vault_kiosk_grafana_pass }}"
kiosk_mqtt_host: "mqtt.n39.eu" kiosk_mqtt_host: "mqtt.n39.eu"
kiosk_mqtt_topic: "Netz39/Things/HackingDashboard/Screenshot" kiosk_mqtt_topic: "Netz39/Things/HackingDashboard/Screenshot"

View file

@ -1,3 +1,4 @@
---
server_admin: "admin+wittgenstein@netz39.de" server_admin: "admin+wittgenstein@netz39.de"
mac: "b8:27:eb:48:f1:59" mac: "b8:27:eb:48:f1:59"
ansible_python_interpreter: /usr/bin/python3 ansible_python_interpreter: /usr/bin/python3

View file

@ -35,7 +35,7 @@
env: env:
TZ: "{{ timezone }}" TZ: "{{ timezone }}"
AMQP_HOST: "{{ cleanuri_amqp_host }}" AMQP_HOST: "{{ cleanuri_amqp_host }}"
AMQP_USER: "{{ cleanuri_amqp_user }}" AMQP_USER: "{{ cleanuri_amqp_user }}"
AMQP_PASS: "{{ cleanuri_amqp_pass }}" AMQP_PASS: "{{ cleanuri_amqp_pass }}"
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}" AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
GATEWAY_RESULT_QUEUE: "{{ cleanuri_amqp_results }}" GATEWAY_RESULT_QUEUE: "{{ cleanuri_amqp_results }}"
@ -52,7 +52,7 @@
env: env:
TZ: "{{ timezone }}" TZ: "{{ timezone }}"
AMQP_HOST: "{{ cleanuri_amqp_host }}" AMQP_HOST: "{{ cleanuri_amqp_host }}"
AMQP_USER: "{{ cleanuri_amqp_user }}" AMQP_USER: "{{ cleanuri_amqp_user }}"
AMQP_PASS: "{{ cleanuri_amqp_pass }}" AMQP_PASS: "{{ cleanuri_amqp_pass }}"
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}" AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
CANONIZER_TASK_QUEUE: "{{ cleanuri_amqp_canonizer }}" CANONIZER_TASK_QUEUE: "{{ cleanuri_amqp_canonizer }}"
@ -69,7 +69,7 @@
env: env:
TZ: "{{ timezone }}" TZ: "{{ timezone }}"
AMQP_HOST: "{{ cleanuri_amqp_host }}" AMQP_HOST: "{{ cleanuri_amqp_host }}"
AMQP_USER: "{{ cleanuri_amqp_user }}" AMQP_USER: "{{ cleanuri_amqp_user }}"
AMQP_PASS: "{{ cleanuri_amqp_pass }}" AMQP_PASS: "{{ cleanuri_amqp_pass }}"
AMQP_VHOST: "{{ cleanuri_amqp_vhost }}" AMQP_VHOST: "{{ cleanuri_amqp_vhost }}"
EXTRACTION_TASK_QUEUE: "{{ cleanuri_amqp_retrieval }}" EXTRACTION_TASK_QUEUE: "{{ cleanuri_amqp_retrieval }}"

View file

@ -34,7 +34,7 @@
dest: /etc/apt/sources.list.d/docker.list dest: /etc/apt/sources.list.d/docker.list
register: apt_repo register: apt_repo
- name: Update package cache # noqa 503 - name: Update package cache # noqa: no-handler
ansible.builtin.apt: ansible.builtin.apt:
update_cache: true update_cache: true
when: apt_repo.changed when: apt_repo.changed

View file

@ -3,9 +3,9 @@
ansible.builtin.apt: ansible.builtin.apt:
state: present state: present
name: name:
- nfs-kernel-server - nfs-kernel-server
- nfs-common - nfs-common
- parted - parted
- name: Create a new ext4 primary partition - name: Create a new ext4 primary partition
community.general.parted: community.general.parted:

View file

@ -8,9 +8,9 @@
ansible.builtin.apt: ansible.builtin.apt:
state: present state: present
name: name:
- apt-transport-https - apt-transport-https
- ca-certificates - ca-certificates
- gnupg2 - gnupg2
### Setup APT cache for the nginx repository ### Setup APT cache for the nginx repository
# #
@ -33,7 +33,7 @@
src: files/apt-preference-99nginx src: files/apt-preference-99nginx
dest: /etc/apt/preferences.d/99nginx dest: /etc/apt/preferences.d/99nginx
- name: Update package cache # noqa 503 - name: Update package cache # noqa: no-handler
ansible.builtin.apt: ansible.builtin.apt:
update_cache: true update_cache: true
when: apt_repo.changed when: apt_repo.changed
@ -45,7 +45,7 @@
state: present state: present
name: name:
# This version of nginx comes with the ngx_stream_core_module module # This version of nginx comes with the ngx_stream_core_module module
- nginx - nginx
### Configuration ### Configuration