diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml index c6cdf1b..1b26424 100644 --- a/.gitea/workflows/netbird-install.yml +++ b/.gitea/workflows/netbird-install.yml @@ -4,9 +4,10 @@ on: workflow_dispatch: inputs: letsencrypt_email: - description: Почта для уведомлений Let's Encrypt - required: true + description: Почта для уведомлений Let's Encrypt (по умолчанию из group_vars/all.yml) + required: false type: string + default: 'vvkarpenok@gmail.com' jobs: install: @@ -25,10 +26,6 @@ jobs: echo "В секретах нет RUNNER_SSH_KEY." >&2 exit 1 fi - if [ -z "${NETBIRD_LETSENCRYPT_EMAIL}" ]; then - echo "Укажите почту Let's Encrypt при запуске." >&2 - exit 1 - fi rm -rf "${HOME}/homelab-infra" git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${HOME}/homelab-infra" @@ -45,8 +42,13 @@ jobs: cd "${HOME}/homelab-infra" + extra_args=() + if [ -n "${NETBIRD_LETSENCRYPT_EMAIL:-}" ]; then + extra_args+=("-e" "netbird_letsencrypt_email=${NETBIRD_LETSENCRYPT_EMAIL}") + fi + ansible-playbook playbooks/site.yml \ -i inventories/prod/hosts.yml \ --limit netbird \ --private-key "${HOME}/.ssh/id_ed25519" \ - -e "netbird_letsencrypt_email=${NETBIRD_LETSENCRYPT_EMAIL}" + "${extra_args[@]}" diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml new file mode 100644 index 0000000..b659820 --- /dev/null +++ b/inventories/prod/group_vars/all.yml @@ -0,0 +1,4 @@ +--- +# Общие глобальные переменные для всей инфраструктуры homelab (окружение prod) +admin_email: vvkarpenok@gmail.com +letsencrypt_email: "{{ admin_email }}" diff --git a/roles/netbird/defaults/main.yml b/roles/netbird/defaults/main.yml index fc0a9a0..bd909b7 100644 --- a/roles/netbird/defaults/main.yml +++ b/roles/netbird/defaults/main.yml @@ -4,3 +4,5 @@ netbird_ports: - 80/tcp - 443/tcp - 3478/udp + +netbird_letsencrypt_email: "{{ letsencrypt_email | default(admin_email) }}"