Rename all j2 files to templates

Not according to convention, but it reads better.
This commit is contained in:
2026-05-01 10:01:26 +03:00
parent 6edb72077a
commit 8efab2002f
24 changed files with 28 additions and 28 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ Ansible-проект для автоматизации личного серве
- `vars/*.yml` — переменные приложений и образов, `vars/secrets.yml` — зашифрованные секреты (vault). - `vars/*.yml` — переменные приложений и образов, `vars/secrets.yml` — зашифрованные секреты (vault).
- `roles/` — кастомные роли (`eget`, `owner`, `secrets`), галактические роли в `galaxy.roles/`. - `roles/` — кастомные роли (`eget`, `owner`, `secrets`), галактические роли в `galaxy.roles/`.
- `files/<app>/` — docker-compose шаблоны, конфиги, скрипты бэкапов для каждого сервиса. - `files/<app>/` — docker-compose шаблоны, конфиги, скрипты бэкапов для каждого сервиса.
- `templates/` — общие шаблоны (например `env.j2`). - `templates/` — общие шаблоны (например `env.template`).
- `scripts/` — вспомогательные Python-скрипты (SMTP-утилиты для Yandex Cloud Postbox). - `scripts/` — вспомогательные Python-скрипты (SMTP-утилиты для Yandex Cloud Postbox).
- `.gitea/workflows/lint.yml` — CI: yamllint + ansible-lint. - `.gitea/workflows/lint.yml` — CI: yamllint + ansible-lint.
- `lefthook.yml` — pre-commit хуки (ruff, mypy, yamllint, ansible-lint, gitleaks, проверка vault). - `lefthook.yml` — pre-commit хуки (ruff, mypy, yamllint, ansible-lint, gitleaks, проверка vault).
@@ -93,7 +93,7 @@ uv run ansible-galaxy install --role-file requirements.yml
## Шаблоны и переменные ## Шаблоны и переменные
- Суффиксы шаблонов: `.template.yml`, `.yml.j2`, `.template.sh` — рендерятся Ansible модулем `template`. - Суффиксы шаблонов: `.template.yml`, `.template.sh`, `.template.cfg`, `.template.conf`, `.template.toml`, `.template` (для файлов без естественного расширения) — рендерятся Ansible модулем `template`. Расширение оригинального формата сохраняется после `.template.` ради подсветки синтаксиса в редакторе.
- Большинство приложений определяют переменные inline в плейбуке. Отдельные файлы переменных только у homepage и transcriber (`vars/homepage.yml`, `vars/transcriber.yml` + `*.images.yml`). - Большинство приложений определяют переменные inline в плейбуке. Отдельные файлы переменных только у homepage и transcriber (`vars/homepage.yml`, `vars/transcriber.yml` + `*.images.yml`).
- Общие переменные из `vars/secrets.yml`: `application_dir`, `bin_prefix`, `primary_user` и др. - Общие переменные из `vars/secrets.yml`: `application_dir`, `bin_prefix`, `primary_user` и др.
- Каждое приложение: `app_name`, `app_user`, `app_owner_uid`, `app_owner_gid`, `base_dir`, `data_dir`. - Каждое приложение: `app_name`, `app_user`, `app_owner_uid`, `app_owner_gid`, `base_dir`, `data_dir`.
@@ -1,20 +1,20 @@
services: services:
{{ service_name }}: caddyproxy:
image: caddy:2.11.2 image: caddy:2.11.2
restart: unless-stopped restart: unless-stopped
container_name: {{ service_name }} container_name: "caddyproxy"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "443:443/udp" - "443:443/udp"
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
volumes: volumes:
- {{ caddy_file_dir }}:/etc/caddy - "{{ caddy_file_dir }}:/etc/caddy"
- {{ data_dir }}:/data - "{{ data_dir }}:/data"
- {{ config_dir }}:/config - "{{ config_dir }}:/config"
- {{ caddy_logs_dir }}:/var/log/caddy - "{{ caddy_logs_dir }}:/var/log/caddy"
networks: networks:
- "web_proxy_network" - "web_proxy_network"
@@ -7,10 +7,10 @@ services:
ports: ports:
- "2222:22" - "2222:22"
volumes: volumes:
- {{ data_dir }}:/data - "{{ data_dir }}:/data"
- {{ backups_dir }}:/backups - "{{ backups_dir }}:/backups"
- /etc/timezone:/etc/timezone:ro - "/etc/timezone:/etc/timezone:ro"
- /etc/localtime:/etc/localtime:ro - "/etc/localtime:/etc/localtime:ro"
networks: networks:
- "web_proxy_network" - "web_proxy_network"
environment: environment:
+1 -1
View File
@@ -1,7 +1,7 @@
services: services:
remembos_app: remembos_app:
image: "{{ yc_container_registry_repository }}/remembos:v0.1.5" image: "{{ yc_container_registry_repository }}/remembos:v0.2.0"
container_name: remembos_app container_name: remembos_app
restart: unless-stopped restart: unless-stopped
user: "{{ owner_create_result.uid }}:{{ owner_create_result.group }}" user: "{{ owner_create_result.uid }}:{{ owner_create_result.group }}"
@@ -1,5 +1,5 @@
services: services:
rssbridge_app: rssbridge_app:
image: rssbridge/rss-bridge:2025-08-05 image: rssbridge/rss-bridge:2025-08-05
container_name: rssbridge_app container_name: rssbridge_app
+1 -1
View File
@@ -37,7 +37,7 @@
- name: "Copy apprise config" - name: "Copy apprise config"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/server.cfg.j2" src: "./files/{{ app_name }}/server.template.cfg"
dest: "{{ config_dir }}/server.cfg" dest: "{{ config_dir }}/server.cfg"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
+1 -1
View File
@@ -40,7 +40,7 @@
- name: "Copy restic shell script" - name: "Copy restic shell script"
ansible.builtin.template: ansible.builtin.template:
src: "files/backups/restic-shell.sh.j2" src: "files/backups/restic-shell.template.sh"
dest: "{{ restic_shell_script }}" dest: "{{ restic_shell_script }}"
owner: root owner: root
group: root group: root
+2 -2
View File
@@ -73,7 +73,7 @@
- name: "Copy caddy file" - name: "Copy caddy file"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/Caddyfile.j2" src: "./files/{{ app_name }}/Caddyfile.template"
dest: "{{ (caddy_file_dir, 'Caddyfile') | path_join }}" dest: "{{ (caddy_file_dir, 'Caddyfile') | path_join }}"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
@@ -81,7 +81,7 @@
- name: "Copy docker compose file" - name: "Copy docker compose file"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/docker-compose.yml.j2" src: "./files/{{ app_name }}/docker-compose.template.yml"
dest: "{{ base_dir }}/docker-compose.yml" dest: "{{ base_dir }}/docker-compose.yml"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
+2 -2
View File
@@ -38,7 +38,7 @@
- name: "Copy backup script" - name: "Copy backup script"
ansible.builtin.template: ansible.builtin.template:
src: "files/{{ app_name }}/backup.sh.j2" src: "files/{{ app_name }}/backup.template.sh"
dest: "{{ base_dir }}/backup.sh" dest: "{{ base_dir }}/backup.sh"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
@@ -46,7 +46,7 @@
- name: "Copy docker compose file" - name: "Copy docker compose file"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/docker-compose.yml.j2" src: "./files/{{ app_name }}/docker-compose.template.yml"
dest: "{{ base_dir }}/docker-compose.yml" dest: "{{ base_dir }}/docker-compose.yml"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
+2 -2
View File
@@ -39,7 +39,7 @@
- name: "Copy gobackup config" - name: "Copy gobackup config"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/gobackup.yml.j2" src: "./files/{{ app_name }}/gobackup.template.yml"
dest: "{{ gobackup_config }}" dest: "{{ gobackup_config }}"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
@@ -47,7 +47,7 @@
- name: "Copy backup script" - name: "Copy backup script"
ansible.builtin.template: ansible.builtin.template:
src: "files/{{ app_name }}/backup.sh.j2" src: "files/{{ app_name }}/backup.template.sh"
dest: "{{ base_dir }}/backup.sh" dest: "{{ base_dir }}/backup.sh"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
+1 -1
View File
@@ -34,7 +34,7 @@
- name: "Copy docker compose file" - name: "Copy docker compose file"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/docker-compose.yml.j2" src: "./files/{{ app_name }}/docker-compose.template.yml"
dest: "{{ base_dir }}/docker-compose.yml" dest: "{{ base_dir }}/docker-compose.yml"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
+3 -3
View File
@@ -39,7 +39,7 @@
- name: "Copy gobackup config" - name: "Copy gobackup config"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/gobackup.yml.j2" src: "./files/{{ app_name }}/gobackup.template.yml"
dest: "{{ gobackup_config }}" dest: "{{ gobackup_config }}"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
@@ -47,7 +47,7 @@
- name: "Copy backup script" - name: "Copy backup script"
ansible.builtin.template: ansible.builtin.template:
src: "files/{{ app_name }}/backup.sh.j2" src: "files/{{ app_name }}/backup.template.sh"
dest: "{{ base_dir }}/backup.sh" dest: "{{ base_dir }}/backup.sh"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
@@ -55,7 +55,7 @@
- name: "Copy docker compose file" - name: "Copy docker compose file"
ansible.builtin.template: ansible.builtin.template:
src: "./files/{{ app_name }}/docker-compose.yml.j2" src: "./files/{{ app_name }}/docker-compose.template.yml"
dest: "{{ base_dir }}/docker-compose.yml" dest: "{{ base_dir }}/docker-compose.yml"
owner: "{{ app_user }}" owner: "{{ app_user }}"
group: "{{ app_user }}" group: "{{ app_user }}"
+1 -1
View File
@@ -39,7 +39,7 @@
- name: 'Set up environment variables for user "{{ owner_name }}".' - name: 'Set up environment variables for user "{{ owner_name }}".'
ansible.builtin.template: ansible.builtin.template:
src: env.j2 src: env.template
dest: "/home/{{ owner_name }}/.env" dest: "/home/{{ owner_name }}/.env"
owner: "{{ owner_name }}" owner: "{{ owner_name }}"
group: "{{ owner_group }}" group: "{{ owner_group }}"