From c1c91fdf5b69776798a5096dc40a43d4c19d640e Mon Sep 17 00:00:00 2001 From: magicalyak Date: Fri, 8 Feb 2019 17:02:42 -0500 Subject: [PATCH 1/9] added dns options for pi-hole rockon --- pi-hole.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pi-hole.json b/pi-hole.json index 18b3889c..aed79fe1 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -11,7 +11,15 @@ [ "--restart", "always" - ] + ], + [ + "--dns", + "127.0.0.1" + ], + [ + "--dns", + "8.8.8.8" + ] ], "launch_order": 1, "ports": { From f53e048197e27153e4148f34904072334b948ff3 Mon Sep 17 00:00:00 2001 From: magicalyak Date: Sun, 10 Feb 2019 12:50:23 -0500 Subject: [PATCH 2/9] changed to default pi-hole and cleaned up --- pi-hole.json | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pi-hole.json b/pi-hole.json index aed79fe1..1ef4bfdd 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -1,17 +1,13 @@ { "Pi-Hole": { "containers": { - "pi-hole-diginc": { - "image": "diginc/pi-hole", + "pi-hole": { + "image": "pihole/piholei", "opts": [ [ "--cap-add", "NET_ADMIN" ], - [ - "--restart", - "always" - ], [ "--dns", "127.0.0.1" @@ -19,6 +15,10 @@ [ "--dns", "8.8.8.8" + ], + [ + "-e", + "IPv6=False" ] ], "launch_order": 1, @@ -38,9 +38,13 @@ }, "volumes": { "/etc/pihole": { - "description": "Choose a Share for Pi-Hole configuration. Eg: create a Share called pihole-config for this purpose alone.", - "label": "Config Storage" - } + "description": "Choose a share for Pi-Hole configuration. Eg: create a Share called pihole-config for this purpose alone.", + "label": "Pi-Hole config storage" + }, + "/etc/dnsmasq.d": { + "description": "Choose a share for dnsmasq configuration. Eg: create a Share called dnsmasq-config for this purpose alone.", + "label": "dnsmasq config storage" + } }, "environment": { "ServerIP": { @@ -48,11 +52,6 @@ "label": "Rockstor IP", "index": 1 }, - "VIRTUAL_HOST": { - "description": "Enter IP of rockstor server.", - "label": "Virtual Host", - "index": 2 - }, "DNS1": { "description": "Enter Primary DNS server. Eg: 8.8.8.8", "label": "Primary DNS Server", @@ -61,16 +60,10 @@ }, "DNS2": { "description": "Enter Secondary DNS server. Eg: 8.8.4.4", - "label": "Secondary DNS Server", + "label": "Secondary DNS Server (enter no if only one is to be used)", "index": 4, "default": "8.8.4.4" }, - "IPv6": { - "description": "Enable or Disable Pi-Hole IPv6 support. Enter: true or false", - "label": "Enable IPv6", - "index": 5, - "default": "false" - }, "WEBPASSWORD": { "description": "Enter desired webpassword for pi-hole.", "label": "Web-Password", @@ -79,13 +72,13 @@ } } }, - "description": "PI-Hole by DigInc", + "description": "The official Pi-hole Docker image", "more_info": "

PI-HOLE™: A BLACK HOLE FOR INTERNET ADVERTISEMENTS

Admin page

To access admin interface go to URL: http://[SERVERIP]/Admin

If you have different port than 80 you need to specify that in the URL.

Block Over 100,000 Ad-serving Domains

Known ad-serving domains are pulled from third party sources and compiled into one list.

Block Advertisements On Any Device

Network-level blocking allows any device to block ads, regardless of hardware or OS.

Improve Overall Network Performance

Since ads are blocked before they are downloaded, your network will perform better.

", "ui": { "slug": "admin" }, "volume_add_support": false, - "website": "https://hub.docker.com/r/diginc/pi-hole/", + "website": "https://hub.docker.com/r/pihole/pihole/", "version": "1.0" } } From 3b3e3918552c5339fb7e1110a31f6a9c19a8b560 Mon Sep 17 00:00:00 2001 From: magicalyak Date: Sun, 10 Feb 2019 15:16:26 -0500 Subject: [PATCH 3/9] Updated description --- pi-hole.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pi-hole.json b/pi-hole.json index 1ef4bfdd..b13a1cc4 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -72,13 +72,13 @@ } } }, - "description": "The official Pi-hole Docker image", + "description": "DNS Server that acts as a black hole for Internet advertisements.

Based on the official Pi-Hole docker image: https://hub.docker.com/r/pihole/pihole.", "more_info": "

PI-HOLE™: A BLACK HOLE FOR INTERNET ADVERTISEMENTS

Admin page

To access admin interface go to URL: http://[SERVERIP]/Admin

If you have different port than 80 you need to specify that in the URL.

Block Over 100,000 Ad-serving Domains

Known ad-serving domains are pulled from third party sources and compiled into one list.

Block Advertisements On Any Device

Network-level blocking allows any device to block ads, regardless of hardware or OS.

Improve Overall Network Performance

Since ads are blocked before they are downloaded, your network will perform better.

", "ui": { "slug": "admin" }, "volume_add_support": false, "website": "https://hub.docker.com/r/pihole/pihole/", - "version": "1.0" + "version": "2.0" } } From 6ba3aa7a7d17658e7f5292028a4f712e2d1e2843 Mon Sep 17 00:00:00 2001 From: magicalyak Date: Sun, 10 Feb 2019 15:44:55 -0500 Subject: [PATCH 4/9] fixed typo --- pi-hole.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pi-hole.json b/pi-hole.json index b13a1cc4..17c36d23 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -2,7 +2,7 @@ "Pi-Hole": { "containers": { "pi-hole": { - "image": "pihole/piholei", + "image": "pihole/pihole", "opts": [ [ "--cap-add", From ebd0b2f8a093e2896911f6fe9e0e8b6c2778eac0 Mon Sep 17 00:00:00 2001 From: magicalyak Date: Sun, 10 Feb 2019 15:46:58 -0500 Subject: [PATCH 5/9] fixed index numbers --- pi-hole.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pi-hole.json b/pi-hole.json index 17c36d23..e64e505b 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -55,19 +55,19 @@ "DNS1": { "description": "Enter Primary DNS server. Eg: 8.8.8.8", "label": "Primary DNS Server", - "index": 3, + "index": 2, "default": "8.8.8.8" }, "DNS2": { "description": "Enter Secondary DNS server. Eg: 8.8.4.4", "label": "Secondary DNS Server (enter no if only one is to be used)", - "index": 4, + "index": 3, "default": "8.8.4.4" }, "WEBPASSWORD": { "description": "Enter desired webpassword for pi-hole.", "label": "Web-Password", - "index": 6 + "index": 4 } } } From b1dbf18e7966f82ffe9f18f5486c692f7a922014 Mon Sep 17 00:00:00 2001 From: magicalyak Date: Mon, 11 Feb 2019 09:58:00 -0500 Subject: [PATCH 6/9] fixed website link --- pi-hole.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pi-hole.json b/pi-hole.json index e64e505b..80da8cce 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -78,7 +78,7 @@ "slug": "admin" }, "volume_add_support": false, - "website": "https://hub.docker.com/r/pihole/pihole/", + "website": "https://pi-hole.net/", "version": "2.0" } } From 899d9f5a3135ff5500374a9b3b3c9595cc8b91e0 Mon Sep 17 00:00:00 2001 From: FroggyFlox <30297881+FroggyFlox@users.noreply.github.com> Date: Mon, 11 Mar 2019 08:14:03 -0400 Subject: [PATCH 7/9] Update pi-hole.json Co-Authored-By: magicalyak --- pi-hole.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pi-hole.json b/pi-hole.json index 80da8cce..c9f29e70 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -43,7 +43,7 @@ }, "/etc/dnsmasq.d": { "description": "Choose a share for dnsmasq configuration. Eg: create a Share called dnsmasq-config for this purpose alone.", - "label": "dnsmasq config storage" + "label": "dnsmasq config" } }, "environment": { From 6e83699d13f260de1d4ed8a59edca8c8f9324aba Mon Sep 17 00:00:00 2001 From: FroggyFlox <30297881+FroggyFlox@users.noreply.github.com> Date: Mon, 11 Mar 2019 08:14:10 -0400 Subject: [PATCH 8/9] Update pi-hole.json Co-Authored-By: magicalyak --- pi-hole.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pi-hole.json b/pi-hole.json index c9f29e70..b801ee42 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -39,7 +39,7 @@ "volumes": { "/etc/pihole": { "description": "Choose a share for Pi-Hole configuration. Eg: create a Share called pihole-config for this purpose alone.", - "label": "Pi-Hole config storage" + "label": "Pi-Hole config" }, "/etc/dnsmasq.d": { "description": "Choose a share for dnsmasq configuration. Eg: create a Share called dnsmasq-config for this purpose alone.", From 72245cdbcf70fff6805743c078a143667a499ce5 Mon Sep 17 00:00:00 2001 From: Tom Gamull Date: Mon, 11 Mar 2019 08:33:38 -0400 Subject: [PATCH 9/9] Update pi-hole.json by removing DNS1 DNS2 options --- pi-hole.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pi-hole.json b/pi-hole.json index b801ee42..32f9f182 100644 --- a/pi-hole.json +++ b/pi-hole.json @@ -52,22 +52,10 @@ "label": "Rockstor IP", "index": 1 }, - "DNS1": { - "description": "Enter Primary DNS server. Eg: 8.8.8.8", - "label": "Primary DNS Server", - "index": 2, - "default": "8.8.8.8" - }, - "DNS2": { - "description": "Enter Secondary DNS server. Eg: 8.8.4.4", - "label": "Secondary DNS Server (enter no if only one is to be used)", - "index": 3, - "default": "8.8.4.4" - }, "WEBPASSWORD": { "description": "Enter desired webpassword for pi-hole.", "label": "Web-Password", - "index": 4 + "index": 2 } } }