feat: various fixes

This commit is contained in:
Simon Cornet 2025-07-11 19:25:53 +02:00
commit 89eaee1139
27 changed files with 47 additions and 74 deletions

View file

@ -2,7 +2,7 @@
# apt config # apt config
- name: "apt config" - name: "apt config"
tags: ["apt"] tags: "apt"
block: block:
# configure apt auto update # configure apt auto update

View file

@ -2,7 +2,7 @@
# apt packages # apt packages
- name: "apt packages" - name: "apt packages"
tags: ["apt"] tags: "apt"
block: block:
# install packages # install packages

View file

@ -2,7 +2,7 @@
# manage apt sources # manage apt sources
- name: "manage apt sources" - name: "manage apt sources"
tags: ["apt"] tags: "apt"
block: block:
# configure apt sources # configure apt sources
@ -13,10 +13,10 @@
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
notify: "apt force cache update"
when: when:
- 'ansible_os_family == "Debian"' - 'ansible_os_family == "Debian"'
- 'ansible_distribution_major_version <= "23"' - 'ansible_distribution_major_version <= "23"'
notify: "apt force cache update"
# configure apt sources - proxmox list # configure apt sources - proxmox list
- name: "apt - config - configure apt sources - proxmox list" - name: "apt - config - configure apt sources - proxmox list"
@ -26,10 +26,10 @@
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
notify: "apt force cache update"
when: when:
- 'ansible_os_family == "Debian"' - 'ansible_os_family == "Debian"'
- "inventory_hostname in groups['proxmox']" - "inventory_hostname in groups['proxmox']"
notify: "apt force cache update"
# configure apt sources # configure apt sources
- name: "apt - config - configure apt sources" - name: "apt - config - configure apt sources"
@ -39,10 +39,10 @@
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
notify: "apt force cache update"
when: when:
- 'ansible_distribution == "Ubuntu"' - 'ansible_distribution == "Ubuntu"'
- 'ansible_distribution_major_version >= "24"' - 'ansible_distribution_major_version >= "24"'
notify: "apt force cache update"
# delete unused sources.list # delete unused sources.list
- name: "apt - config - remove old sources.list" - name: "apt - config - remove old sources.list"

View file

@ -9,5 +9,4 @@
group: "root" group: "root"
mode: "0644" mode: "0644"
when: 'type == "lxc"' when: 'type == "lxc"'
tags: tags: "cron"
- "cron"

View file

@ -9,5 +9,4 @@
group: "root" group: "root"
mode: "0644" mode: "0644"
when: 'ansible_distribution == "Ubuntu"' when: 'ansible_distribution == "Ubuntu"'
tags: tags: "environment-file"
- "environment-file"

View file

@ -7,5 +7,4 @@
direction: "incoming" direction: "incoming"
policy: "deny" policy: "deny"
logging: "on" logging: "on"
tags: tags: "firewall"
- "firewall"

View file

@ -2,7 +2,7 @@
# basic firewall rules # basic firewall rules
- name: "basic firewall rules" - name: "basic firewall rules"
tags: ["firewall"] tags: "firewall"
block: block:
# basic firewall rules # basic firewall rules

View file

@ -8,5 +8,4 @@
proto: "{{ __rule['proto'] | default('tcp') }}" proto: "{{ __rule['proto'] | default('tcp') }}"
from_ip: "{{ __rule['from_ip'] }}" from_ip: "{{ __rule['from_ip'] }}"
to_port: "{{ __rule['to_port'] }}" to_port: "{{ __rule['to_port'] }}"
tags: tags: "firewall"
- "firewall"

View file

@ -5,8 +5,7 @@
ansible.builtin.hostname: ansible.builtin.hostname:
name: "{{ set_hostname | default(inventory_hostname_short) }}" name: "{{ set_hostname | default(inventory_hostname_short) }}"
use: "{{ hostname_use_method }}" use: "{{ hostname_use_method }}"
tags: tags: "hostname"
- "hostname"
# manage /etc/hosts file # manage /etc/hosts file
- name: "manage /etc/hosts file for hostname" - name: "manage /etc/hosts file for hostname"

View file

@ -10,5 +10,4 @@
mode: "0644" mode: "0644"
when: 'ansible_distribution == "Ubuntu"' when: 'ansible_distribution == "Ubuntu"'
notify: "restart journald" notify: "restart journald"
tags: tags: "journald"
- "journald"

View file

@ -8,5 +8,4 @@
cache_valid_time: "3600" cache_valid_time: "3600"
when: 'ansible_os_family == "Debian"' when: 'ansible_os_family == "Debian"'
notify: "restart lldpd" notify: "restart lldpd"
tags: tags: "lldp"
- "lldp"

View file

