diff --git a/ansible.cfg b/ansible.cfg index 0e5a962..86b7047 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -18,7 +18,7 @@ gathering = smart fact_caching = memory fact_caching_timeout = 300 -stdout_callback = yaml +result_format = yaml bin_ansible_callbacks = True display_skipped_hosts = False deprecation_warnings = True @@ -27,7 +27,7 @@ command_warnings = False interpreter_python = auto_silent [ssh_connection] -ssh_args = +ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o ServerAliveInterval=30 diff --git a/group_vars/all/all.yaml b/group_vars/all/all.yaml index ae2b089..83d8011 100644 --- a/group_vars/all/all.yaml +++ b/group_vars/all/all.yaml @@ -11,6 +11,10 @@ system_locale: en_US.UTF-8 monitoring_enabled: true monitoring_prometheus_node_exporter: true +# Logs +journal_retention_days: 21 +journal_max_disk_limit: "5%" + # User management admin_users: - name: "{{ ansible_user }}" @@ -19,6 +23,15 @@ admin_users: ssh_keys: "{{ admin_ssh_keys | default([]) }}" state: present +# Containers management +containers: + docker: + enabled: true + state: latest + k3s: + enabled: false + state: absent + # Applications management applications: coolify: diff --git a/group_vars/all/packages.yaml b/group_vars/all/packages.yaml index 7704156..1871805 100644 --- a/group_vars/all/packages.yaml +++ b/group_vars/all/packages.yaml @@ -9,7 +9,6 @@ system_packages: - gnupg - ca-certificates - apt-transport-https - - software-properties-common - iproute2 - net-tools - unzip @@ -18,8 +17,7 @@ system_packages: - bash-completion - tmux - rsync - - python3-docker - - borgbackup + - lm-sensors monitoring: - atop - iotop @@ -28,6 +26,7 @@ system_packages: - sysstat - dstat - smartmontools + - tcpdump security: - fail2ban - nftables diff --git a/group_vars/all/tailscale.yaml b/group_vars/all/tailscale.yaml index 74550e2..449ebbc 100644 --- a/group_vars/all/tailscale.yaml +++ b/group_vars/all/tailscale.yaml @@ -7,7 +7,7 @@ tailscale_tags: >- ['vm'] + ([hostname.split('-')[-1]] if '-' in hostname else []) }} -tailscale_args: "--accept-dns=true --accept-routes=false --netfilter-mode on --shields-up=false --ssh=true --stateful-filtering=false" +tailscale_args: "--accept-dns=true --accept-routes=true --netfilter-mode on --shields-up=false --ssh=true --stateful-filtering=false" tailscale_oauth_ephemeral: false tailscale_oauth_preauthorized: true diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index fdf3962..d8b34f2 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -3,6 +3,10 @@ include_tasks: optimization.yaml tags: optimization +- name: Include cron tasks + include_tasks: cron.yaml + tags: cron + - name: Install essential packages ansible.builtin.apt: name: "{{ system_packages.essential }}"