diff --git a/.gitea/workflows/ansible-core-net.yml b/.gitea/workflows/ansible-core-net.yml new file mode 100644 index 0000000..7c6bc19 --- /dev/null +++ b/.gitea/workflows/ansible-core-net.yml @@ -0,0 +1,45 @@ +name: ansible-core-net + +on: + workflow_dispatch: + +jobs: + deploy: + runs-on: homelab + container: + image: homelab-ansible:latest + timeout-minutes: 15 + steps: + - name: Деплой Traefik на core-net через Ansible + env: + RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }} + run: | + set -eu + if [ -z "${RUNNER_SSH_KEY:-}" ]; then + echo "В секретах Gitea отсутствует RUNNER_SSH_KEY" >&2 + exit 1 + fi + + rm -rf "${HOME}/homelab-infra" + + # Клонируем по прямому IP Gitea (192.168.1.217:3000), чтобы не зависеть от состояния Traefik/DNS + git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra" + sha="${GITHUB_SHA:-${GITEA_SHA:-}}" + if [ -n "${sha}" ]; then + git -C "${HOME}/homelab-infra" checkout "${sha}" + fi + chmod -R go-w "${HOME}/homelab-infra" + + # Настраиваем SSH-ключ раннера + install -d -m 700 "${HOME}/.ssh" + printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" + chmod 600 "${HOME}/.ssh/id_ed25519" + trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT + + cd "${HOME}/homelab-infra/ansible" + + export ANSIBLE_HOST_KEY_CHECKING=False + + ansible-playbook playbooks/core_net.yml \ + -i inventories/prod/hosts.yml \ + --private-key "${HOME}/.ssh/id_ed25519" diff --git a/ansible/inventories/prod/hosts.yml b/ansible/inventories/prod/hosts.yml index 28b48a6..d0fa3ba 100644 --- a/ansible/inventories/prod/hosts.yml +++ b/ansible/inventories/prod/hosts.yml @@ -5,7 +5,6 @@ all: core-net: ansible_host: 192.168.1.104 ansible_user: root - ansible_ssh_private_key_file: ~/.ssh/root_home core_net: hosts: core-net: diff --git a/ansible/playbooks/core_net.yml b/ansible/playbooks/core_net.yml index ab6e4b7..0d5a14a 100644 --- a/ansible/playbooks/core_net.yml +++ b/ansible/playbooks/core_net.yml @@ -4,3 +4,4 @@ become: true roles: - core_net + diff --git a/ansible/roles/core_net/defaults/main.yml b/ansible/roles/core_net/defaults/main.yml index 3635d15..2179406 100644 --- a/ansible/roles/core_net/defaults/main.yml +++ b/ansible/roles/core_net/defaults/main.yml @@ -1,7 +1,7 @@ --- traefik_version: "v3.3" -traefik_dir: "/etc/traefik" -traefik_dynamic_dir: "/etc/traefik/dynamic" +traefik_dir: "/opt/traefik" +traefik_dynamic_dir: "/opt/traefik/dynamic" traefik_log_dir: "/var/log/traefik" traefik_acme_email: "vvkarpenok@gmail.com" traefik_dashboard_auth: 'karpenok:$apr1$dYhfMHp0$/xqbASu5jj55Ev058YImp.' diff --git a/ansible/roles/core_net/files/dynamic/dashboard.yml b/ansible/roles/core_net/files/dynamic/dashboard.yml index ee15cb2..dc9872a 100644 --- a/ansible/roles/core_net/files/dynamic/dashboard.yml +++ b/ansible/roles/core_net/files/dynamic/dashboard.yml @@ -15,3 +15,4 @@ http: basicAuth: users: - "karpenok:$apr1$dYhfMHp0$/xqbASu5jj55Ev058YImp." + diff --git a/ansible/roles/core_net/handlers/main.yml b/ansible/roles/core_net/handlers/main.yml index e0ba5a4..c791df7 100644 --- a/ansible/roles/core_net/handlers/main.yml +++ b/ansible/roles/core_net/handlers/main.yml @@ -1,4 +1,4 @@ --- - name: Перезапустить Traefik - ansible.builtin.command: docker compose -f /etc/traefik/compose.yaml restart + ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml restart changed_when: true diff --git a/ansible/roles/core_net/tasks/main.yml b/ansible/roles/core_net/tasks/main.yml index 4839a4e..b6eba82 100644 --- a/ansible/roles/core_net/tasks/main.yml +++ b/ansible/roles/core_net/tasks/main.yml @@ -50,3 +50,4 @@ ansible.builtin.command: docker compose -f {{ traefik_dir }}/compose.yaml up -d register: compose_up changed_when: "'Started' in compose_up.stdout or 'Running' in compose_up.stdout or 'Created' in compose_up.stdout" + diff --git a/ansible/roles/core_net/templates/compose.yaml.j2 b/ansible/roles/core_net/templates/compose.yaml.j2 index 0679e06..35a5228 100644 --- a/ansible/roles/core_net/templates/compose.yaml.j2 +++ b/ansible/roles/core_net/templates/compose.yaml.j2 @@ -8,7 +8,7 @@ services: - TZ=Asia/Krasnoyarsk volumes: - /etc/localtime:/etc/localtime:ro - - /etc/traefik/traefik.yml:/etc/traefik/traefik.yml:ro - - /etc/traefik/acme.json:/etc/traefik/acme.json - - /etc/traefik/dynamic:/etc/traefik/dynamic:ro - - /var/log/traefik:/var/log/traefik + - {{ traefik_dir }}/traefik.yml:/etc/traefik/traefik.yml:ro + - {{ traefik_dir }}/acme.json:/etc/traefik/acme.json + - {{ traefik_dynamic_dir }}:/etc/traefik/dynamic:ro + - {{ traefik_log_dir }}:/var/log/traefik diff --git a/ansible/roles/core_net/templates/traefik.yml.j2 b/ansible/roles/core_net/templates/traefik.yml.j2 index 2749b36..e36f672 100644 --- a/ansible/roles/core_net/templates/traefik.yml.j2 +++ b/ansible/roles/core_net/templates/traefik.yml.j2 @@ -54,3 +54,4 @@ log: accessLog: filePath: /var/log/traefik/access.log +