From e1ddad5701280279dceb80d00ca3e36e75e6ce23 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 27 Mar 2023 06:27:48 -0400
Subject: require explicitly opting into wireguard

because machines need to be configured for it first
---
 modules/base/manifests/init.pp                | 1 -
 modules/base/manifests/vpn.pp                 | 3 ---
 modules/mail/manifests/operatingsystem.pp     | 2 ++
 modules/partofme/manifests/operatingsystem.pp | 2 ++
 modules/tozt/manifests/operatingsystem.pp     | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 modules/base/manifests/vpn.pp

diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index c898da5..8e6566f 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -6,5 +6,4 @@ class base($extra_script="") {
   contain base::services
   contain base::tools
   contain base::users
-  contain base::vpn
 }
diff --git a/modules/base/manifests/vpn.pp b/modules/base/manifests/vpn.pp
deleted file mode 100644
index 91a9935..0000000
--- a/modules/base/manifests/vpn.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class base::vpn {
-  include wireguard
-}
diff --git a/modules/mail/manifests/operatingsystem.pp b/modules/mail/manifests/operatingsystem.pp
index a9bd1de..8a02700 100644
--- a/modules/mail/manifests/operatingsystem.pp
+++ b/modules/mail/manifests/operatingsystem.pp
@@ -1,4 +1,6 @@
 class mail::operatingsystem {
+  include wireguard
+  
   file { '/etc/pacman.d/mirrorlist':
     source => 'puppet:///modules/mail/mirrorlist';
   }
diff --git a/modules/partofme/manifests/operatingsystem.pp b/modules/partofme/manifests/operatingsystem.pp
index 087ddcd..e6c5a15 100644
--- a/modules/partofme/manifests/operatingsystem.pp
+++ b/modules/partofme/manifests/operatingsystem.pp
@@ -1,4 +1,6 @@
 class partofme::operatingsystem {
+  include wireguard
+  
   file {
     '/etc/mkinitcpio.conf':
       source => 'puppet:///modules/partofme/mkinitcpio.conf',
diff --git a/modules/tozt/manifests/operatingsystem.pp b/modules/tozt/manifests/operatingsystem.pp
index 4d4ab53..fa43938 100644
--- a/modules/tozt/manifests/operatingsystem.pp
+++ b/modules/tozt/manifests/operatingsystem.pp
@@ -1,4 +1,6 @@
 class tozt::operatingsystem {
+  include wireguard
+  
   file { '/etc/pacman.d/mirrorlist':
     source => 'puppet:///modules/tozt/mirrorlist';
   }
-- 
cgit v1.2.3-54-g00ecf