From 10e1e8187bdd3227fa030c718b11626648dc66f5 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Fri, 22 May 2026 20:52:47 +0300 Subject: [PATCH] Migration: fix vars in playbooks --- docs/drafts/timeweb-migration-log.md | 43 ++++++++++++++++++++++++++++ playbook-authelia.yml | 1 + playbook-calibre.yml | 1 + playbook-docker.yml | 1 + playbook-dozzle.yml | 1 + playbook-eget.yml | 1 + playbook-gitea.yml | 1 + playbook-gramps.yml | 1 + playbook-homepage-registry.yml | 1 + playbook-homepage.yml | 1 + playbook-memos.yml | 1 + playbook-miniflux.yml | 1 + playbook-netdata.yml | 1 + playbook-outline.yml | 1 + playbook-remembos.yml | 1 + playbook-rssbridge.yml | 1 + playbook-transcriber-registry.yml | 1 + playbook-transcriber.yml | 1 + playbook-tuwunel.yml | 1 + playbook-ufw.yml | 1 + playbook-upgrade.yml | 1 + playbook-wakapi.yml | 1 + playbook-wanderer.yml | 1 + 23 files changed, 65 insertions(+) diff --git a/docs/drafts/timeweb-migration-log.md b/docs/drafts/timeweb-migration-log.md index 16336da..1833d7c 100644 --- a/docs/drafts/timeweb-migration-log.md +++ b/docs/drafts/timeweb-migration-log.md @@ -8,6 +8,49 @@ --- +## Шаг 6 — `vars/vars.yml` загружается во всех плейбуках (2026-05-22, выполнено) + +Сегодняшний коммит `8378f0e` («Migration: expose some public vars») +вынес общие переменные (`application_dir`, `host_name`, `primary_user`, +`primary_user_uid`, `primary_user_gid`, `bin_prefix`, +`apprise_external_port`, `apprise_external_url`, `caddy_logs_dir`) из +vault в `vars/vars.yml`. Но большая часть плейбуков загружала только +`vars/secrets.yml` — на текущем сервере они работали лишь потому, что +inventory дублирует `application_dir` как override. На чистом +Timeweb-инвентаре без override они бы упали с undefined. + +Прошёлся по всем плейбукам, добавил `- vars/vars.yml` сразу после +`- vars/secrets.yml`: + +``` +playbook-authelia.yml playbook-netdata.yml +playbook-calibre.yml playbook-outline.yml +playbook-docker.yml playbook-remembos.yml +playbook-dozzle.yml playbook-rssbridge.yml +playbook-eget.yml playbook-transcriber.yml +playbook-gitea.yml playbook-transcriber-registry.yml +playbook-gramps.yml playbook-tuwunel.yml +playbook-homepage.yml playbook-ufw.yml +playbook-homepage-registry.yml playbook-upgrade.yml +playbook-memos.yml playbook-wakapi.yml +playbook-miniflux.yml playbook-wanderer.yml +``` + +(21 файл — все «обычные» плейбуки, которые ещё не подключали vars.yml.) + +Aggregator'ы `playbook-all-applications.yml` и `playbook-all-setup.yml` +не трогал — у них нет собственных `vars_files`, они используют +`import_playbook`, каждый импортируемый плейбук уже сам подключает +`vars.yml`. + +`yamllint` чист. Идемпотентность проверить отдельным прогоном. + +Проверить прогоном `inv pl -- all-applications` (или хотя бы +`inv pl -- gitea outline miniflux`) на текущем сервере — diff +ожидается пустой. + +--- + ## Шаг 5 — переезд default application_dir на /srv (2026-05-22, выполнено) `/mnt` по FHS — место для точек монтирования внешних дисков; на diff --git a/playbook-authelia.yml b/playbook-authelia.yml index 8575a40..1779900 100644 --- a/playbook-authelia.yml +++ b/playbook-authelia.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml - files/authelia/secrets.yml vars: diff --git a/playbook-calibre.yml b/playbook-calibre.yml index 95d8af6..101a5a2 100644 --- a/playbook-calibre.yml +++ b/playbook-calibre.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "calibre" diff --git a/playbook-docker.yml b/playbook-docker.yml index c5a4ec0..8add952 100644 --- a/playbook-docker.yml +++ b/playbook-docker.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml tasks: # - name: "Install python docker lib from pip" diff --git a/playbook-dozzle.yml b/playbook-dozzle.yml index 16c8862..9d3a391 100644 --- a/playbook-dozzle.yml +++ b/playbook-dozzle.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "dozzle" diff --git a/playbook-eget.yml b/playbook-eget.yml index a6ebb5b..d339b65 100644 --- a/playbook-eget.yml +++ b/playbook-eget.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml # See: https://github.com/zyedidia/eget/releases diff --git a/playbook-gitea.yml b/playbook-gitea.yml index 840f2ef..a2c857e 100644 --- a/playbook-gitea.yml +++ b/playbook-gitea.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "gitea" diff --git a/playbook-gramps.yml b/playbook-gramps.yml index 625dbad..79acac6 100644 --- a/playbook-gramps.yml +++ b/playbook-gramps.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "gramps" diff --git a/playbook-homepage-registry.yml b/playbook-homepage-registry.yml index 8e48f58..6131292 100644 --- a/playbook-homepage-registry.yml +++ b/playbook-homepage-registry.yml @@ -5,6 +5,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml - vars/homepage.yml tasks: diff --git a/playbook-homepage.yml b/playbook-homepage.yml index c14c23f..fd5215e 100644 --- a/playbook-homepage.yml +++ b/playbook-homepage.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml - vars/homepage.yml tasks: diff --git a/playbook-memos.yml b/playbook-memos.yml index faa9850..54d5ee8 100644 --- a/playbook-memos.yml +++ b/playbook-memos.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "memos" diff --git a/playbook-miniflux.yml b/playbook-miniflux.yml index a9474ed..2bd1b17 100644 --- a/playbook-miniflux.yml +++ b/playbook-miniflux.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "miniflux" diff --git a/playbook-netdata.yml b/playbook-netdata.yml index b75f027..b560bda 100644 --- a/playbook-netdata.yml +++ b/playbook-netdata.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "netdata" diff --git a/playbook-outline.yml b/playbook-outline.yml index 3238c2f..0de6467 100644 --- a/playbook-outline.yml +++ b/playbook-outline.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "outline" diff --git a/playbook-remembos.yml b/playbook-remembos.yml index ed15373..dad3b87 100644 --- a/playbook-remembos.yml +++ b/playbook-remembos.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "remembos" diff --git a/playbook-rssbridge.yml b/playbook-rssbridge.yml index 50bc943..5c8ece2 100644 --- a/playbook-rssbridge.yml +++ b/playbook-rssbridge.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "rssbridge" diff --git a/playbook-transcriber-registry.yml b/playbook-transcriber-registry.yml index 4e9902f..013585f 100644 --- a/playbook-transcriber-registry.yml +++ b/playbook-transcriber-registry.yml @@ -5,6 +5,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml - vars/transcriber.yml - vars/transcriber.images.yml diff --git a/playbook-transcriber.yml b/playbook-transcriber.yml index 8d3790a..42d4e0d 100644 --- a/playbook-transcriber.yml +++ b/playbook-transcriber.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml - vars/transcriber.yml - vars/transcriber.images.yml diff --git a/playbook-tuwunel.yml b/playbook-tuwunel.yml index 5a39a41..421ac79 100644 --- a/playbook-tuwunel.yml +++ b/playbook-tuwunel.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "tuwunel" diff --git a/playbook-ufw.yml b/playbook-ufw.yml index 3e8773f..fde99ab 100644 --- a/playbook-ufw.yml +++ b/playbook-ufw.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml tasks: - name: "Ensure UFW is installed" diff --git a/playbook-upgrade.yml b/playbook-upgrade.yml index d9935f8..93e7420 100644 --- a/playbook-upgrade.yml +++ b/playbook-upgrade.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml tasks: - name: Perform an upgrade of packages diff --git a/playbook-wakapi.yml b/playbook-wakapi.yml index 6c07755..aac17b0 100644 --- a/playbook-wakapi.yml +++ b/playbook-wakapi.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "wakapi" diff --git a/playbook-wanderer.yml b/playbook-wanderer.yml index d8e3c33..859a710 100644 --- a/playbook-wanderer.yml +++ b/playbook-wanderer.yml @@ -4,6 +4,7 @@ vars_files: - vars/secrets.yml + - vars/vars.yml vars: app_name: "wanderer"