From a87d91d61566d47b2f9db9d9a50cf798aff26c27 Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Tue, 17 Aug 2021 00:06:42 +0200
Subject: [PATCH] Reorg updatelist, add personal whitelist

---
 ansible/roles/pi_updatelist/tasks/main.yml    | 16 ----------
 .../files/pihole-updatelists.conf             |  2 +-
 .../roles/pihole_updatelist/tasks/main.yml    | 29 +++++++++++++++++++
 3 files changed, 30 insertions(+), 17 deletions(-)
 delete mode 100644 ansible/roles/pi_updatelist/tasks/main.yml
 rename ansible/roles/{pi_updatelist => pihole_updatelist}/files/pihole-updatelists.conf (94%)
 create mode 100644 ansible/roles/pihole_updatelist/tasks/main.yml

diff --git a/ansible/roles/pi_updatelist/tasks/main.yml b/ansible/roles/pi_updatelist/tasks/main.yml
deleted file mode 100644
index 9ec449a..0000000
--- a/ansible/roles/pi_updatelist/tasks/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- name: Install updatelist conf
-  register: updatelist
-  ansible.builtin.copy:
-    src: "pihole-updatelists.conf"
-    dest: "/etc/pihole-updatelists.conf"
-    mode: "0644"
-    owner: "root"
-    group: "root"
-  become: true
-
-- name: Activate changes
-  when: updatelist.changed
-  become: true
-  ansible.builtin.command:
-    argv:
-      - pihole-updatelists
diff --git a/ansible/roles/pi_updatelist/files/pihole-updatelists.conf b/ansible/roles/pihole_updatelist/files/pihole-updatelists.conf
similarity index 94%
rename from ansible/roles/pi_updatelist/files/pihole-updatelists.conf
rename to ansible/roles/pihole_updatelist/files/pihole-updatelists.conf
index 417d5ec..dcbfe66 100644
--- a/ansible/roles/pi_updatelist/files/pihole-updatelists.conf
+++ b/ansible/roles/pihole_updatelist/files/pihole-updatelists.conf
@@ -5,7 +5,7 @@
 ADLISTS_URL="https://v.firebog.net/hosts/lists.php?type=tick"
 
 ; Remote list URL containing exact domains to whitelist
-WHITELIST_URL="https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt"
+WHITELIST_URL="https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt https://gist.githubusercontent.com/Roxedus/9a03d22bf2af78cae4714ee23e74a63d/raw/c15b80f7ef9cd9cdc9f7c3e8fc5e7a077361a041/allowlist.txt"
 
 ; Remote list URL containing regex rules for whitelisting
 REGEX_WHITELIST_URL=""
diff --git a/ansible/roles/pihole_updatelist/tasks/main.yml b/ansible/roles/pihole_updatelist/tasks/main.yml
new file mode 100644
index 0000000..1f08342
--- /dev/null
+++ b/ansible/roles/pihole_updatelist/tasks/main.yml
@@ -0,0 +1,29 @@
+- name: Checkout pihole_updatelist
+  tags: [never, init, pihole]
+  ansible.builtin.git:
+    repo: "https://github.com/jacklul/pihole-updatelists.git"
+    clone: yes
+    dest: "/home/{{ users.0.username }}/pihole_updatelist"
+    depth: 1
+
+- name: Install updatelist conf
+  register: updatelist
+  ansible.builtin.copy:
+    src: "pihole-updatelists.conf"
+    dest: "/etc/pihole-updatelists.conf"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+  become: true
+
+- name: Check if updatelist is installed
+  stat:
+    path: "/usr/local/sbin/pihole-updatelists"
+  register: updatelist_exec
+
+- name: Activate changes
+  when: updatelist.changed and updatelist_exec.stat.exists
+  become: true
+  ansible.builtin.command:
+    argv:
+      - pihole-updatelists