diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml index 0ef53d1..b30a8a5 100644 --- a/.gitea/workflows/netbird-install.yml +++ b/.gitea/workflows/netbird-install.yml @@ -46,30 +46,25 @@ jobs: install -d -m 700 "${HOME}/.ssh" printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" chmod 600 "${HOME}/.ssh/id_ed25519" - # Домашний DNS отдаёт central.gunihome.ru на 192.168.1.201. Раннер в этой сети, - # поэтому SSH и проверка идут на публичный адрес VPS. - ssh-keyscan -H 45.154.185.208 >> "${HOME}/.ssh/known_hosts" - cat > /tmp/netbird-inventory.ini <<'EOF' - [netbird] - vps ansible_host=45.154.185.208 ansible_user=root - EOF - ansible-playbook /tmp/homelab-infra/services/netbird/playbook.yml \ - -i /tmp/netbird-inventory.ini \ - --private-key "${HOME}/.ssh/id_ed25519" \ - -e "netbird_letsencrypt_email=${NETBIRD_LETSENCRYPT_EMAIL}" - - ready=0 - for _ in $(seq 1 30); do - code=$(curl -sk --resolve central.gunihome.ru:443:45.154.185.208 -o /dev/null -w '%{http_code}' https://central.gunihome.ru/ || true) - echo "https://central.gunihome.ru/ через 45.154.185.208 -> ${code}" - if [ "${code}" = "200" ] || [ "${code}" = "302" ]; then - ready=1 - break - fi - sleep 10 - done - if [ "${ready}" -ne 1 ]; then - echo "Панель не ответила по HTTPS за отведённое время." >&2 + inventory=/tmp/homelab-infra/inventory/hosts.ini + target=$(awk '{ + for (i = 1; i <= NF; i++) { + if ($i ~ /^ansible_host=/) { + split($i, a, "=") + print a[2] + exit + } + } + }' "${inventory}") + if [ -z "${target}" ]; then + echo "В inventory/hosts.ini нет ansible_host." >&2 exit 1 fi + echo "Цель из inventory: ${target}" + ssh-keyscan -H "${target}" >> "${HOME}/.ssh/known_hosts" + + ansible-playbook /tmp/homelab-infra/services/netbird/playbook.yml \ + -i "${inventory}" \ + --private-key "${HOME}/.ssh/id_ed25519" \ + -e "netbird_letsencrypt_email=${NETBIRD_LETSENCRYPT_EMAIL}" diff --git a/inventory/group_vars/netbird.yml b/inventory/group_vars/netbird.yml new file mode 100644 index 0000000..5fe3ecf --- /dev/null +++ b/inventory/group_vars/netbird.yml @@ -0,0 +1,3 @@ +# Публичное имя панели. Его видят браузер и сертификат. +# На какой машине она стоит — в inventory/hosts.ini, не здесь. +netbird_domain: central.gunihome.ru diff --git a/inventory/hosts.ini b/inventory/hosts.ini new file mode 100644 index 0000000..506b123 --- /dev/null +++ b/inventory/hosts.ini @@ -0,0 +1,5 @@ +# Единственное место, где записан адрес машины. +# Сменился IP — меняется ansible_host здесь, сценарии не трогаются. + +[netbird] +vps ansible_host=45.154.185.208 ansible_user=root diff --git a/services/netbird/.env.example b/services/netbird/.env.example index 87a4013..3809984 100644 --- a/services/netbird/.env.example +++ b/services/netbird/.env.example @@ -2,6 +2,7 @@ # Значения ключей сюда не записывать. COMPOSE_PROJECT_NAME=netbird +NETBIRD_DOMAIN= NETBIRD_LETSENCRYPT_EMAIL= NETBIRD_AUTH_SECRET= NETBIRD_DATASTORE_KEY= diff --git a/services/netbird/README.md b/services/netbird/README.md index 5c2de85..47dc140 100644 --- a/services/netbird/README.md +++ b/services/netbird/README.md @@ -10,7 +10,7 @@ | `compose.yaml` | Сервисы, порты `80/tcp`, `443/tcp`, `3478/udp` | | `templates/config.yaml.j2` | Шаблон сервера. Ключи подставляет плейбук | | `templates/env.j2` | Шаблон `.env` для Compose | -| `dashboard.env` | Публичные адреса панели | +| `templates/dashboard.env.j2` | Адреса панели. Имя берётся из `inventory/group_vars/netbird.yml` | | `.env.example` | Имена переменных без значений | `.env` и готовый `config.yaml` остаются на хосте в `/opt/netbird`. В git их нет. Повторный прогон не пересоздаёт ключи и не удаляет тома `netbird_data` и `netbird_traefik_letsencrypt`. diff --git a/services/netbird/compose.yaml b/services/netbird/compose.yaml index 2d6fc4a..cbcab47 100644 --- a/services/netbird/compose.yaml +++ b/services/netbird/compose.yaml @@ -66,7 +66,7 @@ services: condition: service_healthy labels: - traefik.enable=true - - traefik.http.routers.netbird-dashboard.rule=Host(`central.gunihome.ru`) + - traefik.http.routers.netbird-dashboard.rule=Host(`${NETBIRD_DOMAIN}`) - traefik.http.routers.netbird-dashboard.entrypoints=websecure - traefik.http.routers.netbird-dashboard.tls=true - traefik.http.routers.netbird-dashboard.tls.certresolver=letsencrypt @@ -107,13 +107,13 @@ services: command: ["--config", "/etc/netbird/config.yaml"] labels: - traefik.enable=true - - traefik.http.routers.netbird-grpc.rule=Host(`central.gunihome.ru`) && (PathPrefix(`/signalexchange.SignalExchange/`) || PathPrefix(`/management.ManagementService/`) || PathPrefix(`/management.ProxyService/`)) + - traefik.http.routers.netbird-grpc.rule=Host(`${NETBIRD_DOMAIN}`) && (PathPrefix(`/signalexchange.SignalExchange/`) || PathPrefix(`/management.ManagementService/`) || PathPrefix(`/management.ProxyService/`)) - traefik.http.routers.netbird-grpc.entrypoints=websecure - traefik.http.routers.netbird-grpc.tls=true - traefik.http.routers.netbird-grpc.tls.certresolver=letsencrypt - traefik.http.routers.netbird-grpc.service=netbird-server-h2c - traefik.http.routers.netbird-grpc.priority=100 - - traefik.http.routers.netbird-backend.rule=Host(`central.gunihome.ru`) && (PathPrefix(`/relay`) || PathPrefix(`/ws-proxy/`) || PathPrefix(`/api`) || PathPrefix(`/oauth2`)) + - traefik.http.routers.netbird-backend.rule=Host(`${NETBIRD_DOMAIN}`) && (PathPrefix(`/relay`) || PathPrefix(`/ws-proxy/`) || PathPrefix(`/api`) || PathPrefix(`/oauth2`)) - traefik.http.routers.netbird-backend.entrypoints=websecure - traefik.http.routers.netbird-backend.tls=true - traefik.http.routers.netbird-backend.tls.certresolver=letsencrypt diff --git a/services/netbird/playbook.yml b/services/netbird/playbook.yml index 43fa517..0366854 100644 --- a/services/netbird/playbook.yml +++ b/services/netbird/playbook.yml @@ -24,6 +24,7 @@ - ufw - openssl - ca-certificates + - curl state: present update_cache: true @@ -122,16 +123,21 @@ no_log: true when: not netbird_env.stat.exists - - name: Положить манифесты панели + - name: Положить манифест панели ansible.builtin.copy: - src: "{{ playbook_dir }}/{{ item }}" - dest: "{{ netbird_dir }}/{{ item }}" + src: "{{ playbook_dir }}/compose.yaml" + dest: "{{ netbird_dir }}/compose.yaml" + owner: root + group: root + mode: "0644" + + - name: Собрать dashboard.env + ansible.builtin.template: + src: dashboard.env.j2 + dest: "{{ netbird_dir }}/dashboard.env" owner: root group: root mode: "0644" - loop: - - compose.yaml - - dashboard.env - name: Собрать config.yaml ansible.builtin.template: @@ -156,6 +162,17 @@ register: compose_ps changed_when: false + - name: Дождаться ответа панели + ansible.builtin.command: > + curl -sk --resolve {{ netbird_domain }}:443:127.0.0.1 + -o /dev/null -w '%{http_code}' + https://{{ netbird_domain }}/ + register: panel_http + changed_when: false + retries: 30 + delay: 10 + until: panel_http.stdout in ['200', '302'] + - name: Итог установки ansible.builtin.debug: - msg: "{{ compose_ps.stdout_lines + ['Первый вход: https://central.gunihome.ru/setup'] }}" + msg: "{{ compose_ps.stdout_lines + ['Первый вход: https://' + netbird_domain + '/setup'] }}" diff --git a/services/netbird/templates/config.yaml.j2 b/services/netbird/templates/config.yaml.j2 index ff71212..e01a521 100644 --- a/services/netbird/templates/config.yaml.j2 +++ b/services/netbird/templates/config.yaml.j2 @@ -2,7 +2,7 @@ server: listenAddress: ":80" - exposedAddress: "https://central.gunihome.ru:443" + exposedAddress: "https://{{ netbird_domain }}:443" stunPorts: - 3478 metricsPort: 9090 @@ -14,12 +14,12 @@ server: dataDir: "/var/lib/netbird" auth: - issuer: "https://central.gunihome.ru/oauth2" + issuer: "https://{{ netbird_domain }}/oauth2" signKeyRefreshEnabled: true sessionCookieEncryptionKey: "{{ netbird_session_key }}" dashboardRedirectURIs: - - "https://central.gunihome.ru/nb-auth" - - "https://central.gunihome.ru/nb-silent-auth" + - "https://{{ netbird_domain }}/nb-auth" + - "https://{{ netbird_domain }}/nb-silent-auth" cliRedirectURIs: - "http://localhost:53000/" diff --git a/services/netbird/dashboard.env b/services/netbird/templates/dashboard.env.j2 similarity index 69% rename from services/netbird/dashboard.env rename to services/netbird/templates/dashboard.env.j2 index 69923ad..19f5275 100644 --- a/services/netbird/dashboard.env +++ b/services/netbird/templates/dashboard.env.j2 @@ -1,10 +1,10 @@ # Панель за Traefik. Сертификат выпускает Traefik, поэтому LETSENCRYPT_DOMAIN=none. -NETBIRD_MGMT_API_ENDPOINT=https://central.gunihome.ru -NETBIRD_MGMT_GRPC_API_ENDPOINT=https://central.gunihome.ru +NETBIRD_MGMT_API_ENDPOINT=https://{{ netbird_domain }} +NETBIRD_MGMT_GRPC_API_ENDPOINT=https://{{ netbird_domain }} AUTH_AUDIENCE=netbird-dashboard AUTH_CLIENT_ID=netbird-dashboard AUTH_CLIENT_SECRET= -AUTH_AUTHORITY=https://central.gunihome.ru/oauth2 +AUTH_AUTHORITY=https://{{ netbird_domain }}/oauth2 USE_AUTH0=false AUTH_SUPPORTED_SCOPES=openid profile email groups AUTH_REDIRECT_URI=/nb-auth diff --git a/services/netbird/templates/env.j2 b/services/netbird/templates/env.j2 index 8bfdadd..78aca63 100644 --- a/services/netbird/templates/env.j2 +++ b/services/netbird/templates/env.j2 @@ -1,4 +1,5 @@ COMPOSE_PROJECT_NAME=netbird +NETBIRD_DOMAIN={{ netbird_domain }} NETBIRD_LETSENCRYPT_EMAIL={{ netbird_letsencrypt_email }} NETBIRD_AUTH_SECRET={{ netbird_auth_secret }} NETBIRD_DATASTORE_KEY={{ netbird_datastore_key }}