docs & refactor: sync secrets docs and clean up env var lookups
ansible-core-mon / deploy (push) Successful in 22s
ansible-core-net / deploy (push) Successful in 24s
ansible-core-secrets / deploy (push) Successful in 15s
ansible-opnsense / deploy (push) Successful in 6s
ansible-rus-central / deploy (push) Successful in 40s

This commit is contained in:
karpenok committed 2026-11-11 18:26:51 +07:00
1 parent e443b0fd97
commit bf4144a767
3 files changed
+13 -15

No files matched your search

+2 -6
View File
@@ -63,12 +63,8 @@ case "$machine" in
export INFISICAL_AUTH_SECRET="${AUTH_SECRET}"
;;
core-mon)
export GRAFANA_ADMIN_USER="${ADMIN_USER:-karpenok}"
export GRAFANA_ADMIN_PASSWORD="${ADMIN_PASSWORD:-}"
export NTFY_ADMIN_USER="${ADMIN_USER:-karpenok}"
export NTFY_ADMIN_PASSWORD="${ADMIN_PASSWORD:-}"
extra+=(-e "grafana_admin_user=${GRAFANA_ADMIN_USER}" -e "grafana_admin_password=${GRAFANA_ADMIN_PASSWORD}")
extra+=(-e "ntfy_admin_user=${NTFY_ADMIN_USER}" -e "ntfy_admin_password=${NTFY_ADMIN_PASSWORD}")
extra+=(-e "grafana_admin_user=${ADMIN_USER:-karpenok}" -e "grafana_admin_password=${ADMIN_PASSWORD:-}")
extra+=(-e "ntfy_admin_user=${ADMIN_USER:-karpenok}" -e "ntfy_admin_password=${ADMIN_PASSWORD:-}")
if [ -n "${MAIL_ADMIN_USER:-}" ]; then
extra+=(-e "grafana_admin_email=${MAIL_ADMIN_USER}")
fi
@@ -2,12 +2,12 @@
monitoring_dir: /opt/monitoring
prometheus_retention: "30d"
grafana_admin_user: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_USER', default='karpenok') }}"
grafana_admin_password: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_PASSWORD', default='') }}"
grafana_admin_user: "{{ lookup('ansible.builtin.env', 'ADMIN_USER', default='karpenok') }}"
grafana_admin_password: "{{ lookup('ansible.builtin.env', 'ADMIN_PASSWORD', default='') }}"
grafana_admin_email: "{{ lookup('ansible.builtin.env', 'MAIL_ADMIN_USER', default=grafana_admin_user ~ '@gunihome.ru') }}"
grafana_root_url: "https://graf.gunihome.ru"
ntfy_base_url: "https://ntfy.gunihome.ru"
ntfy_default_topic: "homelab-alerts"
ntfy_admin_user: "{{ lookup('ansible.builtin.env', 'NTFY_ADMIN_USER', default=grafana_admin_user) }}"
ntfy_admin_password: "{{ lookup('ansible.builtin.env', 'NTFY_ADMIN_PASSWORD', default=grafana_admin_password) }}"
ntfy_admin_user: "{{ grafana_admin_user }}"
ntfy_admin_password: "{{ grafana_admin_password }}"