From b6d3eebb59e48bf7c4272a4b591f76e61b738e7b Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 19:39:46 +0100
Subject: [PATCH 01/12] Added pihole_cloudflared_container.sh and
 pihole_cloudflared_setup.sh

---
 pihole_cloudflared_container.sh | 159 ++++++++++++++++++++++++++++++++
 pihole_cloudflared_setup.sh     |  97 +++++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 pihole_cloudflared_container.sh
 create mode 100644 pihole_cloudflared_setup.sh

diff --git a/pihole_cloudflared_container.sh b/pihole_cloudflared_container.sh
new file mode 100644
index 0000000..8d510fc
--- /dev/null
+++ b/pihole_cloudflared_container.sh
@@ -0,0 +1,159 @@
+#!/usr/bin/env bash
+
+while true; do
+    printf "This will create a new Pi-hole with cloudflared LXC.\n" 
+    read -p "Proceed (y/n)?" yn
+    case $yn in
+        [Yy]* ) break;;
+        [Nn]* ) exit;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
+
+set -o errexit  
+set -o errtrace 
+set -o nounset  
+set -o pipefail 
+shopt -s expand_aliases
+alias die='EXIT=$? LINE=$LINENO error_exit'
+trap die ERR
+trap cleanup EXIT
+
+function error_exit() {
+  trap - ERR
+  local DEFAULT='Unknown failure occured.'
+  local REASON="\e[97m${1:-$DEFAULT}\e[39m"
+  local FLAG="\e[91m[ERROR] \e[93m$EXIT@$LINE"
+  msg "$FLAG $REASON"
+  [ ! -z ${CTID-} ] && cleanup_ctid
+  exit $EXIT
+}
+function warn() {
+  local REASON="\e[97m$1\e[39m"
+  local FLAG="\e[93m[WARNING]\e[39m"
+  msg "$FLAG $REASON"
+}
+function info() {
+  local REASON="$1"
+  local FLAG="\e[36m[INFO]\e[39m"
+  msg "$FLAG $REASON"
+}
+function msg() {
+  local TEXT="$1"
+  echo -e "$TEXT"
+}
+function cleanup_ctid() {
+  if [ ! -z ${MOUNT+x} ]; then
+    pct unmount $CTID
+  fi
+  if $(pct status $CTID &>/dev/null); then
+    if [ "$(pct status $CTID | awk '{print $2}')" == "running" ]; then
+      pct stop $CTID
+    fi
+    pct destroy $CTID
+  elif [ "$(pvesm list $STORAGE --vmid $CTID)" != "" ]; then
+    pvesm free $ROOTFS
+  fi
+}
+function cleanup() {
+  popd >/dev/null
+  rm -rf $TEMP_DIR
+}
+function load_module() {
+  if ! $(lsmod | grep -Fq $1); then
+    modprobe $1 &>/dev/null || \
+      die "Failed to load '$1' module."
+  fi
+  MODULES_PATH=/etc/modules
+  if ! $(grep -Fxq "$1" $MODULES_PATH); then
+    echo "$1" >> $MODULES_PATH || \
+      die "Failed to add '$1' module to load at boot."
+  fi
+}
+TEMP_DIR=$(mktemp -d)
+pushd $TEMP_DIR >/dev/null
+
+wget -qL https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/pihole-cloudflared/pihole_cloudflared_setup.sh
+#wget -qL https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/main/pihole_cloudflared_setup.sh
+
+load_module overlay
+
+while read -r line; do
+  TAG=$(echo $line | awk '{print $1}')
+  TYPE=$(echo $line | awk '{printf "%-10s", $2}')
+  FREE=$(echo $line | numfmt --field 4-6 --from-unit=K --to=iec --format %.2f | awk '{printf( "%9sB", $6)}')
+  ITEM="  Type: $TYPE Free: $FREE "
+  OFFSET=2
+  if [[ $((${#ITEM} + $OFFSET)) -gt ${MSG_MAX_LENGTH:-} ]]; then
+    MSG_MAX_LENGTH=$((${#ITEM} + $OFFSET))
+  fi
+  STORAGE_MENU+=( "$TAG" "$ITEM" "OFF" )
+done < <(pvesm status -content rootdir | awk 'NR>1')
+if [ $((${#STORAGE_MENU[@]}/3)) -eq 0 ]; then
+  warn "'Container' needs to be selected for at least one storage location."
+  die "Unable to detect valid storage location."
+elif [ $((${#STORAGE_MENU[@]}/3)) -eq 1 ]; then
+  STORAGE=${STORAGE_MENU[0]}
+else
+  while [ -z "${STORAGE:+x}" ]; do
+    STORAGE=$(whiptail --title "Storage Pools" --radiolist \
+    "Which storage pool you would like to use for the container?\n\n" \
+    16 $(($MSG_MAX_LENGTH + 23)) 6 \
+    "${STORAGE_MENU[@]}" 3>&1 1>&2 2>&3) || exit
+  done
+fi
+info "Using '$STORAGE' for storage location."
+
+CTID=$(pvesh get /cluster/nextid)
+info "LXC ID is $CTID."
+
+msg "Updating LXC template list..."
+pveam update >/dev/null
+msg "Downloading LXC template..."
+OSTYPE=debian
+OSVERSION=${OSTYPE}-11
+mapfile -t TEMPLATES < <(pveam available -section system | sed -n "s/.*\($OSVERSION.*\)/\1/p" | sort -t - -k 2 -V)
+TEMPLATE="${TEMPLATES[-1]}"
+pveam download local $TEMPLATE >/dev/null ||
+  die "A problem occured while downloading the LXC template."
+
+STORAGE_TYPE=$(pvesm status -storage $STORAGE | awk 'NR>1 {print $2}')
+case $STORAGE_TYPE in
+  dir|nfs)
+    DISK_EXT=".raw"
+    DISK_REF="$CTID/"
+    ;;
+  zfspool)
+    DISK_PREFIX="subvol"
+    DISK_FORMAT="subvol"
+    ;;
+esac
+DISK=${DISK_PREFIX:-vm}-${CTID}-disk-0${DISK_EXT-}
+ROOTFS=${STORAGE}:${DISK_REF-}${DISK}
+
+msg "Creating LXC..."
+DISK_SIZE=4G
+pvesm alloc $STORAGE $CTID $DISK $DISK_SIZE --format ${DISK_FORMAT:-raw} >/dev/null
+if [ "$STORAGE_TYPE" == "zfspool" ]; then
+  warn "Some containers may not work properly due to ZFS not supporting 'fallocate'."
+else
+  mkfs.ext4 $(pvesm path $ROOTFS) &>/dev/null
+fi
+ARCH=$(dpkg --print-architecture)
+HOSTNAME=pi-hole-cf
+TEMPLATE_STRING="local:vztmpl/${TEMPLATE}"
+pct create $CTID $TEMPLATE_STRING -arch $ARCH -features nesting=1 \
+  -hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 1 -memory 512 \
+  -ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null
+
+MOUNT=$(pct mount $CTID | cut -d"'" -f 2)
+ln -fs $(readlink /etc/localtime) ${MOUNT}/etc/localtime
+pct unmount $CTID && unset MOUNT
+
+msg "Starting LXC..."
+pct start $CTID
+pct push $CTID pihole_cloudflared_setup.sh /pihole_cloudflared_setup.sh -perms 755
+pct exec $CTID /pihole_cloudflared_setup.sh
+
+IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
+info "Successfully created a Pi-hole with cloudflared LXC to $CTID at IP Address ${IP}"
diff --git a/pihole_cloudflared_setup.sh b/pihole_cloudflared_setup.sh
new file mode 100644
index 0000000..d67952b
--- /dev/null
+++ b/pihole_cloudflared_setup.sh
@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+
+set -o errexit  
+set -o errtrace 
+set -o nounset  
+set -o pipefail 
+shopt -s expand_aliases
+alias die='EXIT=$? LINE=$LINENO error_exit'
+trap die ERR
+trap 'die "Script interrupted."' INT
+
+function error_exit() {
+  trap - ERR
+  local DEFAULT='Unknown failure occured.'
+  local REASON="\e[97m${1:-$DEFAULT}\e[39m"
+  local FLAG="\e[91m[ERROR:LXC] \e[93m$EXIT@$LINE"
+  msg "$FLAG $REASON"
+  exit $EXIT
+}
+function msg() {
+  local TEXT="$1"
+  echo -e "$TEXT"
+}
+
+msg "Setting up LXC OS..."
+sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
+locale-gen >/dev/null
+apt-get -y purge openssh-{client,server} >/dev/null
+apt-get autoremove >/dev/null
+
+# Update container OS
+msg "Updating container OS..."
+apt update &>/dev/null
+apt-get -qqy upgrade &>/dev/null
+
+msg "Installing Prerequisites..."
+apt-get -qqy install \
+    curl \
+    sudo &>/dev/null
+
+msg "Installing cloudflared.."
+wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb
+sudo apt-get install ./cloudflared-linux-amd64.deb
+sudo useradd -s /usr/sbin/nologin -r -M cloudflared
+
+$CLOUDFLARED_CONF="/etc/default/cloudflared"
+$CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
+
+cat << EOF > $CLOUDFLARED_CONF
+# Commandline args for cloudflared, using Cloudflare DNS
+CLOUDFLARED_OPTS=--port 5053 --upstream https://1.1.1.1/dns-query --upstream https://1.0.0.1/dns-query
+EOF
+
+chown cloudflared:cloudflared /etc/default/cloudflared
+chown cloudflared:cloudflared /usr/local/bin/cloudflared
+systemctl daemon-reload
+
+cat << EOF > $CLOUDFLARED_SERVICE
+[Unit]
+Description=cloudflared DNS over HTTPS proxy
+After=syslog.target network-online.target
+
+[Service]
+Type=simple
+User=cloudflared
+EnvironmentFile=/etc/default/cloudflared
+ExecStart=/usr/local/bin/cloudflared proxy-dns $CLOUDFLARED_OPTS
+Restart=on-failure
+RestartSec=10
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+msg "Installing Pi-hole.."
+curl -sSL https://install.pi-hole.net | bash
+
+msg "Enable and start cloudflared..."
+systemctl enable --now cloudflared
+
+msg "Customizing LXC..."
+rm /etc/motd 
+rm /etc/update-motd.d/10-uname 
+touch ~/.hushlogin 
+GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
+mkdir -p $(dirname $GETTY_OVERRIDE)
+cat << EOF > $GETTY_OVERRIDE
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM
+EOF
+systemctl daemon-reload
+systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
+
+msg "Cleanup..."
+rm -rf /pihole_cloudflared_setup.sh /var/{cache,log}/* /var/lib/apt/lists/*

From 3af759514a57ced8c03975bed789641ac2657a33 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 19:40:05 +0100
Subject: [PATCH 02/12] Updated README.md

---
 README.md | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4a8dfb2..fcb0e2d 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ To create a new Proxmox Pi-hole LXC, run the following in the Proxmox web shell.
 ```
 bash -c "$(wget -qLO - https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/main/pihole_container.sh)"
 ```
-<h3 align="center" id="heading">Default Settings:  512MiB RAM - 4GB Storage - 1vCPU</h3>
+<h3 align="center" id="heading">Default Settings: 512MiB RAM - 4GB Storage - 1vCPU</h3>
  
 **Change Pi-hole password:**
  
@@ -88,6 +88,33 @@ ________________________________________________________________________________
 
 </details>
 
+<details>
+<summary markdown="span">Pi-hole with cloudflared LXC</summary>
+ 
+<h1 align="center" id="heading"> Pi-hole with cloudflared LXC </h1>
+**Please note:** I don't want discussions about cloudflared in the Issues.
+
+To create a new Proxmox Pi-hole with cloudflared LXC, run the following in the Proxmox web shell.
+
+```
+bash -c "$(wget -qLO - https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/main/pihole_cloudflared_container.sh)"
+```
+<h3 align="center" id="heading">Default Settings: 1024MiB RAM - 4GB Storage - 1vCPU</h3>
+ 
+**Change Pi-hole password:**
+ 
+Run from the LXC console
+
+```
+pihole -a -p
+```
+
+You must configure Pi-hole to use the local cloudflared service as the upstream DNS server by specifying "127.0.0.1#5053" as the "Custom DNS 1 (IPv4)". 
+
+____________________________________________________________________________________________ 
+
+</details>
+
 <details>
 <summary markdown="span">Emby Server LXC</summary>
 

From a45e1caa1afc108edd53fc9909d4abcbba1b75b9 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 19:41:58 +0100
Subject: [PATCH 03/12] Updated README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fcb0e2d..aa6591c 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,8 @@ ________________________________________________________________________________
 <summary markdown="span">Pi-hole with cloudflared LXC</summary>
  
 <h1 align="center" id="heading"> Pi-hole with cloudflared LXC </h1>
-**Please note:** I don't want discussions about cloudflared in the Issues.
+**Please note:** 
+I don't want discussions about cloudflared in the Issues.
 
 To create a new Proxmox Pi-hole with cloudflared LXC, run the following in the Proxmox web shell.
 

From 548fa18ef89d3ac01b79ddbe041ea70ce8b3b2ec Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 19:50:26 +0100
Subject: [PATCH 04/12] Updated pihole_cloudflared_setup.sh

---
 pihole_cloudflared_setup.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pihole_cloudflared_setup.sh b/pihole_cloudflared_setup.sh
index d67952b..45a3dc7 100644
--- a/pihole_cloudflared_setup.sh
+++ b/pihole_cloudflared_setup.sh
@@ -39,9 +39,9 @@ apt-get -qqy install \
     sudo &>/dev/null
 
 msg "Installing cloudflared.."
-wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb
-sudo apt-get install ./cloudflared-linux-amd64.deb
-sudo useradd -s /usr/sbin/nologin -r -M cloudflared
+wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb &>/dev/null
+sudo apt-get install ./cloudflared-linux-amd64.deb &>/dev/null
+sudo useradd -s /usr/sbin/nologin -r -M cloudflared &>/dev/null
 
 $CLOUDFLARED_CONF="/etc/default/cloudflared"
 $CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
@@ -53,7 +53,6 @@ EOF
 
 chown cloudflared:cloudflared /etc/default/cloudflared
 chown cloudflared:cloudflared /usr/local/bin/cloudflared
-systemctl daemon-reload
 
 cat << EOF > $CLOUDFLARED_SERVICE
 [Unit]
@@ -73,6 +72,8 @@ KillMode=process
 WantedBy=multi-user.target
 EOF
 
+systemctl daemon-reload
+
 msg "Installing Pi-hole.."
 curl -sSL https://install.pi-hole.net | bash
 

From d8a41e904c780e528644d270f1c3bbf4600ef71d Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 19:53:34 +0100
Subject: [PATCH 05/12] Updated README.md

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

diff --git a/README.md b/README.md
index aa6591c..d2d9293 100644
--- a/README.md
+++ b/README.md
@@ -92,8 +92,8 @@ ________________________________________________________________________________
 <summary markdown="span">Pi-hole with cloudflared LXC</summary>
  
 <h1 align="center" id="heading"> Pi-hole with cloudflared LXC </h1>
-**Please note:** 
-I don't want discussions about cloudflared in the Issues.
+
+**Please note:** I don't want discussions about cloudflared in the Issues.
 
 To create a new Proxmox Pi-hole with cloudflared LXC, run the following in the Proxmox web shell.
 

From 94983fd40638f9b02f8ca987517a85775646b3e2 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 19:54:20 +0100
Subject: [PATCH 06/12] Updated pihole_cloudflared_container.sh

---
 pihole_cloudflared_container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole_cloudflared_container.sh b/pihole_cloudflared_container.sh
index 8d510fc..08c1691 100644
--- a/pihole_cloudflared_container.sh
+++ b/pihole_cloudflared_container.sh
@@ -143,7 +143,7 @@ ARCH=$(dpkg --print-architecture)
 HOSTNAME=pi-hole-cf
 TEMPLATE_STRING="local:vztmpl/${TEMPLATE}"
 pct create $CTID $TEMPLATE_STRING -arch $ARCH -features nesting=1 \
-  -hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 1 -memory 512 \
+  -hostname $HOSTNAME -net0 name=eth0,bridge=vmbr0,ip=dhcp -onboot 1 -cores 1 -memory 1024 \
   -ostype $OSTYPE -rootfs $ROOTFS,size=$DISK_SIZE -storage $STORAGE >/dev/null
 
 MOUNT=$(pct mount $CTID | cut -d"'" -f 2)

From 1f4e56df455f37295c979405a9f3573c5fcbf738 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 20:05:52 +0100
Subject: [PATCH 07/12] Updated pihole_cloudflared_setup.sh

---
 pihole_cloudflared_setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pihole_cloudflared_setup.sh b/pihole_cloudflared_setup.sh
index 45a3dc7..69969c1 100644
--- a/pihole_cloudflared_setup.sh
+++ b/pihole_cloudflared_setup.sh
@@ -43,8 +43,8 @@ wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudfla
 sudo apt-get install ./cloudflared-linux-amd64.deb &>/dev/null
 sudo useradd -s /usr/sbin/nologin -r -M cloudflared &>/dev/null
 
-$CLOUDFLARED_CONF="/etc/default/cloudflared"
-$CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
+CLOUDFLARED_CONF="/etc/default/cloudflared"
+CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
 
 cat << EOF > $CLOUDFLARED_CONF
 # Commandline args for cloudflared, using Cloudflare DNS

From 6c5c3034cb025c5681b98af108dc75a7265fd1b8 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 20:32:55 +0100
Subject: [PATCH 08/12] Updated pihole_cloudflared_setup.sh

---
 pihole_cloudflared_setup.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pihole_cloudflared_setup.sh b/pihole_cloudflared_setup.sh
index 69969c1..82a1f72 100644
--- a/pihole_cloudflared_setup.sh
+++ b/pihole_cloudflared_setup.sh
@@ -44,8 +44,6 @@ sudo apt-get install ./cloudflared-linux-amd64.deb &>/dev/null
 sudo useradd -s /usr/sbin/nologin -r -M cloudflared &>/dev/null
 
 CLOUDFLARED_CONF="/etc/default/cloudflared"
-CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
-
 cat << EOF > $CLOUDFLARED_CONF
 # Commandline args for cloudflared, using Cloudflare DNS
 CLOUDFLARED_OPTS=--port 5053 --upstream https://1.1.1.1/dns-query --upstream https://1.0.0.1/dns-query
@@ -54,6 +52,7 @@ EOF
 chown cloudflared:cloudflared /etc/default/cloudflared
 chown cloudflared:cloudflared /usr/local/bin/cloudflared
 
+CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
 cat << EOF > $CLOUDFLARED_SERVICE
 [Unit]
 Description=cloudflared DNS over HTTPS proxy

From b6905a40109f50fa8946bc720f7798d89be178ee Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 20:51:49 +0100
Subject: [PATCH 09/12] Added cloudflared.service

---
 cloudflared.service | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 cloudflared.service

diff --git a/cloudflared.service b/cloudflared.service
new file mode 100644
index 0000000..e59c243
--- /dev/null
+++ b/cloudflared.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=cloudflared DNS over HTTPS proxy
+After=syslog.target network-online.target
+
+[Service]
+Type=simple
+User=cloudflared
+EnvironmentFile=/etc/default/cloudflared
+ExecStart=/usr/local/bin/cloudflared proxy-dns $CLOUDFLARED_OPTS
+Restart=on-failure
+RestartSec=10
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
+

From 28ee6e15400bc67c5104d40cd6b1ef88831d92b9 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 20:52:08 +0100
Subject: [PATCH 10/12] Updated pihole_cloudflared_setup.sh

---
 pihole_cloudflared_setup.sh | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pihole_cloudflared_setup.sh b/pihole_cloudflared_setup.sh
index 82a1f72..3294440 100644
--- a/pihole_cloudflared_setup.sh
+++ b/pihole_cloudflared_setup.sh
@@ -52,24 +52,7 @@ EOF
 chown cloudflared:cloudflared /etc/default/cloudflared
 chown cloudflared:cloudflared /usr/local/bin/cloudflared
 
-CLOUDFLARED_SERVICE="/etc/systemd/system/cloudflared.service"
-cat << EOF > $CLOUDFLARED_SERVICE
-[Unit]
-Description=cloudflared DNS over HTTPS proxy
-After=syslog.target network-online.target
-
-[Service]
-Type=simple
-User=cloudflared
-EnvironmentFile=/etc/default/cloudflared
-ExecStart=/usr/local/bin/cloudflared proxy-dns $CLOUDFLARED_OPTS
-Restart=on-failure
-RestartSec=10
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
-EOF
+wget -O /etc/systemd/system/cloudflared.service https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/main/cloudflared.service &>/dev/null
 
 systemctl daemon-reload
 

From d44264cd2e6261e33a9122d03116f89cdecdb4e8 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 22:55:36 +0100
Subject: [PATCH 11/12] Updated pihole_cloudflared_setup.sh

---
 pihole_cloudflared_setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pihole_cloudflared_setup.sh b/pihole_cloudflared_setup.sh
index 3294440..e7d2870 100644
--- a/pihole_cloudflared_setup.sh
+++ b/pihole_cloudflared_setup.sh
@@ -42,6 +42,7 @@ msg "Installing cloudflared.."
 wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb &>/dev/null
 sudo apt-get install ./cloudflared-linux-amd64.deb &>/dev/null
 sudo useradd -s /usr/sbin/nologin -r -M cloudflared &>/dev/null
+rm cloudflared-linux-amd64.deb
 
 CLOUDFLARED_CONF="/etc/default/cloudflared"
 cat << EOF > $CLOUDFLARED_CONF

From 450eee5405c70b7e6d054558ecd7ddd9178cc089 Mon Sep 17 00:00:00 2001
From: Steven Seifried <gitlab@canox.net>
Date: Sun, 16 Jan 2022 23:14:17 +0100
Subject: [PATCH 12/12] Updated pihole_cloudflared_container.sh

---
 pihole_cloudflared_container.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pihole_cloudflared_container.sh b/pihole_cloudflared_container.sh
index 08c1691..f8cb689 100644
--- a/pihole_cloudflared_container.sh
+++ b/pihole_cloudflared_container.sh
@@ -73,8 +73,7 @@ function load_module() {
 TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 
-wget -qL https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/pihole-cloudflared/pihole_cloudflared_setup.sh
-#wget -qL https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/main/pihole_cloudflared_setup.sh
+wget -qL https://raw.githubusercontent.com/StevenSeifried/proxmox-scripts/main/pihole_cloudflared_setup.sh
 
 load_module overlay