summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2021-07-03 10:55:45 -0400
committerJesse Luehrs <doy@tozt.net>2021-07-03 10:55:45 -0400
commitfb3965489a7f053ddb74adf8a8bef8b3265f405a (patch)
tree6a1fab188eba461bafecc3c1e7a2bdabc8666b9b
parenta3b96b9a10464a6f6fb4957756848000319d602d (diff)
downloadpuppet-tozt-fb3965489a7f053ddb74adf8a8bef8b3265f405a.tar.gz
puppet-tozt-fb3965489a7f053ddb74adf8a8bef8b3265f405a.zip
keep the pihole log on the root filesystem
-rw-r--r--modules/pihole/manifests/init.pp8
-rw-r--r--modules/pihole/templates/pihole.service2
2 files changed, 3 insertions, 7 deletions
diff --git a/modules/pihole/manifests/init.pp b/modules/pihole/manifests/init.pp
index f568b3e..c94af67 100644
--- a/modules/pihole/manifests/init.pp
+++ b/modules/pihole/manifests/init.pp
@@ -12,12 +12,8 @@ class pihole($dir) {
"${dir}/etc-dnsmasq.d":
ensure => directory,
require => File[$dir];
- "${dir}/var-log":
- ensure => directory,
- require => File[$dir];
- "${dir}/var-log/pihole.log":
- ensure => file,
- require => File["${dir}/var-log"];
+ "/var/log/pihole.log":
+ ensure => file;
}
systemd::service { "pihole":
diff --git a/modules/pihole/templates/pihole.service b/modules/pihole/templates/pihole.service
index 291e0c7..e561f3d 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=<%= @webpassword %> -e ServerIP=127.0.0.1 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 "/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=<%= @webpassword %> -e ServerIP=127.0.0.1 docker.io/pihole/pihole:latest
ExecStop=/usr/bin/podman stop pihole
Restart=always