From 1bbd602e4641154883fc6f78e35abe3f50ef8389 Mon Sep 17 00:00:00 2001
From: Cedric Wille <24487628+cwille97@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:44:46 -0500
Subject: [PATCH 1/5] Fix docker setup

---
 tasks/docker.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tasks/docker.yml b/tasks/docker.yml
index 360d1cc2..bac8a86d 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -34,6 +34,8 @@
       - python3-pip
       - git
       - rsync
+      - docker-compose
+      - resolvconf
     state: present
   when: ansible_facts.os_family == "Debian"
 
@@ -46,15 +48,10 @@
       - python-pip
       - git
       - rsync
+      - docker-compose
     state: present
   when: ansible_facts.os_family == "Archlinux"
 
-- name: Install Docker Compose using Pip.
-  ansible.builtin.pip:
-    name: docker-compose
-    state: present
-    executable: pip3
-
 - name: "Ensure user is added to the docker group: {{ ansible_user }}"
   ansible.builtin.user:
     name: "{{ ansible_user }}"

From 3b5f1943a7166027aa4c4e2fccf164f2485e0071 Mon Sep 17 00:00:00 2001
From: Cedric Wille <24487628+cwille97@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:45:10 -0500
Subject: [PATCH 2/5] Fix missing resolvconf

---
 tasks/pi-hole.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tasks/pi-hole.yml b/tasks/pi-hole.yml
index 6d772084..f8065ead 100644
--- a/tasks/pi-hole.yml
+++ b/tasks/pi-hole.yml
@@ -23,6 +23,11 @@
     build: false
   become: false
 
+- name: Ensure resolveconf exists.
+  ansible.builtin.file:
+    path: "/etc/resolvconf.conf"
+    state: touch
+
 - name: Update resolveconf for local name server use.
   ansible.builtin.lineinfile:
     line: "name_servers=127.0.0.1"

From 5d43fb29413c34bfb5e8a88678610a6d758db16e Mon Sep 17 00:00:00 2001
From: Cedric Wille <24487628+cwille97@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:46:56 -0500
Subject: [PATCH 3/5] Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7f1319b6..244007bd 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ It should also work with Ubuntu for Pi, or Arch Linux, but has not been tested o
 ## Setup
 
   1. [Install Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html). The easiest way (especially on Pi or a Debian system) is via Pip:
-     1. (If on Pi/Debian): `sudo apt-get install -y python3-pip`
+     1. (If on Pi/Debian): `sudo apt-get install -y ansible`
      2. (Everywhere): `pip3 install ansible`
   2. Clone this repository: `git clone https://github.com/geerlingguy/internet-pi.git`, then enter the repository directory: `cd internet-pi`.
   3. Install requirements: `ansible-galaxy collection install -r requirements.yml` (if you see `ansible-galaxy: command not found`, restart your SSH session or reboot the Pi and try again)
@@ -56,7 +56,7 @@ It should also work with Ubuntu for Pi, or Arch Linux, but has not been tested o
 
 ### Pi-hole
 
-Visit the Pi's IP address (e.g. http://192.168.1.10/) and use the `pihole_password` you configured in your `config.yml` file. An existing pi-hole installation can be left unaltered by disabling the setup of this proyect's installation in your `config.yml` (`pihole_enable: false`)
+Visit the Pi's IP address (e.g. http://192.168.1.10/admin) and use the `pihole_password` you configured in your `config.yml` file. An existing pi-hole installation can be left unaltered by disabling the setup of this project's installation in your `config.yml` (`pihole_enable: false`)
 
 ### Grafana
 

From 0e8d8bb22259e894c3a7d09398dacd3e5c9e8e7e Mon Sep 17 00:00:00 2001
From: Cedric Wille <24487628+cwille97@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:53:22 -0500
Subject: [PATCH 4/5] Fix permission issue for CI

---
 tasks/pi-hole.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasks/pi-hole.yml b/tasks/pi-hole.yml
index f8065ead..eac6c4ad 100644
--- a/tasks/pi-hole.yml
+++ b/tasks/pi-hole.yml
@@ -27,6 +27,7 @@
   ansible.builtin.file:
     path: "/etc/resolvconf.conf"
     state: touch
+  become: false
 
 - name: Update resolveconf for local name server use.
   ansible.builtin.lineinfile:

From e5de1f090ab7dbf4e6f997c8b31d1a4154543575 Mon Sep 17 00:00:00 2001
From: Cedric Wille <24487628+cwille97@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:59:18 -0500
Subject: [PATCH 5/5] Fix CI error

---
 tasks/pi-hole.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/pi-hole.yml b/tasks/pi-hole.yml
index eac6c4ad..4da2e4f5 100644
--- a/tasks/pi-hole.yml
+++ b/tasks/pi-hole.yml
@@ -27,7 +27,7 @@
   ansible.builtin.file:
     path: "/etc/resolvconf.conf"
     state: touch
-  become: false
+    mode: "744"
 
 - name: Update resolveconf for local name server use.
   ansible.builtin.lineinfile: