Merge pull request #2668 from Varying-Vagrant-Vagrants/partial-jammy-…

…update

3.11.2

CHANGELOG.md

@@ -6,11 +6,12 @@ permalink: /docs/en-US/changelog/
 
 # Changelog
 
-## 3.12.0 ( WIP )
+## 3.11.2 ( 2023 May 8th )
 
 ### Enhancements
 
 * Added Gitlab SSH fingerprints for non-RSA keys ( #2665 )
+* Apt sources for Ubuntu 22 LTS
 
 ### Bug Fixes
 

provision/core/env/provision.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
 # @description Adds the homebin folder to PATH
 # @noargs
 function setup_vvv_env() {
@@ -60,7 +62,7 @@ function cleanup_terminal_splash() {
   if [[ -f /etc/update-motd.d/00-vvv-bash-splash ]]; then
     rm /etc/update-motd.d/00-vvv-bash-splash
   fi
-  cp -f "/srv/provision/core/env/motd/00-vvv-bash-splash" "/etc/update-motd.d/00-vvv-bash-splash"
+  cp -f "${DIR}/motd/00-vvv-bash-splash" "/etc/update-motd.d/00-vvv-bash-splash"
   chmod +x /etc/update-motd.d/00-vvv-bash-splash
 }
 
@@ -71,26 +73,26 @@ function profile_setup() {
 
   # Copy custom dotfiles and bin file for the vagrant user from local
   rm -f "/home/vagrant/.bash_profile"
-  noroot cp -f "/srv/provision/core/env/homedir/.bash_profile" "/home/vagrant/.bash_profile"
+  noroot cp -f "${DIR}/homedir/.bash_profile" "/home/vagrant/.bash_profile"
 
   rm -f "/home/vagrant/.bash_aliases"
-  noroot cp -f "/srv/provision/core/env/homedir/.bash_aliases" "/home/vagrant/.bash_aliases"
+  noroot cp -f "${DIR}/homedir/.bash_aliases" "/home/vagrant/.bash_aliases"
 
   rm -f "${HOME}/.bash_aliases"
-  cp -f "/srv/provision/core/env/homedir/.bash_aliases" "${HOME}/.bash_aliases"
+  cp -f "${DIR}/homedir/.bash_aliases" "${HOME}/.bash_aliases"
 
   rm -f "/home/vagrant/.vimrc"
-  noroot cp -f "/srv/provision/core/env/homedir/.vimrc" "/home/vagrant/.vimrc"
+  noroot cp -f "${DIR}/homedir/.vimrc" "/home/vagrant/.vimrc"
 
   if [[ ! -d "/home/vagrant/.subversion" ]]; then
     noroot mkdir -p "/home/vagrant/.subversion"
   fi
 
   rm -f /home/vagrant/.subversion/servers
-  noroot cp "/srv/provision/core/env/homedir/.subversion/subversion-servers" "/home/vagrant/.subversion/servers"
+  noroot cp "${DIR}/homedir/.subversion/subversion-servers" "/home/vagrant/.subversion/servers"
 
   rm -f /home/vagrant/.subversion/config
-  noroot cp "/srv/provision/core/env/homedir/.subversion/subversion-config" "/home/vagrant/.subversion/config"
+  noroot cp "${DIR}/homedir/.subversion/subversion-config" "/home/vagrant/.subversion/config"
 
   # If a bash_prompt file exists in the VVV config/ directory, copy to the VM.
   if [[ -f "/srv/config/bash_prompt" ]]; then
@@ -99,8 +101,8 @@ function profile_setup() {
   fi
 
   if [ -d "/etc/ssh" ]; then
-    cp -f /srv/provision/core/env/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts
-    cp -f /srv/provision/core/env/ssh/sshd_config /etc/ssh/sshd_config
+    cp -f "${DIR}/ssh/ssh_known_hosts" /etc/ssh/ssh_known_hosts
+    cp -f "${DIR}/ssh/sshd_config" /etc/ssh/sshd_config
     vvv_info " * Reloading SSH Daemon"
     if ! sudo service ssh reload; then
       vvv_error " ! SSH daemon failed to reload"

provision/core/git/sources-ubuntu-jammy.list

@@ -0,0 +1,3 @@
+# git lfs (large file storage plugin for git)
+deb https://packagecloud.io/github/git-lfs/ubuntu/ jammy main
+deb-src https://packagecloud.io/github/git-lfs/ubuntu/ jammy main

provision/core/mariadb/sources-ubuntu-jammy.list

@@ -0,0 +1,4 @@
+# MariaDB 10.5 repository list - created  UTC
+# https://mariadb.org/download/
+deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu jammy main
+deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu jammy main

provision/core/nginx/sources-ubuntu-jammy.list

@@ -0,0 +1,3 @@
+# Provides Nginx mainline
+deb https://nginx.org/packages/mainline/ubuntu/ jammy nginx
+deb-src https://nginx.org/packages/mainline/ubuntu/ jammy nginx

provision/core/node-ppa/sources-ubuntu-jammy.list

@@ -0,0 +1,3 @@
+# Provides Node.js
+deb http://deb.nodesource.com/node_14.x jammy main
+deb-src http://deb.nodesource.com/node_14.x jammy main

provision/core/php/sources-ubuntu-jammy.list

@@ -0,0 +1,3 @@
+# Provides PHP
+deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main
+deb-src https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main

provision/core/vvv/sources-ubuntu-jammy.list

@@ -0,0 +1,3 @@
+# VVV mirror packages
+# deb https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu jammy main
+# deb-src https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu jammy main

version

@@ -1 +1 @@
-3.12.0
+3.11.2