Update Chassis for Noble Numbat

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "puppet/modules/staging"]
 	path = puppet/modules/staging
 	url = https://github.com/voxpupuli/puppet-staging.git
+[submodule "puppet/modules/archive"]
+	path = puppet/modules/archive
+	url = https://github.com/voxpupuli/puppet-archive

Vagrantfile

@@ -122,21 +122,7 @@ Vagrant.configure("2") do |config|
 		config.vm.box = CONF['box']
 	else
 		# We <3 Ubuntu LTS
-		config.vm.box = "bento/ubuntu-22.04"
-	end
-
-	# The Parallels Provider uses a different naming scheme.
-	config.vm.provider :parallels do |_v, override|
-		# Vagrant currently runs under Rosetta on Apple Silicon devices. As a result,
-		# this seems to be the most reliable way to detect whether or not we're
-		# running under ARM64.
-		if Etc.uname[:version].include? 'ARM64'
-			if CONF['_mode'] == "normal"
-				override.vm.box = 'chassis/chassis-arm64'
-			else
-				override.vm.box = 'bento/ubuntu-22.04-arm64'
-			end
-		end
+		config.vm.box = "bento/ubuntu-24.04"
 	end
 
 	# Enable SSH forwarding

puppet/manifests/development.pp

@@ -45,7 +45,7 @@
 }
 
 # Allow MySQL options to be added or overridden.
-$mysql_overrides = merge( $mysql_defaults, $config['mysql'] )
+$mysql_overrides = stdlib::merge( $mysql_defaults, $config['mysql'] )
 
 # Allow MySQL package name to be overridden so we can easily support MariaDB.
 if $config['mysql'] and $config['mysql']['package_name'] != undef {

puppet/modules/chassis/manifests/hosts.pp

@@ -5,8 +5,8 @@
 ) {
 
 	# Jammy Jellyfish configurations.
-	case $::lsbdistcodename {
-		'jammy': {
+	case $facts['os']['distro']['codename'] {
+		'jammy', 'noble' : {
 			# Jammy Jellyfish has access to the python3-avahi package so install it.
 			package { 'python3-avahi':
 				ensure  => latest,
@@ -38,19 +38,19 @@
 		ensure  => latest
 	}
 
-	ensure_packages( ['mdns-publisher'], {
-		ensure   => present,
-		provider => 'pip3',
-		require  => [ Package['python3-pip'], Package['libdbus-glib-1-dev'] ],
-	})
+#	stdlib::ensure_packages( ['mdns-publisher'], {
+#		ensure   => present,
+#		provider => 'pip3',
+#		require  => [ Package['python3-pip'], Package['libdbus-glib-1-dev'] ],
+#	})
 
-	file { '/lib/systemd/system/chassis-hosts.service':
-		ensure  => 'file',
-		mode    => '0644',
-		content => template('chassis/chassis-hosts.service.erb'),
-		notify  => Service['chassis-hosts'],
-		require => Package['mdns-publisher'],
-	}
+#	file { '/lib/systemd/system/chassis-hosts.service':
+#		ensure  => 'file',
+#		mode    => '0644',
+#		content => template('chassis/chassis-hosts.service.erb'),
+#		notify  => Service['chassis-hosts'],
+#		require => Package['mdns-publisher'],
+#	}
 
 	if ( $subdomains ) {
 		file { '/vagrant/local-config-hosts.php':
@@ -63,15 +63,15 @@
 		}
 	}
 
-	service { 'chassis-hosts':
-		ensure  => running,
-		enable  => true,
-		require => [
-			Package[ 'avahi-daemon' ],
-			Package[ 'python3-avahi' ],
-			File[ '/lib/systemd/system/chassis-hosts.service' ],
-			Exec['restart-avahi']
-		],
-	}
+	# service { 'chassis-hosts':
+	# 	ensure  => running,
+	# 	enable  => true,
+	# 	require => [
+	# 		Package[ 'avahi-daemon' ],
+	# 		Package[ 'python3-avahi' ],
+	# 		File[ '/lib/systemd/system/chassis-hosts.service' ],
+	# 		Exec['restart-avahi']
+	# 	],
+	# }
 
 }

puppet/modules/chassis/manifests/php.pp

@@ -18,13 +18,6 @@
     ],
   }
 
-  apt::ppa { 'ppa:ondrej/php-qa':
-    require => [
-      Package[$apt::ppa_package],
-      Class['apt'],
-    ],
-  }
-
   if $version =~ /^(\d+)\.(\d+)$/ {
     $package_version = "${version}.*"
     $short_ver = $version
@@ -96,7 +89,6 @@
     require         => [
       Apt::Pin[$core_packages],
       Apt::Ppa['ppa:ondrej/php'],
-      Apt::Ppa['ppa:ondrej/php-qa'],
       Class['apt::update'],
       Chassis::Remove_php_version[$php_versions_to_remove]
     ],

puppet/modules/chassis/manifests/site.pp

@@ -47,11 +47,6 @@
 	}
 
 	wp::site { $wpdir:
-		url            => "http://${name}/",
-		sitename       => $sitename,
-		require        => Mysql::Db[$database],
-		admin_user     => $admin_user,
-		admin_email    => $admin_email,
-		admin_password => $admin_password,
+		require        => Mysql::Db[$database]
 	}
 }

puppet/preprovision.sh

@@ -41,6 +41,9 @@ if [[ ! -f /etc/chassis-updated ]]; then
 	# Install puppet
 	sudo apt-get -q -y install puppet
 
+	# Create directory for MySql
+	sudo mkdir /var/log/mysql
+
 	touch /etc/chassis-updated
 fi