Refactor base and workstation profile

manifests/profile/base.pp → manifests/base.pp

-class nest::profile::base {
-  contain '::nest::profile::base::puppet'
-  contain '::nest::profile::base::git'
-  contain '::nest::profile::base::packages'
-  contain '::nest::profile::base::qemu'
-  contain '::nest::profile::base::ssh'
-  contain '::nest::profile::base::users'
+class nest::base {
+  contain '::nest::base::puppet'
+  contain '::nest::base::git'
+  contain '::nest::base::packages'
+  contain '::nest::base::qemu'
+  contain '::nest::base::ssh'
+  contain '::nest::base::users'
 
   # Git should be installed before managing any Vcsrepos
-  Class['::nest::profile::base::git'] -> Vcsrepo <| provider == git |>
+  Class['::nest::base::git'] -> Vcsrepo <| provider == git |>
 
   case $facts['osfamily'] {
     'Gentoo': {
-      contain '::nest::profile::base::bootloader'
-      contain '::nest::profile::base::distcc'
-      contain '::nest::profile::base::distccd'
-      contain '::nest::profile::base::dracut'
-      contain '::nest::profile::base::firewall'
-      contain '::nest::profile::base::fs'
-      contain '::nest::profile::base::fstab'
-      contain '::nest::profile::base::kernel'
-      contain '::nest::profile::base::mta'
-      contain '::nest::profile::base::network'
-      contain '::nest::profile::base::openvpn'
-      contain '::nest::profile::base::portage'
-      contain '::nest::profile::base::sudo'
-      contain '::nest::profile::base::systemd'
-      contain '::nest::profile::base::zfs'
+      contain '::nest::base::bootloader'
+      contain '::nest::base::distcc'
+      contain '::nest::base::distccd'
+      contain '::nest::base::dracut'
+      contain '::nest::base::firewall'
+      contain '::nest::base::fs'
+      contain '::nest::base::fstab'
+      contain '::nest::base::kernel'
+      contain '::nest::base::mta'
+      contain '::nest::base::network'
+      contain '::nest::base::openvpn'
+      contain '::nest::base::portage'
+      contain '::nest::base::sudo'
+      contain '::nest::base::systemd'
+      contain '::nest::base::zfs'
 
       unless $nest and $nest['profile'] == 'beaglebone' {
-        contain '::nest::profile::base::lvm'
-        contain '::nest::profile::base::plymouth'
+        contain '::nest::base::lvm'
+        contain '::nest::base::plymouth'
 
         # Rebuild initramfs after plymouth changes
-        Class['::nest::profile::base::plymouth']
-        ~> Class['::nest::profile::base::dracut']
+        Class['::nest::base::plymouth']
+        ~> Class['::nest::base::dracut']
       }
 
       # Setup distcc before portage, but distccd needs systemd, which is
       # installed after portage is configured.
-      Class['::nest::profile::base::distcc']
-      -> Class['::nest::profile::base::portage']
-      -> Class['::nest::profile::base::distccd']
+      Class['::nest::base::distcc']
+      -> Class['::nest::base::portage']
+      -> Class['::nest::base::distccd']
 
       # Portage should be configured before any packages are installed/changed
-      Class['::nest::profile::base::portage'] -> Package <| title != 'sys-devel/distcc' and
+      Class['::nest::base::portage'] -> Package <| title != 'sys-devel/distcc' and
                                                             title != 'dev-vcs/git' and
                                                             title != 'app-admin/eselect' |>
-      Class['::nest::profile::base::portage'] -> Nest::Lib::Portage::Package_use <| |>
+      Class['::nest::base::portage'] -> Nest::Lib::Portage::Package_use <| |>
 
       # Portage configuration (profile) responsible for installing systemd
-      Class['::nest::profile::base::portage']
-      -> Class['::nest::profile::base::systemd']
+      Class['::nest::base::portage']
+      -> Class['::nest::base::systemd']
 
       # Dracut depends on systemd/console setup
-      Class['::nest::profile::base::systemd']
-      ~> Class['::nest::profile::base::dracut']
+      Class['::nest::base::systemd']
+      ~> Class['::nest::base::dracut']
 
       # Rebuild initramfs and reconfigure bootloader after kernel changes
-      Class['::nest::profile::base::kernel']
-      ~> Class['::nest::profile::base::dracut']
-      ~> Class['::nest::profile::base::bootloader']
+      Class['::nest::base::kernel']
+      ~> Class['::nest::base::dracut']
+      ~> Class['::nest::base::bootloader']
 
       # Rebuild initramfs after ZFS changes
-      Class['::nest::profile::base::kernel']
-      -> Class['::nest::profile::base::zfs']
-      ~> Class['::nest::profile::base::dracut']
+      Class['::nest::base::kernel']
+      -> Class['::nest::base::zfs']
+      ~> Class['::nest::base::dracut']
 
       # Sudo requires configured MTA
-      Class['::nest::profile::base::mta']
-      -> Class['::nest::profile::base::sudo']
+      Class['::nest::base::mta']
+      -> Class['::nest::base::sudo']
 
       # Dracut liveimg depends on dhcp, pulled in by network class
-      Class['::nest::profile::base::network']
-      -> Class['::nest::profile::base::dracut']
+      Class['::nest::base::network']
+      -> Class['::nest::base::dracut']
 
       # OpenVPN modifies resolvconf which is installed for NetworkManager
-      Class['::nest::profile::base::network']
-      -> Class['::nest::profile::base::openvpn']
+      Class['::nest::base::network']
+      -> Class['::nest::base::openvpn']
 
       if $::nest::libvirt {
-        contain '::nest::profile::base::libvirt'
+        contain '::nest::base::libvirt'
 
         # libvirt ebuild checks kernel config
-        Class['::nest::profile::base::kernel']
-        -> Class['::nest::profile::base::libvirt']
+        Class['::nest::base::kernel']
+        -> Class['::nest::base::libvirt']
       }
     }
 
     'windows': {
-      contain '::nest::profile::base::cygwin'
-      Class['::nest::profile::base::cygwin'] -> Package <| provider == 'cygwin' and title != 'cygrunsrv' |>
+      contain '::nest::base::cygwin'
+      Class['::nest::base::cygwin'] -> Package <| provider == 'cygwin' and title != 'cygrunsrv' |>
 
       # The users class manages my cygwin home directory
-      Class['::nest::profile::base::cygwin'] -> Class['::nest::profile::base::users']
+      Class['::nest::base::cygwin'] -> Class['::nest::base::users']
     }
   }
 }

manifests/profile/base/bootloader.pp → manifests/base/bootloader.pp

-class nest::profile::base::bootloader {
+class nest::base::bootloader {
   $kernel_cmdline = [
     'init=/lib/systemd/systemd',
     'quiet',
@@ -16,18 +16,18 @@ class nest::profile::base::bootloader {
 
   case $::nest::bootloader {
     systemd: {
-      contain 'nest::profile::base::bootloader::systemd'
+      contain 'nest::base::bootloader::systemd'
     }
 
     default: {
-      contain 'nest::profile::base::bootloader::grub'
+      contain 'nest::base::bootloader::grub'
 
       exec { 'dracut':
         command     => 'version=$(ls /lib/modules | sort -V | tail -1) && dracut --force --kver $version',
         refreshonly => true,
         timeout     => 0,
         provider    => shell,
-        notify      => Class['nest::profile::base::bootloader::grub'],
+        notify      => Class['nest::base::bootloader::grub'],
       }
     }
   }

manifests/profile/base/bootloader/grub.pp → manifests/base/bootloader/grub.pp

-class nest::profile::base::bootloader::grub {
+class nest::base::bootloader::grub {
   $font = "ter-x${::nest::console_font_size}b"
 
   nest::lib::portage::package_use { 'sys-boot/grub':
@@ -67,7 +67,7 @@ class nest::profile::base::bootloader::grub {
   }
 
   file_line { 'grub-set-kernel-cmdline':
-    line  => "GRUB_CMDLINE_LINUX=\"${::nest::profile::base::bootloader::kernel_cmdline}\"",
+    line  => "GRUB_CMDLINE_LINUX=\"${::nest::base::bootloader::kernel_cmdline}\"",
     match => '^#?GRUB_CMDLINE_LINUX=',
   }
 

manifests/profile/base/bootloader/systemd.pp → manifests/base/bootloader/systemd.pp

-class nest::profile::base::bootloader::systemd {
+class nest::base::bootloader::systemd {
   if $facts['virtual'] == 'lxc' or $facts['os']['architecture'] == 'armv7l' {
     $bootctl_args = '--no-variables'
   } else {
@@ -28,7 +28,7 @@ class nest::profile::base::bootloader::systemd {
     ;
 
     '/etc/kernel/cmdline':
-      content => "root=zfs:AUTO ${::nest::profile::base::bootloader::kernel_cmdline}\n",
+      content => "root=zfs:AUTO ${::nest::base::bootloader::kernel_cmdline}\n",
       notify  => Exec['kernel-install'],
     ;
   }

manifests/profile/base/cygwin.pp → manifests/base/cygwin.pp

-class nest::profile::base::cygwin {
+class nest::base::cygwin {
   package { 'cygwin':
     ensure => installed,
   }

manifests/profile/base/distcc.pp → manifests/base/distcc.pp

-class nest::profile::base::distcc {
+class nest::base::distcc {
   package { 'sys-devel/distcc':
     ensure => installed,
   }

manifests/profile/base/distccd.pp → manifests/base/distccd.pp

-class nest::profile::base::distccd {
+class nest::base::distccd {
   if $::nest::distcc_server {
     $disable_verbose_content = @(EOT)
       [Service]

manifests/profile/base/dracut.pp → manifests/base/dracut.pp

-class nest::profile::base::dracut {
+class nest::base::dracut {
   package { 'sys-kernel/dracut':
     ensure => installed,
   }

manifests/profile/base/firewall.pp → manifests/base/firewall.pp

-class nest::profile::base::firewall {
+class nest::base::firewall {
   # Doing anything related to iptables inside an ARM chroot fails
   if $facts['os']['architecture'] == 'armv7l' {
     if $facts['virtual'] == 'lxc' {

manifests/profile/base/fs.pp → manifests/base/fs.pp

-class nest::profile::base::fs {
+class nest::base::fs {
   package { 'net-fs/nfs-utils':
     ensure => installed,
   }

manifests/profile/base/fstab.pp → manifests/base/fstab.pp

-class nest::profile::base::fstab {
+class nest::base::fstab {
   $hostname = regsubst($::trusted['certname'], '\..*', '')
 
   # XXX: Improve this

manifests/profile/base/git.pp → manifests/base/git.pp

-class nest::profile::base::git {
+class nest::base::git {
   $package_name = $facts['osfamily'] ? {
     'Gentoo' => 'dev-vcs/git',
     default  => git,

manifests/profile/base/kernel.pp → manifests/base/kernel.pp

-class nest::profile::base::kernel {
+class nest::base::kernel {
   file { '/etc/portage/patches/sys-kernel':
     ensure  => absent,
     recurse => true,
@@ -52,9 +52,9 @@ class nest::profile::base::kernel {
     $install_target = 'install'
   }
 
-  include '::nest::profile::base::portage'
+  include '::nest::base::portage'
   exec { 'make kernel':
-    command     => "/usr/bin/make ${::nest::profile::base::portage::makeopts} clean olddefconfig all ${install_target} modules_install",
+    command     => "/usr/bin/make ${::nest::base::portage::makeopts} clean olddefconfig all ${install_target} modules_install",
     cwd         => '/usr/src/linux',
     path        => ['/usr/lib/distcc/bin', '/usr/bin', '/bin'],
     environment => 'HOME=/root',  # for distcc
@@ -63,7 +63,7 @@ class nest::profile::base::kernel {
   }
 
   exec { 'module-rebuild':
-    command     => "/usr/bin/emerge --usepkg n --jobs ${::nest::profile::base::portage::loadlimit} --load-average ${::nest::profile::base::portage::loadlimit} @module-rebuild",
+    command     => "/usr/bin/emerge --usepkg n --jobs ${::nest::base::portage::loadlimit} --load-average ${::nest::base::portage::loadlimit} @module-rebuild",
     timeout     => 0,
     refreshonly => true,
     subscribe   => Exec['make kernel'],

manifests/profile/base/libvirt.pp → manifests/base/libvirt.pp

-class nest::profile::base::libvirt {
+class nest::base::libvirt {
   nest::lib::portage::package_use { 'app-emulation/libvirt':
     use => ['virt-network', 'zfs'],
   }

manifests/profile/base/lvm.pp → manifests/base/lvm.pp

-class nest::profile::base::lvm {
+class nest::base::lvm {
   package { 'sys-fs/lvm2':
     ensure => installed,
   }

manifests/profile/base/mta.pp → manifests/base/mta.pp

-class nest::profile::base::mta {
+class nest::base::mta {
   package { 'mail-mta/nullmailer':
     ensure => installed,
   }

manifests/profile/base/network.pp → manifests/base/network.pp

-class nest::profile::base::network {
+class nest::base::network {
   # resolvconf now provided by systemd
   nest::lib::portage::package_use { 'net-misc/networkmanager':
     ensure => absent,

manifests/profile/base/openvpn.pp → manifests/base/openvpn.pp

-class nest::profile::base::openvpn {
+class nest::base::openvpn {
   $device     = 'tun0'
   $hosts_file = '/etc/hosts.nest'
 

manifests/profile/base/packages.pp → manifests/base/packages.pp

-class nest::profile::base::packages {
+class nest::base::packages {
   case $facts['osfamily'] {
     'Gentoo': {
       package { [

manifests/profile/base/plymouth.pp → manifests/base/plymouth.pp

-class nest::profile::base::plymouth {
+class nest::base::plymouth {
   file { [
     '/etc/portage/patches/sys-boot',
     '/etc/portage/patches/sys-boot/plymouth',