@ -5,5 +5,4 @@
community.general.locale_gen: community.general.locale_gen:
name: "en_US.UTF-8" name: "en_US.UTF-8"
state: "present" state: "present"
tags: tags: "locale"
- "locale"

View file

@ -7,5 +7,4 @@
state: "absent" state: "absent"
purge: true purge: true
when: 'ansible_os_family == "Debian"' when: 'ansible_os_family == "Debian"'
tags: tags: "lxd"
- "lxd"

View file

@ -10,42 +10,28 @@
ansible.builtin.import_tasks: "hostname.yaml" ansible.builtin.import_tasks: "hostname.yaml"
tags: "hostname" tags: "hostname"
# flush handler
- name: "flush handlers"
ansible.builtin.meta: "flush_handlers"
# set locale # set locale
- name: "set locale" - name: "set locale"
ansible.builtin.import_tasks: "locale.yaml" ansible.builtin.import_tasks: "locale.yaml"
tags: "locale" tags: "locale"
# flush handler
- name: "flush handlers"
ansible.builtin.meta: "flush_handlers"
# environment # environment
- name: "environment" - name: "environment"
ansible.builtin.import_tasks: "environment.yaml" ansible.builtin.import_tasks: "environment.yaml"
tags: "environment-file" tags: "environment-file"
# flush handler
- name: "flush handlers"
ansible.builtin.meta: "flush_handlers"
# motd # motd
- name: "motd" - name: "motd"
ansible.builtin.import_tasks: "motd.yaml" ansible.builtin.import_tasks: "motd.yaml"
when: "ansible_os_family == 'Debian'"
tags: "motd" tags: "motd"
# cron jobs # cron jobs
- name: "cron jobs" - name: "cron jobs"
ansible.builtin.import_tasks: "cron.yaml" ansible.builtin.import_tasks: "cron.yaml"
when: "ansible_os_family == 'Debian'"
tags: "cron" tags: "cron"
# flush handler
- name: "flush handlers"
ansible.builtin.meta: "flush_handlers"
# swap # swap
- name: "swap" - name: "swap"
ansible.builtin.import_tasks: "swap.yaml" ansible.builtin.import_tasks: "swap.yaml"
@ -55,6 +41,7 @@
# apt # apt
- name: "apt" - name: "apt"
ansible.builtin.import_tasks: "apt/sources.yaml" ansible.builtin.import_tasks: "apt/sources.yaml"
when: "ansible_os_family == 'Debian'"
tags: "apt" tags: "apt"
# flush handler # flush handler
@ -63,14 +50,17 @@
- name: "apt - packages" - name: "apt - packages"
ansible.builtin.import_tasks: "apt/packages.yaml" ansible.builtin.import_tasks: "apt/packages.yaml"
when: "ansible_os_family == 'Debian'"
tags: "apt" tags: "apt"
- name: "apt - config" - name: "apt - config"
ansible.builtin.import_tasks: "apt/config.yaml" ansible.builtin.import_tasks: "apt/config.yaml"
when: "ansible_os_family == 'Debian'"
tags: "apt" tags: "apt"
- name: "apt - cleanup" - name: "apt - cleanup"
ansible.builtin.import_tasks: "apt/cleanup.yaml" ansible.builtin.import_tasks: "apt/cleanup.yaml"
when: "ansible_os_family == 'Debian'"
tags: "apt-cleanup" tags: "apt-cleanup"
# telemetry # telemetry
@ -189,9 +179,6 @@
# user # user
- name: "user - create users" - name: "user - create users"
ansible.builtin.include_tasks: "user.yaml" ansible.builtin.include_tasks: "user.yaml"
loop: "{{ user }}"
loop_control:
loop_var: "__user"
tags: "usermanagement" tags: "usermanagement"
# firewall # firewall

View file

@ -1,7 +1,7 @@
--- ---
- name: "manage motd" - name: "manage motd"
tags: ["motd"] tags: "motd"
block: block:
# find old motd files # find old motd files

View file

@ -1,7 +1,7 @@
--- ---
- name: "manage ntp" - name: "manage ntp"
tags: ["ntp"] tags: "ntp"
block: block:
# install chrony # install chrony

View file

@ -2,7 +2,7 @@
# manage snapd # manage snapd
- name: "manage snapd" - name: "manage snapd"
tags: ["snap"] tags: "snap"
block: block:
# set defaults # set defaults
- name: "set facts" - name: "set facts"

View file

@ -9,5 +9,4 @@
loop: "{{ snap_package }}" loop: "{{ snap_package }}"
loop_control: loop_control:
loop_var: "__snap_package" loop_var: "__snap_package"
tags: tags: "snap"
- "snap"

View file

@ -9,5 +9,4 @@
group: "root" group: "root"
mode: "0644" mode: "0644"
notify: "restart ssh" notify: "restart ssh"
tags: tags: "sshd"
- "sshd"

