5 files changed, 33 insertions, 4 deletions
diff --git a/modules/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp
index a08e0a5..e28b387 100644
--- a/modules/certbot/manifests/init.pp
+++ b/modules/certbot/manifests/init.pp
@@ -1,2 +1,5 @@
 class certbot {
+  package { 'certbot':
+    ensure => installed;
+  }
 }
diff --git a/modules/dovecot/manifests/init.pp b/modules/dovecot/manifests/init.pp
index 7a4d458..925604e 100644
--- a/modules/dovecot/manifests/init.pp
+++ b/modules/dovecot/manifests/init.pp
@@ -1,2 +1,5 @@
 class dovecot {
+  package { 'dovecot':
+    ensure => installed;
+  }
 }
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index d2afd7c..d8991eb 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -1,2 +1,5 @@
 class postfix {
+  package { 'postfix':
+    ensure => installed;
+  }
 }
diff --git a/modules/tozt/manifests/mail.pp b/modules/tozt/manifests/mail.pp
index 981ce28..fd49c7f 100644
--- a/modules/tozt/manifests/mail.pp
+++ b/modules/tozt/manifests/mail.pp
@@ -1,3 +1,8 @@
 class tozt::mail {
-  include dovecot, postfix
+  include dovecot
+  include postfix
+
+  package { ['procmail', 'mutt']:
+    ensure => installed;
+  }
 }
diff --git a/modules/tozt/manifests/other_packages.pp b/modules/tozt/manifests/other_packages.pp
index 6d5ea3f..362a9b5 100644
--- a/modules/tozt/manifests/other_packages.pp
+++ b/modules/tozt/manifests/other_packages.pp
@@ -3,6 +3,7 @@ class tozt::other_packages {
     [
       "autoconf",
       "automake",
+      "bc",
       "cronie",
       "exa",
       "fd-rs",
@@ -11,12 +12,19 @@ class tozt::other_packages {
       "gcc",
       "git",
       "haveged",
+      "htop",
       "less",
       "lsof",
       "make",
+      "mlocate",
+      "ncdu",
+      "ntp",
+      "pass",
       "pkg-config",
       "puppet",
       "strace",
+      "the_silver_searcher",
+      "tmux",
       "vim",
       "zsh",
     ]:
@@ -42,8 +50,15 @@ class tozt::other_packages {
     require => Package::Makepkg['package-query'];
   }
 
-  service { 'haveged':
-    ensure => running,
-    require => Package['haveged'];
+  service {
+    'cronie':
+      ensure => running,
+      require => Package['cronie'];
+    'haveged':
+      ensure => running,
+      require => Package['haveged'];
+    'ntpd':
+      ensure => running,
+      require => Package['ntp'];
   }
 }