From 3ba044d1a2a5ffa1d1066958298b086bb3fbb63d Mon Sep 17 00:00:00 2001
From: Thomas Kleinendorst <thomas@kleinendorst.info>
Date: Fri, 12 Apr 2024 09:10:43 +0200
Subject: [PATCH] Extract cloudflare_ddns user to a variable

---
 roles/cloudflare-ddns/tasks/main.yml               | 12 +++++-------
 roles/cloudflare-ddns/templates/ddns_config.ini.j2 |  2 +-
 roles/cloudflare-ddns/vars/main/defaults.yml       |  2 ++
 roles/cloudflare-ddns/vars/{ => main}/vault.yml    |  0
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 roles/cloudflare-ddns/vars/main/defaults.yml
 rename roles/cloudflare-ddns/vars/{ => main}/vault.yml (100%)

diff --git a/roles/cloudflare-ddns/tasks/main.yml b/roles/cloudflare-ddns/tasks/main.yml
index 43b5d9a..9c4d55c 100644
--- a/roles/cloudflare-ddns/tasks/main.yml
+++ b/roles/cloudflare-ddns/tasks/main.yml
@@ -1,11 +1,9 @@
 ---
-- name: Read local vault
-  ansible.builtin.include_vars: vault.yml
 - name: Create a new user
   ansible.builtin.include_role:
     name: user
   vars:
-    username: cloudflare_ddns
+    username: "{{ cloudflare_ddns_user }}"
     password: "{{ cloudflare_ddns_user_password }}"
 - name: Install Python dependencies # noqa: package-latest
   become: true
@@ -14,14 +12,14 @@
     state: latest
 - name: Copy over DDNS scripting
   become: true
-  become_user: cloudflare_ddns
+  become_user: "{{ cloudflare_ddns_user }}"
   ansible.builtin.copy:
     src: cloudflare_ddns
     dest: ~/bin/
     mode: '0700'
 - name: Configure Python venv
   become: true
-  become_user: cloudflare_ddns
+  become_user: "{{ cloudflare_ddns_user }}"
   ansible.builtin.shell: |
     cd ~/bin/cloudflare_ddns
     python3 -m venv ./venv
@@ -33,14 +31,14 @@
     creates: ~/bin/cloudflare_ddns/venv
 - name: Create directory for storing public IP change logs and config
   become: true
-  become_user: cloudflare_ddns
+  become_user: "{{ cloudflare_ddns_user }}"
   ansible.builtin.file:
     path: ~/cloudflare_ddns
     state: directory
     mode: '0700'
 - name: Fill config file and store it in folder
   become: true
-  become_user: cloudflare_ddns
+  become_user: "{{ cloudflare_ddns_user }}"
   ansible.builtin.template:
     src: ddns_config.ini.j2
     dest: ~/cloudflare_ddns/ddns_config.ini
diff --git a/roles/cloudflare-ddns/templates/ddns_config.ini.j2 b/roles/cloudflare-ddns/templates/ddns_config.ini.j2
index 40c35bf..26e0723 100644
--- a/roles/cloudflare-ddns/templates/ddns_config.ini.j2
+++ b/roles/cloudflare-ddns/templates/ddns_config.ini.j2
@@ -2,4 +2,4 @@
 dns_cloudflare_token = {{ dns_cloudflare_token }}
 
 [log_changes]
-log_path = /home/cloudflare_ddns/cloudflare_ddns/ddns_update.log
+log_path = /home/{{ cloudflare_ddns_user }}/cloudflare_ddns/ddns_update.log
diff --git a/roles/cloudflare-ddns/vars/main/defaults.yml b/roles/cloudflare-ddns/vars/main/defaults.yml
new file mode 100644
index 0000000..d1f7c51
--- /dev/null
+++ b/roles/cloudflare-ddns/vars/main/defaults.yml
@@ -0,0 +1,2 @@
+---
+cloudflare_ddns_user: 'cloudflare_ddns'
diff --git a/roles/cloudflare-ddns/vars/vault.yml b/roles/cloudflare-ddns/vars/main/vault.yml
similarity index 100%
rename from roles/cloudflare-ddns/vars/vault.yml
rename to roles/cloudflare-ddns/vars/main/vault.yml