From 570524a78618829298b475f9156f760c3190ded3 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 22 Jan 2020 00:12:41 +0000
Subject: [PATCH] chore(vars): Restructure and comment defualts/main.yml

---
 defaults/main.yml | 30 ++++++++++++++----------------
 vars/main.yml     |  8 +++++++-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7c99236..e442338 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,28 +1,26 @@
 ---
-adguardhome_version: 'latest'
-adguardhome_user: root
-adguardhome_system_user: yes
-adguardhome_group: "{{ adguardhome_user }}"
+# Version of AdGuard Home to install. If set to "latest", lookup the latest
+# release via GitHub API.
+adguardhome_version: "latest"
 
-adguardhome_service_name: "adguardhome"
+# User to run AdGuard Home under. Must initially be "root" if no conig file is
+# on disk. After going through the setup wizard, or manually adding a config
+# file, this can be set to something else, like "adguard" for example.
+adguardhome_user: root
+adguardhome_group: "{{ adguardhome_user }}"
+adguardhome_system_user: true
+
+# Default paths.
 adguardhome_bin_dir: "/opt/{{ adguardhome_service_name }}/bin"
 adguardhome_config_dir: "/opt/{{ adguardhome_service_name }}/config"
+adguardhome_config_name: AdGuardHome.yml
 adguardhome_data_dir: "/opt/{{ adguardhome_service_name }}"
 adguardhome_tmp_dir: /tmp
 
+# Enable and start systemd service unit?
+adguardhome_service_name: "adguardhome"
 adguardhome_service_enable: true
 adguardhome_service_start: true
 
-adguardhome_bin_name: AdGuardHome
-adguardhome_config_name: AdGuardHome.yml
-
-adguardhome_bin_file: "{{ adguardhome_bin_dir }}/{{ adguardhome_bin_name }}"
-adguardhome_config_file: "{{ adguardhome_config_dir }}/{{ adguardhome_config_name }}"
-adguardhome_unpack_dir: "{{ adguardhome_tmp_dir }}/AdGuardHome-{{ adguardhome_version }}"
-
-adguardhome_arch: "{% if ansible_architecture == 'x86_64' %}amd64{% elif ansible_architecture == 'aarch64' %}arm64{% else %}arm{% endif %}"
-adguardhome_archive: "AdGuardHome_linux_{{ adguardhome_arch }}.tar.gz"
-adguardhome_download_url_base: "https://github.com/AdguardTeam/AdGuardHome/releases/download"
-
 # Disable DNSStubResolver if systemd-resolved servicee is running.
 adguardhome_disable_systemd_dnsstubresolver: true
diff --git a/vars/main.yml b/vars/main.yml
index f10f78f..bb14035 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,8 @@
 ---
-# vars file for ansible-adguardhome
+adguardhome_bin_name: AdGuardHome
+adguardhome_bin_file: "{{ adguardhome_bin_dir }}/{{ adguardhome_bin_name }}"
+adguardhome_config_file: "{{ adguardhome_config_dir }}/{{ adguardhome_config_name }}"
+adguardhome_unpack_dir: "{{ adguardhome_tmp_dir }}/AdGuardHome-{{ adguardhome_version }}"
+adguardhome_arch: "{% if ansible_architecture == 'x86_64' %}amd64{% elif ansible_architecture == 'aarch64' %}arm64{% else %}arm{% endif %}"
+adguardhome_archive: "AdGuardHome_linux_{{ adguardhome_arch }}.tar.gz"
+adguardhome_download_url_base: "https://github.com/AdguardTeam/AdGuardHome/releases/download"