Differences

This shows you the differences between two versions of the page.

--- debian:other-debian:pi-hole-debian [2018/11/06 16:11] – [Installation / Deployment von Pi-hole] michael
+++ debian:other-debian:pi-hole-debian [2018/12/04 15:20] – [Weiteres] michael
@@ Line 15: / Line 15: @@
 # apt-get upgrade
-# apt-get install docker
+# apt-get install docker-ce
 </code>
-''**Step 2** - Compile and install docker-compose:''<code># cd /tmp/
+''**Step 2** - Install docker-compose binary:''
-# git clone https://github.com/docker/compose.git
-# cd compose
+Neuste Version auf GitHub nachschauen: [[https://github.com/docker/compose/releases|docker-compose]]
-# docker build -t docker-compose:armhf -f Dockerfile.armhf .
-# docker run --rm --entrypoint="script/build/linux-entrypoint" -v $(pwd)/dist:/code/dist -v $(pwd)/.git:/code/.git "docker-compose:armhf"
-# ls -l
+<code># curl -L "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-# cp dist/docker-compose-Linux-armv7l /usr/local/bin/docker-compose
-# chmod 0755 /usr/local/bin/docker-compose
+# chmod +x /usr/local/bin/docker-compose
+# curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
 # docker-compose version
 </code>
-''**Step 3** - Install manpages for docker-compose:''<code>
-# curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
-</code>
 </WRAP>
@@ Line 211: / Line 204: @@
 <WRAP center box 100%>
-==== Anlegen des docker-compose files für Pi-hole ====
+==== Anlegen des docker-compose file für Pi-hole ====
 Das verwendete Image ist ausschlisslich für x86_x64 Systeme geeignet. Soll Pi-hole auf einem ARM basierten System dokerisiert installiert werden, kann [[debian:other-debian:pi-hole-debian-arm|HIER]] geschaut werden.
@@ Line 257: / Line 250: @@
 </sxh>
-**Erklärung zu den Parametern:**
+__Erklärung zu den Environment Variablen:__
   * ''**VIRTUAL_HOST**'': Die FQND von welcher später via Web-GUI auf das Pi-hole zugegriffen werden soll.
   * ''**ServerIP**'': Die Server IP-Adresse des Docker-Hosts. (Ausserhalb des Containers)
   * ''**DNS1**'': Standard Upstream-DNS-Server von Pi-hole.
-  *
+  * ''**WEBPASSWORD**'': Repräsentiert das admin-Passwort welches benötigt wird um sich am Web-GUI anzumelden.
+  * ''**WEB_PORT**'': Der Port auf welchem der Server das Admin-GUI ausliefert.
+  * ''**INTERFACE**'': Das Host-Interface. (<wrap em>Wichtig wenn Standard nicht eth0</wrap>)
 </WRAP>
@@ Line 270: / Line 265: @@
 <code>
 # docker-compose -f /opt/docker-pihole/docker_compose.yml up -d
-# docker ps </code>
+# docker ps -a</code>
 </WRAP>
@@ Line 287: / Line 282: @@
 # vim /opt/docker-pihole/dnsmasq.d/01-pihole.conf
 </code>
+<hidden 01-pihole.conf><sxh bash;>
+# Pi-hole: A black hole for Internet advertisements
+# (c) 2015, 2016 by Jacob Salmela
+# Network-wide ad blocking via your Raspberry Pi
+# http://pi-hole.net
+# dnsmasq config for Pi-hole
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+###############################################################################
+#      FILE AUTOMATICALLY POPULATED BY PI-HOLE INSTALL/UPDATE PROCEDURE.      #
+# ANY CHANGES MADE TO THIS FILE AFTER INSTALL WILL BE LOST ON THE NEXT UPDATE #
+#                                                                             #
+#        IF YOU WISH TO CHANGE THE UPSTREAM SERVERS, CHANGE THEM IN:          #
+#                      /etc/pihole/setupVars.conf                             #
+#                                                                             #
+#        ANY OTHER CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE           #
+#                        OR IN /etc/dnsmasq.conf                              #
+###############################################################################
+addn-hosts=/etc/pihole/gravity.list
+addn-hosts=/etc/pihole/black.list
+addn-hosts=/etc/pihole/local.list
+localise-queries
+no-resolv
+cache-size=10000
+log-queries=extra
+log-facility=/var/log/pihole.log
+local-ttl=2
+log-async
+server=127.0.0.1#5353
+domain-needed
+bogus-priv
+interface=enp1s0
+server=/fritz.box/192.168.1.1
+server=/1.168.192.in-addr.arpa/192.168.1.1
+</sxh>
+</hidden>
+----
 <code>
 # vim /opt/docker-pihole/pihole/blacklist.txt
 </code>
+<hidden blacklist.txt><sxh plain;>
+bvadtgs.scdn1.secure.raxcdn.com
+b6994dfa47cee4.com
+metrics.plex.tv
+gebadu.com
+pl4518712.puserving.com
+analytics.ff.avast.com
+p5-3os3pimkl6tg2-ixzsvd47ghupqap6-659208-i1-v6exp3.ds.metric.gstatic.com
+</sxh>
+</hidden>
+----
 <code>
 # vim /opt/docker-pihole/pihole/whitelist.txt
 </code>
+<hidden whitelist.txt><sxh plain;>
+raw.githubusercontent.com
+mirror1.malwaredomains.com
+sysctl.org
+zeustracker.abuse.ch
+s3.amazonaws.com
+hosts-file.net
+serials.ws
+www.serials.ws
+www.googleadservices.com
+platform.linkedin.com
+cdn.ravenjs.com
+public-assets.envato-static.com
+ipm-provider.ff.avast.com
+www.smartredirect.de
+</sxh>
+</hidden>
+----
 <code>
 # vim /opt/docker-pihole/pihole/setupVars.conf
 </code>
+<hidden setupVars.conf><sxh plain;>
+DHCP_START=192.168.1.180
+DHCP_END=192.168.1.250
+DHCP_ROUTER=192.168.1.1
+DHCP_LEASETIME=48
+PIHOLE_DOMAIN=local
+DHCP_IPv6=true
+DHCP_ACTIVE=false
+DNS_FQDN_REQUIRED=true
+DNS_BOGUS_PRIV=true
+DNSSEC=false
+CONDITIONAL_FORWARDING=true
+CONDITIONAL_FORWARDING_IP=192.168.1.1
+CONDITIONAL_FORWARDING_DOMAIN=fritz.box
+CONDITIONAL_FORWARDING_REVERSE=1.168.192.in-addr.arpa
+PIHOLE_DNS_1=127.0.0.1#5353
+PIHOLE_DNS_2=
+QUERY_LOGGING=true
+INSTALL_WEB_SERVER=true
+INSTALL_WEB_INTERFACE=true
+LIGHTTPD_ENABLED=
+IPV4_ADDRESS=192.168.1.2
+IPV6_ADDRESS=
+WEBPASSWORD=d295e1c88d5494f1f40cce9be08428e73a79792d37f4ffa6100ac283901479aa
+PIHOLE_INTERFACE=enp1s0
+</sxh>
+</hidden>
+----
 <code>
@@ Line 307: / Line 421: @@
 <WRAP center box 100%>
-==== Reverse Proxy Beispiel Setup ====
+==== Reverse Proxy Setup Beispiel ====
 <code>