Pi-hole fixes

* Fix Pi-hole IPv6 DNS blocking * Add persistent docker volumes to Pi-hole * Migrate to new dosxvpn/updater image that updates all containers rather than just strongswan
dan-v · Feb 3, 2018 · d0396d9 · d0396d9
1 parent b2ae1e8
commit d0396d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/services/coreos/coreos.go b/services/coreos/coreos.go
@@ -111,6 +111,10 @@ coreos:
         [Service]
         User=root
         Type=oneshot
-        ExecStart=/bin/sh -c "modprobe dummy; ip link set dummy0 up; ifconfig dummy0 1.1.1.1/32"
+        ExecStartPre=/bin/sh -c "modprobe dummy"
+        ExecStartPre=-/bin/sh -c "ip link add dummy0 type dummy"
+        ExecStartPre=/bin/sh -c "ip link set dummy0 up"
+        ExecStartPre=-/bin/sh -c "ifconfig dummy0 inet6 add 2001:db8:1:1::1/64"
+        ExecStart=/bin/sh -c "ifconfig dummy0 1.1.1.1/32"
 `
 }
diff --git a/services/dosxvpn/dosxvpn.go b/services/dosxvpn/dosxvpn.go
@@ -38,8 +38,8 @@ func (s Service) UserData() string {
 
         [Service]
         Type=oneshot
-        ExecStartPre=/usr/bin/docker pull dosxvpn/strongswan-updater
-        ExecStart=/usr/bin/docker run --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock dosxvpn/strongswan-updater
+        ExecStartPre=/usr/bin/docker pull dosxvpn/updater:latest
+        ExecStart=/usr/bin/docker run --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock dosxvpn/updater:latest
     - name: dosxvpn-update.timer
       enable: true
       command: start
@@ -64,8 +64,8 @@ func (s Service) UserData() string {
         EnvironmentFile=/etc/environment
         ExecStartPre=-/usr/bin/docker kill dosxvpn
         ExecStartPre=-/usr/bin/docker rm dosxvpn
-        ExecStartPre=/usr/bin/docker pull dosxvpn/strongswan
-        ExecStart=/usr/bin/docker run --name dosxvpn --privileged --net=host -v ipsec.d:/etc/ipsec.d -v strongswan.d:/etc/strongswan.d -v /lib/modules:/lib/modules -v /etc/localtime:/etc/localtime -e VPN_DOMAIN=$public_ipv4 dosxvpn/strongswan
+        ExecStartPre=/usr/bin/docker pull dosxvpn/strongswan:latest
+        ExecStart=/usr/bin/docker run --name dosxvpn --privileged --net=host -v ipsec.d:/etc/ipsec.d -v strongswan.d:/etc/strongswan.d -v /lib/modules:/lib/modules -v /etc/localtime:/etc/localtime -e VPN_DOMAIN=$public_ipv4 dosxvpn/strongswan:latest
         ExecStop=/usr/bin/docker stop dosxvpn
 `
 }
diff --git a/services/pihole/pihole.go b/services/pihole/pihole.go
@@ -31,6 +31,6 @@ func (s Service) UserData() string {
         ExecStartPre=-/usr/bin/docker kill pihole
         ExecStartPre=-/usr/bin/docker rm pihole
         ExecStartPre=/usr/bin/docker pull diginc/pi-hole:latest
-        ExecStart=/usr/bin/docker run --name pihole --net=host -e ServerIP=1.1.1.1 -e WEBPASSWORD=dosxvpn diginc/pi-hole:latest
+        ExecStart=/usr/bin/docker run --name pihole --net=host -e ServerIP=1.1.1.1 -e ServerIPv6=2001:db8:1:1::1 -e WEBPASSWORD=dosxvpn -v pihole-etc:/etc/pihole -v pihole-dnsmasq.d:/etc/dnsmasq.d diginc/pi-hole:latest
         ExecStop=/usr/bin/docker stop pihole`
 }