Upgrade to Ubuntu Noble

Vagrantfile

@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-    config.vm.box = "ubuntu/jammy64"
+    config.vm.box = "bento/ubuntu-24.04"
 
     config.vm.provider "virtualbox" do |v|
         v.memory = 1024

manifests/public.pp

@@ -5,7 +5,7 @@
         # main_user                 => 'root',
         manual_npm_installs         => false,
         enable_tls                  => true,
-        secondary_domains           => $::fqdn ? {
+        secondary_domains           => $facts['fqdn'] ? {
             'srcomp.studentrobotics.org'    => ['srcomp.srobo.org'],
             default                         => [],
         },

modules/compbox/manifests/firewall.pp

@@ -16,53 +16,53 @@
   firewall { '100 allow ssh access':
     dport  => 22,
     proto  => tcp,
-    action => accept,
+    jump   => accept,
   }
   firewall { '100 allow ssh access (v6)':
     dport     => 22,
     proto     => tcp,
-    action    => accept,
-    provider  => 'ip6tables',
+    jump      => accept,
+    protocol  => 'ip6tables',
   }
 
   # NTP
   firewall { '100 allow ntp access':
     dport  => 123,
     proto  => udp,
-    action => accept,
+    jump   => accept,
   }
   firewall { '100 allow ntp access (v6)':
     dport     => 123,
     proto     => udp,
-    action    => accept,
-    provider  => 'ip6tables',
+    jump      => accept,
+    protocol  => 'ip6tables',
   }
 
   # HTTP(S)
   firewall { '100 allow http and https access':
     dport  => [80, 443],
     proto  => tcp,
-    action => accept,
+    jump   => accept,
   }
   firewall { '100 allow http and https access (v6)':
     dport     => [80, 443],
     proto     => tcp,
-    action    => accept,
-    provider  => 'ip6tables',
+    jump      => accept,
+    protocol  => 'ip6tables',
   }
 
   # Mythic Beasts
-  firewall { '200 allow Mythic Beasts\' munin monitoring access':
+  firewall { '200 allow Mythic Beasts’ munin monitoring access':
     dport     => 4949,
     source    => '93.93.128.100',
     proto     => tcp,
-    action    => accept,
+    jump      => accept,
   }
-  firewall { '200 allow Mythic Beasts\' munin monitoring access (v6)':
+  firewall { '200 allow Mythic Beasts’ munin monitoring access (v6)':
     dport     => 4949,
     source    => '2a00:1098:0:80:1000::100',
     proto     => tcp,
-    action    => accept,
-    provider  => 'ip6tables',
+    jump      => accept,
+    protocol  => 'ip6tables',
   }
 }

modules/compbox/manifests/fw_post.pp

@@ -1,13 +1,13 @@
 class compbox::fw_post {
   firewall { '999 drop all':
     proto  => 'all',
-    action => 'drop',
+    jump   => 'drop',
     before => undef,
   }
   firewall { '999 drop all (v6)':
     proto     => 'all',
-    action    => 'drop',
+    jump      => 'drop',
     before    => undef,
-    provider  => 'ip6tables',
+    protocol  => 'ip6tables',
   }
 }

modules/compbox/manifests/fw_pre.pp

@@ -6,48 +6,48 @@
   # Default firewall rules (IPv4)
   firewall { '000 accept all icmp':
     proto  => 'icmp',
-    action => 'accept',
+    jump   => 'accept',
   }->
   firewall { '001 accept all to lo interface':
     proto   => 'all',
     iniface => 'lo',
-    action  => 'accept',
+    jump    => 'accept',
   }->
   firewall { '002 reject local traffic not on loopback interface':
     iniface     => '! lo',
     proto       => 'all',
     destination => '127.0.0.1/8',
-    action      => 'reject',
+    jump        => 'reject',
   }->
   firewall { '003 accept related established rules':
     proto  => 'all',
     state  => ['RELATED', 'ESTABLISHED'],
-    action => 'accept',
+    jump   => 'accept',
   }
 
   # Default firewall rules (IPv6)
   firewall { '000 accept all icmp (v6)':
     proto     => 'ipv6-icmp',
-    action    => 'accept',
-    provider  => 'ip6tables',
+    jump      => 'accept',
+    protocol  => 'ip6tables',
   }->
   firewall { '001 accept all to lo interface (v6)':
     proto     => 'all',
     iniface   => 'lo',
-    action    => 'accept',
-    provider  => 'ip6tables',
+    jump      => 'accept',
+    protocol  => 'ip6tables',
   }->
   firewall { '002 reject local traffic not on loopback interface (v6)':
     iniface     => '! lo',
     proto       => 'all',
     destination => '::1',
-    action      => 'reject',
-    provider    => 'ip6tables',
+    jump        => 'reject',
+    protocol    => 'ip6tables',
   }->
   firewall { '003 accept related established rules (v6)':
     proto     => 'all',
     state     => ['RELATED', 'ESTABLISHED'],
-    action    => 'accept',
-    provider  => 'ip6tables',
+    jump      => 'accept',
+    protocol  => 'ip6tables',
   }
 }

modules/compbox/manifests/hostname.pp

@@ -3,14 +3,14 @@
 
 class compbox::hostname ( $hostname = hiera('hostname') ) {
 
-  if $::fqdn != $hostname {
-    host { $::fqdn:
+  if $facts['fqdn'] != $hostname {
+    host { $facts['fqdn']:
       ensure  => absent,
       before  => Exec['hostnamectl'],
     }
 
-    if $::fqdn != $::hostname {
-      host { $::hostname:
+    if $facts['fqdn'] != $facts['hostname'] {
+      host { $facts['hostname']:
         ensure  => absent,
         before  => Exec['hostnamectl'],
       }

modules/compbox/manifests/init.pp

@@ -192,7 +192,7 @@
 
     # Screens and stream
     class { '::nodejs':
-        repo_url_suffix         => '20.x',
+        repo_version        => '20',
     } ->
     compbox::npm_install { 'yarn':
         ensure              => present,
@@ -447,7 +447,7 @@
     }
 
     # Nginx configuration
-    $www_hostname = $::fqdn
+    $www_hostname = $facts['fqdn']
     if $enable_tls {
         package { 'snapd':
             ensure      => present,
@@ -539,7 +539,7 @@
     }
     service { 'sshd':
         ensure  => running,
-        name    => $::osfamily ? {
+        name    => $facts['os']['family'] ? {
             'Debian'  => 'ssh',
             default   => 'sshd',
         },