8 files changed, 3 insertions, 28 deletions
diff --git a/modules/base/templates/hosts b/modules/base/templates/hosts
index 73bfc38..63fe815 100644
--- a/modules/base/templates/hosts
+++ b/modules/base/templates/hosts
@@ -1,6 +1,2 @@
 127.0.0.1 localhost
 127.0.1.1 <%= @hostname %>.localdomain <%= @hostname %>
-
-<% @vpn_ips.each do |hostname, ip| -%>
-<%= ip %> <%= hostname %>.algo
-<% end -%>
diff --git a/modules/borgmatic/manifests/init.pp b/modules/borgmatic/manifests/init.pp
index fe1e4fd..7b409d6 100644
--- a/modules/borgmatic/manifests/init.pp
+++ b/modules/borgmatic/manifests/init.pp
@@ -1,4 +1,4 @@
-class borgmatic($host = 'partofme.algo', $extra_paths = []) {
+class borgmatic($host = 'partofme', $extra_paths = []) {
   package { 'borgmatic':
     ensure => installed;
   }
diff --git a/modules/mail/manifests/backups.pp b/modules/mail/manifests/backups.pp
index 013d651..1195dd4 100644
--- a/modules/mail/manifests/backups.pp
+++ b/modules/mail/manifests/backups.pp
@@ -1,6 +1,6 @@
 class mail::backups {
   class { 'borgmatic':
     extra_paths => ['/media/persistent'],
-    require => Service["wg-quick@algo"];
+    require => Service["tailscaled"];
   }
 }
diff --git a/modules/mail/manifests/operatingsystem.pp b/modules/mail/manifests/operatingsystem.pp
index 9863a3f..26c307e 100644
--- a/modules/mail/manifests/operatingsystem.pp
+++ b/modules/mail/manifests/operatingsystem.pp
@@ -1,5 +1,4 @@
 class mail::operatingsystem {
   include reflector
   include tailscale
-  include wireguard
 }
diff --git a/modules/partofme/manifests/operatingsystem.pp b/modules/partofme/manifests/operatingsystem.pp
index 04fc393..7f25635 100644
--- a/modules/partofme/manifests/operatingsystem.pp
+++ b/modules/partofme/manifests/operatingsystem.pp
@@ -1,7 +1,6 @@
 class partofme::operatingsystem {
   include reflector
   include tailscale
-  include wireguard
   
   file {
     '/etc/mkinitcpio.conf':
diff --git a/modules/tozt/manifests/backups.pp b/modules/tozt/manifests/backups.pp
index 086de4e..28b3d0d 100644
--- a/modules/tozt/manifests/backups.pp
+++ b/modules/tozt/manifests/backups.pp
@@ -1,6 +1,6 @@
 class tozt::backups {
   class { 'borgmatic':
     extra_paths => ['/media/persistent'],
-    require => Service["wg-quick@algo"];
+    require => Service["tailscaled"];
   }
 }
diff --git a/modules/tozt/manifests/operatingsystem.pp b/modules/tozt/manifests/operatingsystem.pp
index 18e801e..e62376d 100644
--- a/modules/tozt/manifests/operatingsystem.pp
+++ b/modules/tozt/manifests/operatingsystem.pp
@@ -1,5 +1,4 @@
 class tozt::operatingsystem {
   include reflector
   include tailscale
-  include wireguard
 }
diff --git a/modules/wireguard/manifests/init.pp b/modules/wireguard/manifests/init.pp
deleted file mode 100644
index e988b66..0000000
--- a/modules/wireguard/manifests/init.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class wireguard {
-  package { ["wireguard-tools", "openresolv"]:
-    ensure => installed,
-  }
-
-  secret { "/etc/wireguard/algo.conf":
-    source => "wireguard",
-  }
-
-  service { "wg-quick@algo":
-    ensure => running,
-    enable => true,
-    require => [
-      Package["wireguard-tools"],
-      Secret["/etc/wireguard/algo.conf"],
-    ],
-  }
-}