From b03e1e7724f1cf365d3f665b0fd17c33ded661a0 Mon Sep 17 00:00:00 2001
From: simon <65259334+sujiba@users.noreply.github.com>
Date: Sun, 3 Apr 2022 16:44:50 +0200
Subject: [PATCH] changes

---
 docker-build/.unbound-v1.9_pihole.conf.swp | Bin 12288 -> 0 bytes
 docker-build/Dockerfile                    |   5 ++---
 docker-build/unbound-v1.13.1_pihole.conf   |   3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 docker-build/.unbound-v1.9_pihole.conf.swp

diff --git a/docker-build/.unbound-v1.9_pihole.conf.swp b/docker-build/.unbound-v1.9_pihole.conf.swp
deleted file mode 100644
index c8007be5788a7aa0a4ac21e7e8cd417110b24a09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeHNON$*v811<59Tg+G(=VAtNSMBN?wy%CGj}6-AtS`ZOrp4uP~Ba9yO{2(wyOHx
zbQA?$C<w-lpc{XKpbOoIt^_yY)}6Zu{(vk!)sJ~Z2G^15;n34vRo~-$=c{IzidNp(
zzD%2gae(WYAo%*%*V)Opr@@;)27wWUlJ5O~T$fpVUa8&ioY3K1$#BQ58{{fx`Jt8X
zHwK3nRa_NZS~E;kyvy~l6q(9-Sjk9LG6}P~<hohiO$eh(<jJrfpN|GxH`_IXSjqH|
z5C7m9@C+Qq!0}*pJX&$1OQ%lKiDz#dHPOHK40r}S1D*lTfM>un;2H1?cn1E54A}Bm
z@B#9AsLO4uyC1vn-aY!8XTUSy8So5v20R0v0ndPEz%$?(@C<kcJOd9P11t%GpC1Mu
zLGbwhfB*OYy{CiV7vL-46X0V&0ylvxz{|i87y$R43WC3YyTF&gtH1^@0scN71YZC%
zAO+3<&jBZZZ=MW-&w)F@I`I1wLGT0cJ@6SY1zrMP1pas&c7Tt74}m+61;Km3yTBRX
z1>kw$?xR8Q8}J?QE$}HY11<mr1i+uj)#dw>%h_L^0ndPEz%$?(cn}#NTuY@Eb7pzS
zl0<W3rj+u{mFaYdvpz?RCo67zvl;%^>e0%e`8jfYV>}p5+??TPe1wU~)?mE8*3Ow6
zF=xw}**rLBi7rV~X--W{aZM_v<|rU-UnR}tj2nE%acOP14PzE(JT&4qpVD}JQZz$_
znH?G!jW^qYB@!~$oEc8dLUIeqDypo=-LHj$=WFLKw=Rqdbv%!%bV{S%Ko=cOElQpf
z#!{|H7|NNRapF={v&>nP$|7z!Do_rFsNtHdW@##7GNst<^N>{$+6+M@sM@HBe~GS0
zgw?zxlc_3CDB@(`OvC~QCzlbvbg%k!5>oD&r!^H|L`ZH1v@Ho{b75;rl}2vHQf0U{
zq$??foVi7&V0liG+lA7*hA<B=8Hkay9KpB7mPyzHfnYU{U0S+!sT$6A2`4t;q+l|3
zEM)HPj(Ad3_dz;`2a+WgsX3?7pyj&MJmogdrc{F&)R&g%dIn;Z%xhw0nG0|TZ;2|H
zkoYxYmNEtt$XimX`8yRHVlwVp@T4<xwG9k<Y8^CrrxZ8Efjxe!6q+Y}ojPH_5^Qu*
z<B2plg6c}$No};Y(aL^_cB&bwYheMY+Kf|oN)_BmDp7eCG#peQCe>`_SYcLxWhX?#
ziwGf?T17c8`oyob(=T0oZRg;uPHj%K9cw5jlwO(;+=n8WLUvu+C<<lPmS#E}Cc?z3
zLca`35xSGM1JrwH_s-KATSZYF!UPhHbzRyJ0o|&HTdNzJjds#XBQ;G4w@l=Hm=~2i
z-AIZquu@n^?RJ+LlPFXF#GrjkyHYLC0SW{oYC>u|moA`lOoh4{Rd6fNDy<kYrV}n*
zG=|5aK`F|TBfEWRTtl@{w%$y_ENcR_x-vF|`Z9EKLbnw<0qRZBJaI<NG-!%N231&Y
z%H^g&LNOvRbpFaKH+BxiFv}}!E&GnII|t<6w#tNQBnO)dVbOPuN%Yv9>(lU4S;T<`
zY)xvVY=}t~oqlRKXL^{6sIS7%jSia8Q(X<WQ>s<vdbTl}@RU`#C8x&5RFh80;$5h0
zc~5r>frd_nOk7}y0R3VGPGaYEXZA*8uWzkIhVF5064WPGECFp!#<@VA*nF`M7p~Er
zN3^=j%$z*Xv(Q~RIUv02T!VQ<*6k9xai%pbctnv_3#{+=k(AA`*=%2(ueF7POT!A@
z=v~QPVs9a^1;ai9;pE(PJ6LY^0f}8(=GcXr;G2!$tVE`Be%4u?4CqZ%geF$45#-oL
zoT&Svz07L2kK$9}JfO@@D~^rEptD0bVUFz%hWF|SD>g3oRe|R!Is7cjwf*r@X*;F$
z)z$T;0uTW9Bo;$gqwz-bp&hm1f!jzK_?c4o-NrX$mWmuxJHe>go?yC-2IuT&2NVNd
dx;0LfrsT0mu^TRvsSO6)O9(0n+EPw~e*onK2y_4d

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index c8c1d84..78b14c5 100644
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -17,9 +17,8 @@ COPY unbound-v1.13.1_pihole.conf  /etc/unbound/unbound.conf.d/pihole.conf
 # Create the chroot directory and generate root.key.
 # Copy / move files and change owner.
 RUN wget -O root.hints https://www.internic.net/domain/named.root && \
-    mkdir /usr/local/etc/unbound && \
-    mv root.hints /usr/local/etc/unbound/ && \
-    chown -R unbound:unbound /usr/local/etc/unbound/root.*
+    mv root.hints /var/lib/unbound/ && \
+    chown -R unbound:unbound /var/lib/unbound/root.hints
 
 # Unbound startup script
 COPY start_unbound_and_s6_init.sh start_unbound_and_s6_init.sh
diff --git a/docker-build/unbound-v1.13.1_pihole.conf b/docker-build/unbound-v1.13.1_pihole.conf
index 2d0ca89..dce59c4 100644
--- a/docker-build/unbound-v1.13.1_pihole.conf
+++ b/docker-build/unbound-v1.13.1_pihole.conf
@@ -17,7 +17,8 @@ server:
     prefer-ip6: no
 
     # Enable DNSSEC
-    auto-trust-anchor-file: "/var/lib/unbound/root.key"
+    # Enabled with root-auto-trust-anchor-file.conf
+    #auto-trust-anchor-file: "/var/lib/unbound/root.key"
 
     # where to find root server data
     root-hints: "/var/lib/unbound/root.hints"