diff options
| author | Jesse Luehrs <doy@tozt.net> | 2021-07-01 02:22:36 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2021-07-01 02:22:36 -0400 |
| commit | 1d1921fe39e3fb10d67f926e583b028a43e4e034 (patch) | |
| tree | eacee3a2a24c725ee0f141e640e7ead66353090a /modules/pihole | |
| parent | 5c3d05ae32fa43b7cfd414a2dc6f9b239bda09bf (diff) | |
| download | puppet-tozt-1d1921fe39e3fb10d67f926e583b028a43e4e034.tar.gz puppet-tozt-1d1921fe39e3fb10d67f926e583b028a43e4e034.zip | |
Revert "try to fix pi.hole resolution"
This reverts commit 5c3d05ae32fa43b7cfd414a2dc6f9b239bda09bf.
Diffstat (limited to 'modules/pihole')
| -rw-r--r-- | modules/pihole/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/pihole/templates/pihole.service | 2 |
2 files changed, 2 insertions, 2 deletions
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 |