14x (#249)

Ubuntu 22.04
PHP 8.3 Default
Add Golang to base box
Remove Drush Launcher
Remove Drupal Launcher
Replace MailHog with Mailpit

Vagrantfile

@@ -3,7 +3,7 @@
 
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "bento/ubuntu-20.04"
+  config.vm.box = "bento/ubuntu-22.04"
   config.vm.provider "parallels" do |v|
     v.memory = 4096
     v.cpus = 4

bin/link-to-bento.sh

@@ -1,20 +1,25 @@
 #!/usr/bin/env bash
 
-/bin/ln -f scripts/amd64.sh ../bento/packer_templates/ubuntu/scripts/homestead.sh
-/bin/ln -f scripts/arm.sh ../bento/packer_templates/ubuntu/scripts/homestead-arm.sh
-/bin/ln -f http/preseed.cfg ../bento/packer_templates/ubuntu/http
-/bin/ln -f http/preseed-hyperv.cfg ../bento/packer_templates/ubuntu/http
+/bin/ln -f scripts/amd64.sh ../bento/packer_templates/scripts/ubuntu/homestead_amd64.sh
+/bin/ln -f scripts/arm.sh ../bento/packer_templates/scripts/ubuntu/homestead_arm.sh
 
-sed -i 's/scripts\/cleanup.sh/scripts\/homestead.sh/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
-sed -i 's/"cpus": "1"/"cpus": "2"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
-sed -i 's/"boot_wait": "5s"/"boot_wait": "3s"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
-sed -i 's/"memory": "1024"/"memory": "2048"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
-sed -i 's/"disk_size": "65536"/"disk_size": "524288"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
-sed -i '/\/_common\/motd.sh/d' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
+echo " " > ../bento/packer_templates/scripts/_common/motd.sh
+sed -i 's/${var.os_name}\/cleanup_${var.os_name}.sh/ubuntu\/homestead_amd64.sh/' ../bento/packer_templates/pkr-builder.pkr.hcl
+# Set disk_size
+sed -i 's/65536/524288/' ../bento/packer_templates/pkr-variables.pkr.hcl
 
-# Run for ARM
-sed -i 's/scripts\/cleanup.sh/scripts\/homestead-arm.sh/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
-sed -i 's/"boot_wait": "5s"/"boot_wait": "3s"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
-sed -i 's/"memory": "1024"/"memory": "2048"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
-sed -i 's/"disk_size": "65536"/"disk_size": "524288"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
-sed -i '/\/_common\/motd.sh/d' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
+
+
+#sed -i 's/scripts\/cleanup.sh/scripts\/homestead.sh/' ../packer_templates/pkr-builder.pkr.hcl
+#sed -i 's/"cpus": "1"/"cpus": "2"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
+#sed -i 's/"boot_wait": "5s"/"boot_wait": "3s"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
+#sed -i 's/"memory": "1024"/"memory": "2048"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
+#sed -i 's/"disk_size": "65536"/"disk_size": "524288"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
+#sed -i '/\/_common\/motd.sh/d' ../bento/packer_templates/ubuntu/ubuntu-20.04-amd64.json
+
+## Run for ARM
+#sed -i 's/scripts\/cleanup.sh/scripts\/homestead-arm.sh/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
+#sed -i 's/"boot_wait": "5s"/"boot_wait": "3s"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
+#sed -i 's/"memory": "1024"/"memory": "2048"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
+#sed -i 's/"disk_size": "65536"/"disk_size": "524288"/' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json
+#sed -i '/\/_common\/motd.sh/d' ../bento/packer_templates/ubuntu/ubuntu-20.04-arm64.json

scripts/amd64.sh

@@ -31,17 +31,18 @@ ca-certificates
 
 # Install Some PPAs
 apt-add-repository ppa:ondrej/php -y
-apt-add-repository ppa:chris-lea/redis-server -y
 
 # NodeJS
-curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash -
+sudo mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+NODE_MAJOR=21
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
 
 # PostgreSQL
-tee /etc/apt/sources.list.d/pgdg.list <<END
-deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main
-END
-
-wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+# Import the repository signing key:
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8
+wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo tee /etc/apt/trusted.gpg.d/pgdg.asc &>/dev/null
 
 ## Update Package Lists
 apt-get update -y
@@ -61,7 +62,7 @@ usermod -aG docker vagrant
 
 # Install docker-compose
 curl \
-    -L "https://github.com/docker/compose/releases/download/2.10.1/docker-compose-$(uname -s)-$(uname -m)" \
+    -L "https://github.com/docker/compose/releases/download/2.23.0/docker-compose-$(uname -s)-$(uname -m)" \
     -o /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose
 
@@ -444,11 +445,11 @@ else
   sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.2/cli/php.ini
 
   # Configure Xdebug
-   echo "xdebug.mode = debug" >> /etc/php/8.2/mods-available/xdebug.ini
-   echo "xdebug.discover_client_host = true" >> /etc/php/8.2/mods-available/xdebug.ini
-   echo "xdebug.client_port = 9003" >> /etc/php/8.2/mods-available/xdebug.ini
-   echo "xdebug.max_nesting_level = 512" >> /etc/php/8.2/mods-available/xdebug.ini
-   echo "opcache.revalidate_freq = 0" >> /etc/php/8.2/mods-available/opcache.ini
+  echo "xdebug.mode = debug" >> /etc/php/8.2/mods-available/xdebug.ini
+  echo "xdebug.discover_client_host = true" >> /etc/php/8.2/mods-available/xdebug.ini
+  echo "xdebug.client_port = 9003" >> /etc/php/8.2/mods-available/xdebug.ini
+  echo "xdebug.max_nesting_level = 512" >> /etc/php/8.2/mods-available/xdebug.ini
+  echo "opcache.revalidate_freq = 0" >> /etc/php/8.2/mods-available/opcache.ini
 
   # Configure php.ini for FPM
   sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.2/fpm/php.ini
@@ -473,6 +474,51 @@ else
 
   touch /home/vagrant/.homestead-features/php82
 
+  # PHP 8.3
+  apt-get install -y --allow-change-held-packages \
+  php8.3 php8.3-bcmath php8.3-bz2 php8.3-cgi php8.3-cli php8.3-common php8.3-curl php8.3-dba php8.3-dev \
+  php8.3-enchant php8.3-fpm php8.3-gd php8.3-gmp php8.3-imap php8.3-interbase php8.3-intl php8.3-ldap \
+  php8.3-mbstring php8.3-mysql php8.3-odbc php8.3-opcache php8.3-pgsql php8.3-phpdbg php8.3-pspell php8.3-readline \
+  php8.3-snmp php8.3-soap php8.3-sqlite3 php8.3-sybase php8.3-tidy php8.3-xml php8.3-xsl \
+  php8.3-zip
+  # php8.3-imagick php8.3-memcached php8.3-redis php8.3-xmlrpc php8.3-xdebug
+
+  # Configure php.ini for CLI
+  sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.3/cli/php.ini
+  sed -i "s/display_errors = .*/display_errors = On/" /etc/php/8.3/cli/php.ini
+  sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/8.3/cli/php.ini
+  sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.3/cli/php.ini
+
+  # Configure Xdebug
+#  echo "xdebug.mode = debug" >> /etc/php/8.3/mods-available/xdebug.ini
+#  echo "xdebug.discover_client_host = true" >> /etc/php/8.3/mods-available/xdebug.ini
+#  echo "xdebug.client_port = 9003" >> /etc/php/8.3/mods-available/xdebug.ini
+#  echo "xdebug.max_nesting_level = 512" >> /etc/php/8.3/mods-available/xdebug.ini
+#  echo "opcache.revalidate_freq = 0" >> /etc/php/8.3/mods-available/opcache.ini
+
+  # Configure php.ini for FPM
+  sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.3/fpm/php.ini
+  sed -i "s/display_errors = .*/display_errors = On/" /etc/php/8.3/fpm/php.ini
+  sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php/8.3/fpm/php.ini
+  sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/8.3/fpm/php.ini
+  sed -i "s/upload_max_filesize = .*/upload_max_filesize = 100M/" /etc/php/8.3/fpm/php.ini
+  sed -i "s/post_max_size = .*/post_max_size = 100M/" /etc/php/8.3/fpm/php.ini
+  sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.3/fpm/php.ini
+
+  printf "[openssl]\n" | tee -a /etc/php/8.3/fpm/php.ini
+  printf "openssl.cainfo = /etc/ssl/certs/ca-certificates.crt\n" | tee -a /etc/php/8.3/fpm/php.ini
+  printf "[curl]\n" | tee -a /etc/php/8.3/fpm/php.ini
+  printf "curl.cainfo = /etc/ssl/certs/ca-certificates.crt\n" | tee -a /etc/php/8.3/fpm/php.ini
+
+  # Configure FPM
+  sed -i "s/user = www-data/user = vagrant/" /etc/php/8.3/fpm/pool.d/www.conf
+  sed -i "s/group = www-data/group = vagrant/" /etc/php/8.3/fpm/pool.d/www.conf
+  sed -i "s/listen\.owner.*/listen.owner = vagrant/" /etc/php/8.3/fpm/pool.d/www.conf
+  sed -i "s/listen\.group.*/listen.group = vagrant/" /etc/php/8.3/fpm/pool.d/www.conf
+  sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/8.3/fpm/pool.d/www.conf
+
+  touch /home/vagrant/.homestead-features/php8.3
+
   # Disable old PHP FPM
   systemctl disable php5.6-fpm
   systemctl disable php7.0-fpm
@@ -482,10 +528,11 @@ else
   systemctl disable php7.4-fpm
   systemctl disable php8.0-fpm
   systemctl disable php8.1-fpm
+  systemctl disable php8.2-fpm
 
-  update-alternatives --set php /usr/bin/php8.2
-  update-alternatives --set php-config /usr/bin/php-config8.2
-  update-alternatives --set phpize /usr/bin/phpize8.2
+  update-alternatives --set php /usr/bin/php8.3
+  update-alternatives --set php-config /usr/bin/php-config8.3
+  update-alternatives --set phpize /usr/bin/phpize8.3
 
   # Install Composer
   curl -sS https://getcomposer.org/installer | php
@@ -505,7 +552,7 @@ EOF
   sed -i "s/www-data/vagrant/" /etc/apache2/envvars
 
   # Enable FPM
-  a2enconf php8.2-fpm
+  a2enconf php8.3-fpm
 
   # Assume user wants mode_rewrite support
   sudo a2enmod rewrite
@@ -571,7 +618,7 @@ EOF
   sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/8.0/fpm/pool.d/www.conf
 
   service nginx restart
-  service php8.2-fpm restart
+  service php8.3-fpm restart
 
   # Add Vagrant User To WWW-Data
   usermod -a -G www-data vagrant
@@ -583,17 +630,6 @@ EOF
   chmod +x wp-cli.phar
   mv wp-cli.phar /usr/local/bin/wp
 
-  # Install Drush Launcher.
-  curl --silent --location https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar --output drush.phar
-  chmod +x drush.phar
-  mv drush.phar /usr/local/bin/drush
-  drush self-update
-
-  # Install Drupal Console Launcher.
-  curl --silent --location https://drupalconsole.com/installer --output drupal.phar
-  chmod +x drupal.phar
-  mv drupal.phar /usr/local/bin/drupal
-
   # Add Composer Global Bin To Path
   printf "\nPATH=\"$(sudo su - vagrant -c 'composer config -g home 2>/dev/null')/vendor/bin:\$PATH\"\n" | tee -a /home/vagrant/.profile
 fi
@@ -736,25 +772,40 @@ service redis-server start
 # Configure Beanstalkd
 sed -i "s/#START=yes/START=yes/" /etc/default/beanstalkd
 
-# Install & Configure MailHog
-wget --quiet -O /usr/local/bin/mailhog https://github.com/mailhog/MailHog/releases/download/v1.0.1/MailHog_linux_amd64
-chmod +x /usr/local/bin/mailhog
-sudo tee /etc/systemd/system/mailhog.service <<EOL
+# Install Golang
+if [[ "$ARCH" == "aarch64" ]]; then
+    GOLANG_LATEST_STABLE_VERSION=$(curl https://go.dev/dl/?mode=json | grep -o 'go.*.linux-arm64.tar.gz' | head -n 1 | tr -d '\r\n')
+    wget https://dl.google.com/go/${GOLANG_LATEST_STABLE_VERSION} -O golang.tar.gz
+else
+    GOLANG_LATEST_STABLE_VERSION=$(curl https://go.dev/dl/?mode=json | grep -o 'go.*.linux-amd64.tar.gz' | head -n 1 | tr -d '\r\n')
+    wget https://dl.google.com/go/${GOLANG_LATEST_STABLE_VERSION} -O golang.tar.gz
+fi
+
+tar -C /usr/local -xzf golang.tar.gz go
+printf "\nPATH=\"/usr/local/go/bin:\$PATH\"\n" | tee -a /home/vagrant/.profile
+rm -rf golang.tar.gz
+
+# Install & Configure Mailpit
+curl -sL https://raw.githubusercontent.com/axllent/mailpit/develop/install.sh | bash
+chmod +x /usr/local/bin/mailpit
+tee /etc/systemd/system/mailpit.service <<EOL
 [Unit]
-Description=Mailhog
+Description=Mailpit
 After=network.target
 
 [Service]
 User=vagrant
-ExecStart=/usr/bin/env /usr/local/bin/mailhog > /dev/null 2>&1 &
+StandardOutput=journal
+StandardError=journal
+ExecStart=/usr/bin/env /usr/local/bin/mailpit
 
 [Install]
 WantedBy=multi-user.target
 EOL
 
-sudo systemctl daemon-reload
-sudo systemctl enable mailhog
-sudo service mailhog restart
+systemctl daemon-reload
+systemctl enable mailpit
+service mailpit restart
 
 # Configure Supervisor
 systemctl enable supervisor.service
@@ -812,7 +863,7 @@ apt-get -y purge ppp pppconfig pppoeconf
 sed -i "s/^makestep.*/makestep 1 -1/" /etc/chrony/chrony.conf
 
 # Delete oddities
-apt-get -y purge popularity-contest installation-report command-not-found friendly-recovery laptop-detect
+apt-get -y purge popularity-contest command-not-found friendly-recovery laptop-detect
 
 # Exlude the files we don't need w/o uninstalling linux-firmware
 echo "==> Setup dpkg excludes for linux-firmware"