split up "other_packages"

20 files changed, 154 insertions, 81 deletions

diff --git a/modules/c_toolchain/manifests/init.pp b/modules/c_toolchain/manifests/init.pp
new file mode 100644
index 0000000..2f9a364
--- /dev/null
+++ b/modules/c_toolchain/manifests/init.pp
@@ -0,0 +1,12 @@
+class c_toolchain {
+  package {
+    [
+      "autoconf",
+      "automake",
+      "gcc",
+      "make",
+      "pkgconf",
+    ]:
+    ensure => installed,
+  }
+}
diff --git a/modules/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp
index 9c733f3..5ace225 100644
--- a/modules/certbot/manifests/init.pp
+++ b/modules/certbot/manifests/init.pp
@@ -1,4 +1,6 @@
 class certbot {
+  include cron
+
   package { 'certbot':
     ensure => installed;
   }
@@ -9,7 +11,7 @@ class certbot {
       mode => '0755',
       require => [
         Package['certbot'],
-        Package['cronie'],
+        Class['cron'],
       ];
     '/etc/letsencrypt/renewal-hooks':
       ensure => directory,
diff --git a/modules/conf/manifests/init.pp b/modules/conf/manifests/init.pp
index ffcf320..3d7b716 100644
--- a/modules/conf/manifests/init.pp
+++ b/modules/conf/manifests/init.pp
@@ -7,6 +7,19 @@ define conf($user=$name, $home=undef) {
     default => $home,
   }
 
+  include cron
+  include git
+
+  package {
+    [
+      "cmake",
+      "fortune-mod",
+      "less",
+      "vim",
+    ]:
+    ensure => installed,
+  }
+
   package::cargo { "fancy-prompt for $user":
     package => 'fancy-prompt',
     user => $user,
@@ -22,7 +35,7 @@ define conf($user=$name, $home=undef) {
     require => [
       User[$user],
       File[$_home],
-      Package["git"],
+      Class['git'],
     ];
   }
 
@@ -36,15 +49,13 @@ define conf($user=$name, $home=undef) {
     ],
     creates => "$_home/.vimrc",
     require => [
+      Class['cron'],
+      Class['c_toolchain'],
       User[$user],
       Exec["git clone doy/conf for $user"],
       Package["vim"],
-      Package["make"],
-      Package["git"],
-      Package["cronie"],
       Package["fortune-mod"],
       Package["less"],
-      Package["gcc"],
       Package::Cargo["fancy-prompt for $user"],
     ];
   }
diff --git a/modules/cron/manifests/init.pp b/modules/cron/manifests/init.pp
new file mode 100644
index 0000000..9181c40
--- /dev/null
+++ b/modules/cron/manifests/init.pp
@@ -0,0 +1,11 @@
+class cron {
+  package { "cronie":
+    ensure => installed,
+  }
+
+  service { 'cronie':
+    ensure => running,
+    enable => true,
+    require => Package['cronie'];
+  }
+}
diff --git a/modules/git/manifests/init.pp b/modules/git/manifests/init.pp
new file mode 100644
index 0000000..bfb60ad
--- /dev/null
+++ b/modules/git/manifests/init.pp
@@ -0,0 +1,5 @@
+class git {
+  package { "git":
+    ensure => installed,
+  }
+}
diff --git a/modules/haveged/manifests/init.pp b/modules/haveged/manifests/init.pp
new file mode 100644
index 0000000..05ae5f8
--- /dev/null
+++ b/modules/haveged/manifests/init.pp
@@ -0,0 +1,11 @@
+class haveged {
+  package { "haveged":
+    ensure => installed,
+  }
+
+  service { 'haveged':
+    ensure => running,
+    enable => true,
+    require => Package['haveged'],
+  }
+}
diff --git a/modules/locate/manifests/init.pp b/modules/locate/manifests/init.pp
new file mode 100644
index 0000000..b7055d9
--- /dev/null
+++ b/modules/locate/manifests/init.pp
@@ -0,0 +1,5 @@
+class locate {
+  package { "mlocate":
+    ensure => installed,
+  }
+}
diff --git a/modules/nginx/manifests/config.pp b/modules/nginx/manifests/config.pp
index a55d40c..4987851 100644
--- a/modules/nginx/manifests/config.pp
+++ b/modules/nginx/manifests/config.pp
@@ -1,4 +1,6 @@
 class nginx::config {
+  include haveged
+
   file {
     "/etc/nginx/sites-available":
       ensure => directory;
@@ -16,6 +18,6 @@ class nginx::config {
     path => '/usr/bin',
     creates => '/etc/nginx/dhparam.pem',
     timeout => 3600,
-    require => Service["haveged"];
+    require => Class["haveged"];
   }
 }
diff --git a/modules/package/manifests/makepkg.pp b/modules/package/manifests/makepkg.pp
index 7692b17..90a4bcf 100644
--- a/modules/package/manifests/makepkg.pp
+++ b/modules/package/manifests/makepkg.pp
@@ -6,6 +6,8 @@ define package::makepkg($ensure, $build_user, $asdeps=false) {
     $extra_cmdline = ""
   }
 
+  include git
+
   case $ensure {
     'installed': {
       exec { "makepkg install $name":
@@ -22,8 +24,8 @@ define package::makepkg($ensure, $build_user, $asdeps=false) {
         path => "/usr/bin",
         require => [
           Tozt::User[$build_user],
-          Package["git"],
-          Package["pkgconf"],
+          Class["git"],
+          Class["c_toolchain"],
         ];
       }
     }
diff --git a/modules/pass/manifests/init.pp b/modules/pass/manifests/init.pp
new file mode 100644
index 0000000..d9c8c10
--- /dev/null
+++ b/modules/pass/manifests/init.pp
@@ -0,0 +1,5 @@
+class pass {
+  package { "pass":
+    ensure => installed,
+  }
+}
diff --git a/modules/pass/manifests/user.pp b/modules/pass/manifests/user.pp
new file mode 100644
index 0000000..fcc07d7
--- /dev/null
+++ b/modules/pass/manifests/user.pp
@@ -0,0 +1,5 @@
+class pass::user($user=$name) {
+  include pass
+
+  # XXX setup repositories
+}
diff --git a/modules/tarsnap/manifests/init.pp b/modules/tarsnap/manifests/init.pp
index 4dbf250..38c4a7e 100644
--- a/modules/tarsnap/manifests/init.pp
+++ b/modules/tarsnap/manifests/init.pp
@@ -1,4 +1,6 @@
 class tarsnap {
+  include cron
+
   package { 'tarsnap':
     ensure => installed;
   }
@@ -18,7 +20,7 @@ class tarsnap {
       require => [
         File['/etc/acts.conf'],
         Package::Makepkg['acts'],
-        Package['cronie'],
+        Class['cron'],
       ];
   }
 }
diff --git a/modules/tozt/manifests/bootstrap.pp b/modules/tozt/manifests/bootstrap.pp
index a7c329d..da1c17b 100644
--- a/modules/tozt/manifests/bootstrap.pp
+++ b/modules/tozt/manifests/bootstrap.pp
@@ -1,4 +1,8 @@
 class tozt::bootstrap {
+  package { "puppet":
+    ensure => installed,
+  }
+
   file { '/usr/local/bin/puppet-tozt':
     source => 'puppet:///modules/tozt/puppet-tozt',
     mode => '0755';
diff --git a/modules/tozt/manifests/init.pp b/modules/tozt/manifests/init.pp
index 7ad6be4..17a364c 100644
--- a/modules/tozt/manifests/init.pp
+++ b/modules/tozt/manifests/init.pp
@@ -9,6 +9,7 @@ class tozt {
   include tozt::irc
   include tozt::backups
   include tozt::site
-  include tozt::other_packages
+  include tozt::services
+  include tozt::tools
   include tozt::vpn
 }
diff --git a/modules/tozt/manifests/other_packages.pp b/modules/tozt/manifests/other_packages.pp
deleted file mode 100644
index 774d60d..0000000
--- a/modules/tozt/manifests/other_packages.pp
+++ /dev/null
@@ -1,67 +0,0 @@
-class tozt::other_packages {
-  package {
-    [
-      "autoconf",
-      "automake",
-      "bc",
-      "cmake",
-      "cronie",
-      "exa",
-      "fortune-mod",
-      "fzf",
-      "gcc",
-      "git",
-      "haveged",
-      "htop",
-      "less",
-      "lsof",
-      "make",
-      "mlocate",
-      "ncdu",
-      "ntp",
-      "pass",
-      "pkgconf",
-      "puppet",
-      "strace",
-      "the_silver_searcher",
-      "tmux",
-      "vim",
-      "zsh",
-    ]:
-    ensure => 'installed';
-  }
-
-  package {
-    [
-      "yajl"
-    ]:
-    ensure => 'installed',
-    install_options => ["--asdeps"];
-  }
-
-  package::makepkg { 'package-query':
-    ensure => installed,
-    asdeps => true,
-    require => Package['yajl'];
-  }
-
-  package::makepkg { 'yaourt':
-    ensure => installed,
-    require => Package::Makepkg['package-query'];
-  }
-
-  service {
-    'cronie':
-      ensure => running,
-      enable => true,
-      require => Package['cronie'];
-    'haveged':
-      ensure => running,
-      enable => true,
-      require => Package['haveged'];
-    'ntpd':
-      ensure => running,
-      enable => true,
-      require => Package['ntp'];
-  }
-}
diff --git a/modules/tozt/manifests/services.pp b/modules/tozt/manifests/services.pp
new file mode 100644
index 0000000..5b96873
--- /dev/null
+++ b/modules/tozt/manifests/services.pp
@@ -0,0 +1,18 @@
+class tozt::services {
+  package {
+    [
+      "mlocate",
+      "ntpd",
+    ]:
+    ensure => installed,
+  }
+
+  service {
+    'ntpd':
+      ensure => running,
+      enable => true,
+      require => Package['ntp'];
+  }
+
+  # XXX configure mlocate
+}
diff --git a/modules/tozt/manifests/tools.pp b/modules/tozt/manifests/tools.pp
new file mode 100644
index 0000000..9406061
--- /dev/null
+++ b/modules/tozt/manifests/tools.pp
@@ -0,0 +1,18 @@
+class tozt::tools {
+  include yaourt
+
+  package {
+    [
+      "bc",
+      "exa",
+      "fzf",
+      "htop",
+      "lsof",
+      "ncdu",
+      "strace",
+      "the_silver_searcher",
+      "tmux",
+    ]:
+    ensure => 'installed';
+  }
+}
diff --git a/modules/tozt/manifests/user.pp b/modules/tozt/manifests/user.pp
index cb7be31..0f095fd 100644
--- a/modules/tozt/manifests/user.pp
+++ b/modules/tozt/manifests/user.pp
@@ -42,6 +42,8 @@ define tozt::user(
 
   rust::user { $user:
   }
+  pass::user { $user:
+  }
 
   conf { $user:
   }
@@ -52,8 +54,7 @@ define tozt::user(
   }
 
   if $shell == '/usr/bin/zsh' {
-    Package['zsh'] -> User[$user]
+    include zsh
+    Class['zsh'] -> User[$user]
   }
-
-  # XXX set up password-store
 }
diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp
new file mode 100644
index 0000000..871cac8
--- /dev/null
+++ b/modules/yaourt/manifests/init.pp
@@ -0,0 +1,20 @@
+class yaourt {
+  package {
+    [
+      "yajl"
+    ]:
+    ensure => 'installed',
+    install_options => ["--asdeps"];
+  }
+
+  package::makepkg { 'package-query':
+    ensure => installed,
+    asdeps => true,
+    require => Package['yajl'];
+  }
+
+  package::makepkg { 'yaourt':
+    ensure => installed,
+    require => Package::Makepkg['package-query'];
+  }
+}
diff --git a/modules/zsh/manifests/init.pp b/modules/zsh/manifests/init.pp
new file mode 100644
index 0000000..e6f97aa
--- /dev/null
+++ b/modules/zsh/manifests/init.pp
@@ -0,0 +1,5 @@
+class zsh {
+  package { "zsh":
+    ensure => installed,
+  }
+}