From a5a6a1f0383a9b3c24f00e131eb0f1b8181c7a39 Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Fri, 20 Feb 2026 18:40:59 +0300
Subject: [PATCH] chore(): refactored group vars, added a few handy packages

also borgbackup default retention improvements and docker config
refactoring
---
 group_vars/all/all.yaml        |  4 +-
 group_vars/all/borgbackup.yaml |  6 +--
 group_vars/all/docker.yaml     | 99 ++++++++++++++++++++++++++++++----
 group_vars/all/packages.yaml   |  5 ++
 4 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/group_vars/all/all.yaml b/group_vars/all/all.yaml
index 83d8011..1fa271a 100644
--- a/group_vars/all/all.yaml
+++ b/group_vars/all/all.yaml
@@ -26,8 +26,8 @@ admin_users:
 # Containers management
 containers:
   docker:
-    enabled: true
-    state: latest
+    enabled: false 
+    state: absent
   k3s:
     enabled: false
     state: absent
diff --git a/group_vars/all/borgbackup.yaml b/group_vars/all/borgbackup.yaml
index 9f82d7b..054abe4 100644
--- a/group_vars/all/borgbackup.yaml
+++ b/group_vars/all/borgbackup.yaml
@@ -12,9 +12,9 @@ borg_source_directories:
 borg_ssh_key_type: "ed25519"
 borg_retention_policy:
   keep_hourly: 1
-  keep_daily: 1
-  keep_weekly: 1
-  keep_monthly: 3
+  keep_daily: 3
+  keep_weekly: 7
+  keep_monthly: 1
 
 borgmatic_timer_cron_name: "borgmatic"
 borgmatic_timer: cron
diff --git a/group_vars/all/docker.yaml b/group_vars/all/docker.yaml
index 99c385a..557bbba 100644
--- a/group_vars/all/docker.yaml
+++ b/group_vars/all/docker.yaml
@@ -4,14 +4,95 @@ docker_install_compose_plugin: true
 docker_users:
   - "{{ ansible_user }}"
 docker_daemon_options:
-  storage-driver: "overlay2"
+    debug: false
+    init: false
+    live-restore: true
+    shutdown-timeout: 60
+    default-runtime: "runc"
+    raw-logs: false
 
-  log-driver: "json-file"
-  log-opts:
-    max-size: "50m"
-    max-file: "5"
+    default-cgroupns-mode: "private"
+    containerd-namespace: "docker"
+    containerd-plugins-namespace: "docker-plugins"
 
-  live-restore: false
-  icc: false
-  userland-proxy: false
-  default-address-pools: [{"base": "10.200.0.0/16", "size": 24}]
+    selinux-enabled: false
+    icc: true
+    authorization-plugins: []
+    allow-direct-routing: false
+    no-new-privileges: true
+    # userns-remap: default
+
+    ipv6: true
+    ip-forward: true
+    iptables: true
+    ip6tables: true
+    ip-masq: false
+    userland-proxy: false
+    mtu: 1500
+    default-address-pools:
+      - base: "10.200.0.0/16"
+        size: 24
+    default-network-opts: {}
+
+    dns:
+      - "100.100.100.100"
+      - "1.1.1.1"
+      - "8.8.8.8"
+    dns-search:
+      - "headnet.itqdev.xyz"
+    dns-opts: []
+
+    storage-driver: "overlay2"
+    storage-opts: []
+    default-shm-size: "16M"
+
+    builder:
+      gc:
+        enabled: true
+        defaultReservedSpace: "10GB"
+        policy:
+          - filter:
+              - "type=source.local"
+            maxUsedSpace: "512MB"
+            keepDuration: "48h"
+          - maxUsedSpace: "100GB"
+            keepDuration: "1440h"
+            reservedSpace: "10GB"
+          - all: true
+            reservedSpace: "50GB"
+            maxUsedSpace: "200GB"
+            minFreeSpace: "20GB"
+
+    log-driver: "json-file"
+    log-format: "text"
+    log-level: ""
+    log-opts:
+      labels: "local"
+      env: "os,customer"
+      max-size: "50m"
+      max-file: "5"
+      cache-disabled: "false"
+      cache-max-size: "20m"
+      cache-max-file: "5"
+      cache-compress: "true"
+
+    default-ulimits:
+      nofile:
+        Name: "nofile"
+        Soft: 64000
+        Hard: 64000
+
+    registry-mirrors: []
+    insecure-registries: []
+    max-download-attempts: 5
+    max-concurrent-downloads: 3
+    max-concurrent-uploads: 3
+
+    experimental: false
+    features:
+      cdi: true
+      containerd-snapshotter: false
+
+    labels: []
+
+    exec-opts: []
diff --git a/group_vars/all/packages.yaml b/group_vars/all/packages.yaml
index 1588562..d5f2245 100644
--- a/group_vars/all/packages.yaml
+++ b/group_vars/all/packages.yaml
@@ -26,6 +26,11 @@ system_packages:
     - socat
     - netcat-traditional
     - vmtouch
+    - gdb
+    - gcc
+    - cron
+    - just
+    - bat
   monitoring:
     - htop
     - atop