From a62d11a5511d5956ef8cec02ab0ad63f7ff82ef0 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 26 May 2022 02:10:53 -0400 Subject: Revert "actually, only do this for pihole for now" This reverts commit a496381cba5df70cb757aa2c437bf7ecff22e316. --- modules/pihole/manifests/init.pp | 5 ----- modules/podman/manifests/init.pp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/pihole/manifests/init.pp b/modules/pihole/manifests/init.pp index ec60203..fe90a31 100644 --- a/modules/pihole/manifests/init.pp +++ b/modules/pihole/manifests/init.pp @@ -1,10 +1,6 @@ class pihole($dir) { include podman - package { "cni-plugins": - ensure => installed; - } - $webpassword = secret::value("pihole") file { @@ -29,7 +25,6 @@ class pihole($dir) { enable => true, require => [ Package["podman"], - Package["cni-plugins"], File["${dir}/etc-pihole"], File["${dir}/etc-dnsmasq.d"], File["/var/log/pihole.log"], diff --git a/modules/podman/manifests/init.pp b/modules/podman/manifests/init.pp index c40b41d..741911e 100644 --- a/modules/podman/manifests/init.pp +++ b/modules/podman/manifests/init.pp @@ -1,5 +1,5 @@ class podman { - package { "podman": + package { ["podman", "cni-plugins"]: ensure => installed; } } -- cgit v1.2.3-54-g00ecf