Merge pull request #2669 from Varying-Vagrant-Vagrants/develop

3.11.2 on stable

CHANGELOG.md

@@ -6,6 +6,18 @@ permalink: /docs/en-US/changelog/
 
 # Changelog
 
+## 3.11.2 ( 2023 May 8th )
+
+### Enhancements
+
+* Added Gitlab SSH fingerprints for non-RSA keys ( #2665 )
+* Apt sources for Ubuntu 22 LTS
+
+### Bug Fixes
+
+* Updated to the new GitHub RSA fingerprint ( #2665 )
+
+
 ## 3.11.0 ( 2023 March 14th )
 
 ### Enhancements

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/env/ssh/ssh_known_hosts

@@ -1,4 +1,9 @@
-github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
+
 gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=
 gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
+gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
+
 bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==

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.11
+3.11.2