summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/partofme/manifests/pihole.pp3
-rw-r--r--modules/pihole/manifests/init.pp2
-rw-r--r--modules/pihole/templates/pihole.service2
3 files changed, 3 insertions, 4 deletions
diff --git a/modules/partofme/manifests/pihole.pp b/modules/partofme/manifests/pihole.pp
index fc37dcd..0f802c6 100644
--- a/modules/partofme/manifests/pihole.pp
+++ b/modules/partofme/manifests/pihole.pp
@@ -1,6 +1,5 @@
class partofme::pihole {
class { "pihole":
- dir => "/media/persistent/pihole",
- server_ip => "192.168.0.128";
+ dir => "/media/persistent/pihole";
}
}
diff --git a/modules/pihole/manifests/init.pp b/modules/pihole/manifests/init.pp
index 0064435..aacbbd7 100644
--- a/modules/pihole/manifests/init.pp
+++ b/modules/pihole/manifests/init.pp
@@ -1,4 +1,4 @@
-class pihole($dir, $server_ip) {
+class pihole($dir) {
include podman
file {
diff --git a/modules/pihole/templates/pihole.service b/modules/pihole/templates/pihole.service
index 8aeee1a..bfcd3d9 100644
--- a/modules/pihole/templates/pihole.service
+++ b/modules/pihole/templates/pihole.service
@@ -3,7 +3,7 @@ Description=runs pihole
After=network.target
[Service]
-ExecStart=/usr/bin/podman run --rm --name pihole -p 53:53/tcp -p 53:53/udp -p 80:80 -e TZ=America/New_York -v "<%= @dir %>/etc-pihole/:/etc/pihole/" -v "<%= @dir %>/etc-dnsmasq.d/:/etc/dnsmasq.d/" -v "<%= @dir %>/var-log/pihole.log:/var/log/pihole.log" --dns 127.0.0.1 --dns 4.2.2.4 --hostname pi.hole -e VIRTUAL_HOST=pi.hole -e PROXY_LOCATION=pi.hole -e WEBPASSWORD=test -e ServerIP=<%= @server_ip %> docker.io/pihole/pihole:latest
+ExecStart=/usr/bin/podman run --rm --name pihole -p 53:53/tcp -p 53:53/udp -p 80:80 -e TZ=America/New_York -v "<%= @dir %>/etc-pihole/:/etc/pihole/" -v "<%= @dir %>/etc-dnsmasq.d/:/etc/dnsmasq.d/" -v "<%= @dir %>/var-log/pihole.log:/var/log/pihole.log" --dns 127.0.0.1 --dns 4.2.2.4 --hostname pi.hole -e VIRTUAL_HOST=pi.hole -e PROXY_LOCATION=pi.hole -e WEBPASSWORD=test -e ServerIP=127.0.0.1 docker.io/pihole/pihole:latest
ExecStop=/usr/bin/docker stop pihole
Restart=always