Small config and lint fixes
This commit is contained in:
parent
c0da6037de
commit
00cf26efa7
27 changed files with 80 additions and 70 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ frigate_rtsp_passwd: !vault |
|
||||||
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 |
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
- 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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
---
|
---
|
||||||
server_name: adguardpi
|
server_name: adguardpi
|
||||||
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
|
||||||
3
inventory/host_vars/emosen.yaml
Normal file
3
inventory/host_vars/emosen.yaml
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
server_name: emosen
|
||||||
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
---
|
---
|
||||||
server_name: fifi
|
server_name: fifi
|
||||||
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
---
|
---
|
||||||
server_name: knivi
|
server_name: knivi
|
||||||
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
---
|
---
|
||||||
server_name: reir
|
server_name: reir
|
||||||
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
---
|
---
|
||||||
server_name: trady
|
server_name: trady
|
||||||
|
ansible_python_interpreter: /usr/bin/python3
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue