diff --git a/.gitea/workflows/ansible-core-net.yml b/.gitea/workflows/ansible-core-net.yml index ac7a13f..9e60e1c 100644 --- a/.gitea/workflows/ansible-core-net.yml +++ b/.gitea/workflows/ansible-core-net.yml @@ -5,12 +5,15 @@ on: branches: - main paths: + - 'ansible/ansible.cfg' + - 'ansible/ci/**' - 'ansible/roles/core-net/**' - 'ansible/roles/host/**' - 'ansible/playbooks/core-net.yml' - 'ansible/playbooks/host.yml' - 'ansible/playbooks/site.yml' - 'ansible/inventories/prod/hosts.yml' + - 'ansible/inventories/prod/host_vars/core-net.yml' - 'ansible/inventories/prod/group_vars/**' workflow_dispatch: diff --git a/.gitea/workflows/ansible-core-secrets.yml b/.gitea/workflows/ansible-core-secrets.yml index 6cf04e6..a6222ab 100644 --- a/.gitea/workflows/ansible-core-secrets.yml +++ b/.gitea/workflows/ansible-core-secrets.yml @@ -5,12 +5,15 @@ on: branches: - main paths: + - 'ansible/ansible.cfg' + - 'ansible/ci/**' - 'ansible/roles/core-secrets/**' - 'ansible/roles/host/**' - 'ansible/playbooks/core-secrets.yml' - 'ansible/playbooks/host.yml' - 'ansible/playbooks/site.yml' - 'ansible/inventories/prod/hosts.yml' + - 'ansible/inventories/prod/host_vars/core-secrets.yml' - 'ansible/inventories/prod/group_vars/**' workflow_dispatch: diff --git a/.gitea/workflows/ansible-rus-central.yml b/.gitea/workflows/ansible-rus-central.yml index 8c45455..cb21b7b 100644 --- a/.gitea/workflows/ansible-rus-central.yml +++ b/.gitea/workflows/ansible-rus-central.yml @@ -5,6 +5,8 @@ on: branches: - main paths: + - 'ansible/ansible.cfg' + - 'ansible/ci/**' - 'ansible/roles/rus-central/**' - 'ansible/roles/host/**' - 'ansible/playbooks/rus-central.yml' diff --git a/ansible/ci/ansible-target.sh b/ansible/ci/ansible-target.sh index 323af9e..868cbb3 100755 --- a/ansible/ci/ansible-target.sh +++ b/ansible/ci/ansible-target.sh @@ -61,7 +61,7 @@ if [ "$full" -eq 0 ] && [ -n "$changed" ]; then for file in $changed; do [ -n "$file" ] || continue case "$file" in - ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/hosts.yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml) + ansible/ansible.cfg | ansible/ci/* | ansible/roles/host/* | ansible/playbooks/host.yml | ansible/playbooks/site.yml | ansible/playbooks/"$machine".yml | ansible/inventories/prod/hosts.yml | ansible/inventories/prod/group_vars/* | ansible/inventories/prod/host_vars/"$machine".yml) full_from_files=1 ;; ansible/roles/"$machine"/*/*) diff --git a/ansible/roles/core-net/traefik/defaults/main.yml b/ansible/roles/core-net/traefik/defaults/main.yml index e66f538..39d9218 100644 --- a/ansible/roles/core-net/traefik/defaults/main.yml +++ b/ansible/roles/core-net/traefik/defaults/main.yml @@ -3,4 +3,4 @@ traefik_version: "v3.3.7" traefik_dir: "/opt/traefik" traefik_dynamic_dir: "/opt/traefik/dynamic" traefik_log_dir: "/var/log/traefik" -traefik_acme_email: "vvkarpenok@gmail.com" +traefik_acme_email: "{{ letsencrypt_email }}" diff --git a/ansible/roles/rus-central/netbird/tasks/main.yml b/ansible/roles/rus-central/netbird/tasks/main.yml index 0b6b60a..e4853a2 100644 --- a/ansible/roles/rus-central/netbird/tasks/main.yml +++ b/ansible/roles/rus-central/netbird/tasks/main.yml @@ -27,8 +27,6 @@ - netbird_session_key is defined and netbird_session_key | length > 0 - netbird_letsencrypt_email is defined and netbird_letsencrypt_email | length > 3 fail_msg: "Не задан домен NetBird (host_vars) или один из секретов NETBIRD_AUTH_SECRET, NETBIRD_DATASTORE_KEY, NETBIRD_SESSION_KEY, NETBIRD_LETSENCRYPT_EMAIL." - tags: - - config - name: Записать .env ansible.builtin.template: @@ -39,8 +37,6 @@ mode: "0600" no_log: true notify: Перезапустить NetBird - tags: - - config - name: Положить манифест панели ansible.builtin.copy: @@ -50,8 +46,6 @@ group: root mode: "0644" notify: Перезапустить NetBird - tags: - - config - name: Собрать dashboard.env ansible.builtin.template: @@ -61,8 +55,6 @@ group: root mode: "0644" notify: Перезапустить NetBird - tags: - - config - name: Собрать config.yaml ansible.builtin.template: @@ -73,13 +65,9 @@ mode: "0600" no_log: true notify: Перезапустить NetBird - tags: - - config - name: Применить изменения конфигурации ansible.builtin.meta: flush_handlers - tags: - - config - name: Убедиться, что панель запущена ansible.builtin.command: docker compose up -d @@ -87,8 +75,6 @@ chdir: "{{ netbird_dir }}" register: compose_up changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr" - tags: - - config - name: Показать состояние контейнеров ansible.builtin.command: docker compose ps @@ -96,8 +82,6 @@ chdir: "{{ netbird_dir }}" register: compose_ps changed_when: false - tags: - - config - name: Дождаться ответа панели ansible.builtin.command: > @@ -109,11 +93,7 @@ retries: 30 delay: 10 until: panel_http.stdout in ['200', '302'] - tags: - - config - name: Итог установки ansible.builtin.debug: msg: "{{ compose_ps.stdout_lines + ['Первый вход: https://' + netbird_domain + '/setup'] }}" - tags: - - config