View file

@ -2,7 +2,7 @@
# manage swap # manage swap
- name: "manage swap" - name: "manage swap"
tags: ["swap"] tags: "swap"
block: block:
# enable or disable swap # enable or disable swap

View file

@ -6,5 +6,4 @@
name: "{{ __sysctl['name'] }}" name: "{{ __sysctl['name'] }}"
value: "{{ __sysctl['value'] }}" value: "{{ __sysctl['value'] }}"
sysctl_set: "yes" sysctl_set: "yes"
tags: tags: "sysctl"
- "sysctl"

View file

@ -2,7 +2,7 @@
# manage syslog # manage syslog
- name: "manage syslog" - name: "manage syslog"
tags: ["syslog"] tags: "syslog"
block: block:
# configure rsyslogd - debian # configure rsyslogd - debian

View file

@ -7,5 +7,4 @@
state: "present" state: "present"
cache_valid_time: "3600" cache_valid_time: "3600"
when: 'ansible_os_family == "Debian"' when: 'ansible_os_family == "Debian"'
tags: tags: "syslog"
- "syslog"

View file

@ -10,5 +10,4 @@
mode: "0644" mode: "0644"
when: 'ansible_os_family == "Debian"' when: 'ansible_os_family == "Debian"'
notify: "daemon-reload fstrim.timer" notify: "daemon-reload fstrim.timer"
tags: tags: "systemctl"
- "systemctl"

View file

@ -6,5 +6,4 @@
path: "/etc/cron.daily/popularity-contest" path: "/etc/cron.daily/popularity-contest"
state: "absent" state: "absent"
when: 'ansible_distribution == "Ubuntu"' when: 'ansible_distribution == "Ubuntu"'
tags: tags: "telemetry"
- "telemetry"

View file

@ -4,5 +4,4 @@
- name: "timezone - set {{ timezone }}" - name: "timezone - set {{ timezone }}"
community.general.timezone: community.general.timezone:
name: "{{ timezone }}" name: "{{ timezone }}"
tags: tags: "timezone"
- "timezone"

View file

@ -2,7 +2,11 @@
# manage users # manage users
- name: "manage users" - name: "manage users"
tags: ["usermanagement"] tags: "usermanagement"
loop: "{{ user }}"
loop_control:
loop_var: "__user"
block: block:
# manage facts # manage facts
@ -13,7 +17,7 @@
sudo_pwless: "{{ __user['sudo_passwordless'] | default('False') }}" sudo_pwless: "{{ __user['sudo_passwordless'] | default('False') }}"
user_state: "{{ __user['state'] | default('present') }}" user_state: "{{ __user['state'] | default('present') }}"
# create users # create user with password
- name: "user - create users with password - {{ __user['username'] }}" - name: "user - create users with password - {{ __user['username'] }}"
ansible.builtin.user: ansible.builtin.user:
name: "{{ __user['username'] }}" name: "{{ __user['username'] }}"
@ -25,12 +29,13 @@
- "__user['password'] is defined" - "__user['password'] is defined"
- "user_state == 'present'" - "user_state == 'present'"
- name: "user - create users withouth password - {{ __user['username'] }}" # create user without password
- name: "user - create users without password - {{ __user['username'] }}"
ansible.builtin.user: ansible.builtin.user:
name: "{{ __user['username'] }}" name: "{{ __user['username'] }}"
comment: "{{ __user['name'] }}" comment: "{{ __user['name'] }}"
shell: "{{ __user['shell'] | default('/bin/bash') }}" shell: "{{ __user['shell'] | default('/bin/bash') }}"
state: "state" state: "{{ user_state }}"
when: when:
- "__user['password'] is not defined" - "__user['password'] is not defined"
- "user_state == 'present'" - "user_state == 'present'"
@ -42,8 +47,7 @@
key: "{{ __user['publickey'] }}" key: "{{ __user['publickey'] }}"
state: "present" state: "present"
manage_dir: "true" manage_dir: "true"
when: when: "__user['publickey'] is defined"
- "__user['publickey'] is defined"
# delete users # delete users
- name: "user - delete users - {{ __user['username'] }}" - name: "user - delete users - {{ __user['username'] }}"
@ -61,12 +65,10 @@
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0644" mode: "0644"
when: when: "sudo_file"
- "sudo_file"
- name: "user - delete sudoers file - {{ __user['username'] }}" - name: "user - delete sudoers file - {{ __user['username'] }}"
ansible.builtin.file: ansible.builtin.file:
state: "absent" state: "absent"
path: "/etc/sudoers.d/{{ __user['username'] }}" path: "/etc/sudoers.d/{{ __user['username'] }}"
when: when: "not sudo_file"
- "not sudo_file"