Add service registry, shared roles and unified reverse proxy
Collect the facts about all 14 services -- VMID, node, address, ports,
domain, pinned images, resources, backup and monitoring participation --
into group_vars/all/services.yml. Values are taken from the existing
playbooks; gaps are marked null rather than invented.
Replace reverse-proxy-{gitea,vaultwarden,grimmory}.yml with a single
playbook iterating over registry entries that declare a domain. It keeps
every check the three had, preserves grimmory's richer Caddy block
byte-for-byte, and restarts Caddy once when any site changed instead of
up to three times. Verified with --check --diff against ru-vps: ok=6
changed=0, so it reproduces the current Caddyfile exactly.
Add two roles factoring out the skeleton duplicated across the pve-*
playbooks: lxc_docker_host (packages, /dev/fuse assertion, fuse-overlayfs
storage driver, UFW baseline) and compose_service (compose file, systemd
unit, config validation, health check). They are not wired into any
playbook yet -- migrating a live service is a separate, per-service step;
compose_service/README.md shows the Gitea example and spells out what
actually changes on the host.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GTocXkGUUazHdKKd3r9k71
This commit is contained in:
@@ -0,0 +1,113 @@
|
||||
---
|
||||
- name: Install Docker runtime packages
|
||||
ansible.builtin.apt:
|
||||
name: "{{ lxc_docker_host_all_packages }}"
|
||||
state: present
|
||||
update_cache: "{{ lxc_docker_host_update_cache }}"
|
||||
vars:
|
||||
lxc_docker_host_all_packages: >-
|
||||
{{ (lxc_docker_host_packages
|
||||
+ lxc_docker_host_extra_packages
|
||||
+ (['docker-compose'] if lxc_docker_host_install_compose_package else [])
|
||||
+ (['prometheus-node-exporter'] if lxc_docker_host_install_node_exporter else [])
|
||||
+ (['ufw'] if (lxc_docker_host_manage_ufw and lxc_docker_host_install_ufw) else []))
|
||||
| unique | sort }}
|
||||
|
||||
- name: Check the FUSE device
|
||||
ansible.builtin.stat:
|
||||
path: "{{ lxc_docker_host_fuse_device }}"
|
||||
register: lxc_docker_host_fuse
|
||||
when: lxc_docker_host_require_fuse
|
||||
|
||||
- name: Require the FUSE device
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- lxc_docker_host_fuse.stat.exists
|
||||
- lxc_docker_host_fuse.stat.ischr
|
||||
fail_msg: >-
|
||||
{{ lxc_docker_host_fuse_device }} отсутствует или не является символьным
|
||||
устройством. Добавьте в /etc/pve/lxc/<vmid>.conf на узле PVE:
|
||||
"lxc.cgroup2.devices.allow: c 10:229 rwm" и
|
||||
"lxc.mount.entry: /dev/fuse dev/fuse none bind,create=file",
|
||||
затем перезапустите контейнер.
|
||||
when: lxc_docker_host_require_fuse
|
||||
|
||||
- name: Ensure the Docker config directory exists
|
||||
ansible.builtin.file:
|
||||
path: "{{ lxc_docker_host_daemon_config_path | dirname }}"
|
||||
state: directory
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0755"
|
||||
|
||||
- name: Configure the Docker storage driver for the unprivileged LXC
|
||||
ansible.builtin.copy:
|
||||
dest: "{{ lxc_docker_host_daemon_config_path }}"
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
content: "{{ lxc_docker_host_daemon_config | to_nice_json(indent=2) }}\n"
|
||||
register: lxc_docker_host_daemon_config_result
|
||||
|
||||
- name: Ensure the Docker service is enabled and running
|
||||
ansible.builtin.systemd:
|
||||
name: docker
|
||||
enabled: true
|
||||
state: "{{ 'restarted' if lxc_docker_host_daemon_config_result.changed else 'started' }}"
|
||||
|
||||
# --- UFW -------------------------------------------------------------------
|
||||
# Порядок важен: сначала разрешающие правила, только потом включение политики
|
||||
# deny incoming — иначе SSH обрывается прямо во время прогона.
|
||||
|
||||
- name: Allow SSH from the trusted networks
|
||||
community.general.ufw:
|
||||
rule: allow
|
||||
port: "{{ lxc_docker_host_ssh_port | string }}"
|
||||
proto: tcp
|
||||
src: "{{ item }}"
|
||||
loop: "{{ lxc_docker_host_ssh_sources }}"
|
||||
when: lxc_docker_host_manage_ufw
|
||||
|
||||
- name: Allow the declared service ports
|
||||
community.general.ufw:
|
||||
rule: allow
|
||||
port: "{{ item.0.port | string }}"
|
||||
proto: "{{ item.0.proto | default('tcp') }}"
|
||||
src: "{{ item.1 }}"
|
||||
comment: "{{ item.0.comment | default(omit) }}"
|
||||
loop: "{{ lxc_docker_host_ufw_service_rules | subelements('sources') }}"
|
||||
loop_control:
|
||||
label: "{{ item.0.port }}/{{ item.0.proto | default('tcp') }} from {{ item.1 }}"
|
||||
when: lxc_docker_host_manage_ufw
|
||||
|
||||
- name: Allow Node Exporter from the monitoring host
|
||||
community.general.ufw:
|
||||
rule: allow
|
||||
port: "{{ lxc_docker_host_node_exporter_port | string }}"
|
||||
proto: tcp
|
||||
src: "{{ lxc_docker_host_monitoring_host }}"
|
||||
when:
|
||||
- lxc_docker_host_manage_ufw
|
||||
- lxc_docker_host_allow_node_exporter
|
||||
|
||||
- name: Enable the restrictive firewall
|
||||
community.general.ufw:
|
||||
state: enabled
|
||||
policy: "{{ lxc_docker_host_ufw_policy }}"
|
||||
direction: incoming
|
||||
when:
|
||||
- lxc_docker_host_manage_ufw
|
||||
- lxc_docker_host_ufw_enable
|
||||
|
||||
# --- Verification ----------------------------------------------------------
|
||||
- name: Verify the effective Docker storage driver
|
||||
ansible.builtin.command:
|
||||
argv:
|
||||
- docker
|
||||
- info
|
||||
- --format
|
||||
- "{% raw %}{{.Driver}}{% endraw %}"
|
||||
register: lxc_docker_host_driver
|
||||
changed_when: false
|
||||
failed_when: lxc_docker_host_driver.stdout != lxc_docker_host_storage_driver
|
||||
when: lxc_docker_host_verify_storage_driver
|
||||
Reference in New Issue
Block a user