Small config and lint fixes

This commit is contained in:
Annika Merris 2026-03-08 21:27:19 +00:00
parent c0da6037de
commit 00cf26efa7
27 changed files with 80 additions and 70 deletions

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -35,6 +35,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -40,6 +40,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -84,6 +84,6 @@
- "whisparr" - "whisparr"
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -43,6 +43,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -44,6 +44,6 @@
recreate: always recreate: always
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -67,7 +67,7 @@ termix.local.cobb.lgbt {
reverse_proxy 10.69.2.52:8082 reverse_proxy 10.69.2.52:8082
} }
frigate.local.cobb.lgbt { frigate.local.cobb.lgbt {
reverse_proxy 10.69.10.13:8971 { reverse_proxy 10.69.12.11:8971 {
transport http { transport http {
tls_insecure_skip_verify tls_insecure_skip_verify
} }

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -41,6 +41,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -43,7 +43,7 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true
# code: language=ansible # code: language=ansible

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -42,7 +42,7 @@
# ansible.builtin.import_tasks: general/software.yaml # ansible.builtin.import_tasks: general/software.yaml
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true
# code: language=ansible # code: language=ansible

View file

@ -25,6 +25,7 @@
ansible.builtin.user: ansible.builtin.user:
name: "{{ user_name }}" name: "{{ user_name }}"
password: "{{ common_user_password | string | password_hash('sha512') }}" password: "{{ common_user_password | string | password_hash('sha512') }}"
update_password: on_create
when: common_user_exists.state is undefined or common_user_exists.state != 'present' when: common_user_exists.state is undefined or common_user_exists.state != 'present'
- name: Adjust shell for Debian hosts - name: Adjust shell for Debian hosts
tags: settings,users,debian tags: settings,users,debian
@ -65,21 +66,19 @@
with_fileglob: with_fileglob:
- "users/{{ user_name }}/*.pub" - "users/{{ user_name }}/*.pub"
- name: Check if docker group exists - name: Check if docker group exists
ansible.builtin.group: ansible.builtin.getent:
name: "docker" database: group
check_mode: true
register: common_docker_group_exists register: common_docker_group_exists
- name: If docker group exists, add {{ user_name }} - name: If docker group exists, add {{ user_name }}
ansible.builtin.user: ansible.builtin.user:
name: "{{ user_name }}" name: "{{ user_name }}"
append: true append: true
groups: docker groups: docker
when: common_docker_group_exists is defined and common_docker_group_exists.state == 'present' when: (['docker'] | intersect(common_docker_group_exists['ansible_facts']['getent_group'] | list)) | length > 0
- name: Add user to lxc_share - name: Add user to lxc_share
ansible.builtin.user: ansible.builtin.user:
name: "{{ user_name }}" name: "{{ user_name }}"
append: true append: true
groups: lxc_shares groups: lxc_shares
when: inventory_hostname == 'nemetona' when: inventory_hostname == 'nemetona'
# code: language=ansible # code: language=ansible

View file

@ -1,6 +1,6 @@
--- ---
- name: Fetch distro-specific variables - name: Fetch distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -17,7 +17,7 @@
when: ansible_facts["distribution"] == 'Alpine' when: ansible_facts["distribution"] == 'Alpine'
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true
# code: language=ansible # code: language=ansible

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -41,6 +41,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,35 +1,35 @@
--- ---
frigate_rtsp_passwd: !vault | frigate_rtsp_passwd: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
32303838626238633166343130626263383237356566363830656432373637626237366162396131 32303838626238633166343130626263383237356566363830656432373637626237366162396131
3439633565626161303538353462636363323961656462300a323338383533386136376638376230 3439633565626161303538353462636363323961656462300a323338383533386136376638376230
31363135633230333637366438346331656632353565323837356330363934656232333063646264 31363135633230333637366438346331656632353565323837356330363934656232333063646264
3561646234623133330a323731336437383438633630393065343363306636343634663162656539 3561646234623133330a323731336437383438633630393065343363306636343634663162656539
3162 3162
frigate_image_tag: 0.16.4 frigate_image_tag: 0.17.0
frigate_reolink_ip: 10.69.12.20 frigate_reolink_ip: 10.69.12.20
frigate_reolink_username: frigate frigate_reolink_username: frigate
frigate_reolink_password_url_enc: !vault | frigate_reolink_password_url_enc: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
31633133663532656633373437663437356132326362356465356164323636323133343366373630 31633133663532656633373437663437356132326362356465356164323636323133343366373630
3935373839346332613063396332646662396530633062370a393335643564393132373066346662 3935373839346332613063396332646662396530633062370a393335643564393132373066346662
62393062366539346534633537326330393064323963663439343465623433613932613564643763 62393062366539346534633537326330393064323963663439343465623433613932613564643763
3439313635643061610a336262636638373937356466313634363637336334333564626664386138 3439313635643061610a336262636638373937356466313634363637336334333564626664386138
63633830396161393234343962326438393362366335336333616362616661333331343961643030 63633830396161393234343962326438393362366335336333616362616661333331343961643030
3433666330366433333033653265613930646535636433333939 3433666330366433333033653265613930646535636433333939
frigate_reolink_password: !vault | frigate_reolink_password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
32366339623732363766316561336262626233396161366631663238653335336433616432633265 32366339623732363766316561336262626233396161366631663238653335336433616432633265
6431636661316131356461313562663833643434383034380a666663383564326539353834363531 6431636661316131356461313562663833643434383034380a666663383564326539353834363531
35376261663933626663376139373262663866633164666234646662346365373936663536316161 35376261663933626663376139373262663866633164666234646662346365373936663536316161
3364383165646461350a656366633363366230613430353662393934336132306464663631623865 3364383165646461350a656366633363366230613430353662393934336132306464663631623865
33343734653131653230373330613731383363306434383865633536313564363166 33343734653131653230373330613731383363306434383865633536313564363166
frigate_mqtt_ip: 10.69.2.13 frigate_mqtt_ip: 10.69.2.13
frigate_mqtt_username: adhdgirl frigate_mqtt_username: adhdgirl
frigate_mqtt_password: !vault | frigate_mqtt_password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
30306563313434653464633363316636313435386536343362656135343832636262633736343961 30306563313434653464633363316636313435386536343362656135343832636262633736343961
3863356661616263653337346563363238656363373332650a386234666430626462666463366331 3863356661616263653337346563363238656363373332650a386234666430626462666463366331
32666132366264633830333036303766393564366635313865343635363631336164396133393139 32666132366264633830333036303766393564366635313865343635363631336164396133393139
3839646237353961390a386431363630653666356139663739633864613366363138653233393835 3839646237353961390a386431363630653666356139663739633864613366363138653233393835
3634 3634

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -41,6 +41,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -50,6 +50,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -34,12 +34,12 @@
- name: Ensure administrative user has proper permissions - name: Ensure administrative user has proper permissions
community.general.postgresql_membership: community.general.postgresql_membership:
group: pg_read_all_data group: pg_read_all_data
target_role: {{ postgresql_root_user }} target_role: { { postgresql_root_user } }
state: present state: present
- name: Allow hosts on internal network to access the database - name: Allow hosts on internal network to access the database
community.general.postgresql_set: community.general.postgresql_set:
name: listen_address name: listen_address
value: '10.69.0.0/16' value: "10.69.0.0/16"
notify: Restart Postgres notify: Restart Postgres
- name: Allow hosts on internal network to access the database - name: Allow hosts on internal network to access the database
community.general.postgresql_pg_hba: community.general.postgresql_pg_hba:
@ -71,6 +71,6 @@
role: "{{ item.owner }}" role: "{{ item.owner }}"
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -43,6 +43,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -36,6 +36,6 @@
mode: "0600" mode: "0600"
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -33,6 +33,6 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true

View file

@ -1,6 +1,6 @@
--- ---
- name: Load distro-specific variables - name: Load distro-specific variables
ansible.builtin.include_vars: '{{ item }}' ansible.builtin.include_vars: "{{ item }}"
tags: always tags: always
with_first_found: with_first_found:
- files: - files:
@ -43,7 +43,7 @@
pull: policy pull: policy
rescue: rescue:
- name: Set that this task failed - name: Set that this task failed # noqa: var-naming[no-role-prefix]
ansible.builtin.set_fact: ansible.builtin.set_fact:
task_failed: true task_failed: true
# code: language=ansible # code: language=ansible

View file

@ -1,2 +1,3 @@
--- ---
server_name: adguardpi server_name: adguardpi
ansible_python_interpreter: /usr/bin/python3

View file

@ -0,0 +1,3 @@
---
server_name: emosen
ansible_python_interpreter: /usr/bin/python3

View file

@ -1,2 +1,3 @@
--- ---
server_name: fifi server_name: fifi
ansible_python_interpreter: /usr/bin/python3

View file

@ -1,2 +1,3 @@
--- ---
server_name: knivi server_name: knivi
ansible_python_interpreter: /usr/bin/python3

View file

@ -1,2 +1,3 @@
--- ---
server_name: reir server_name: reir
ansible_python_interpreter: /usr/bin/python3

View file

@ -1,3 +1,3 @@
--- ---
server_name: trady server_name: trady
ansible_python_interpreter: /usr/bin/python3

View file

@ -24,7 +24,9 @@ all:
ida: ida:
ansible_host: 10.69.2.53 ansible_host: 10.69.2.53
curren: curren:
ansible_host: 10.69.10.13 ansible_host: 10.69.12.11
emosen:
ansible_host: 10.69.10.20
children: children:
alpine: alpine:
hosts: hosts:
@ -32,6 +34,7 @@ all:
stephanie: stephanie:
nemetona: nemetona:
ida: ida:
emosen:
debian: debian:
hosts: hosts:
adguardpi: adguardpi:
@ -51,6 +54,7 @@ all:
stephanie: stephanie:
nemetona: nemetona:
curren: curren:
ida:
unifi_controller: unifi_controller:
hosts: hosts:
# pump: # pump: