Skip to content

Commit 3b367ce

Browse files
tomjntomjn
authored
Merge pull request #2669 from Varying-Vagrant-Vagrants/develop
3.11.2 on stable
2 parents d28080c + 1eaf079 commit 3b367ce

File tree

10 files changed

+49
-11
lines changed

10 files changed

+49
-11
lines changed

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ permalink: /docs/en-US/changelog/
66

77
# Changelog
88

9+
## 3.11.2 ( 2023 May 8th )
10+
11+
### Enhancements
12+
13+
* Added Gitlab SSH fingerprints for non-RSA keys ( #2665 )
14+
* Apt sources for Ubuntu 22 LTS
15+
16+
### Bug Fixes
17+
18+
* Updated to the new GitHub RSA fingerprint ( #2665 )
19+
20+
921
## 3.11.0 ( 2023 March 14th )
1022

1123
### Enhancements

‎provision/core/env/provision.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env bash
22
set -eo pipefail
33

4+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
5+
46
# @description Adds the homebin folder to PATH
57
# @noargs
68
function setup_vvv_env() {
@@ -60,7 +62,7 @@ function cleanup_terminal_splash() {
6062
if [[ -f /etc/update-motd.d/00-vvv-bash-splash ]]; then
6163
rm /etc/update-motd.d/00-vvv-bash-splash
6264
fi
63-
cp -f "/srv/provision/core/env/motd/00-vvv-bash-splash" "/etc/update-motd.d/00-vvv-bash-splash"
65+
cp -f "${DIR}/motd/00-vvv-bash-splash" "/etc/update-motd.d/00-vvv-bash-splash"
6466
chmod +x /etc/update-motd.d/00-vvv-bash-splash
6567
}
6668

@@ -71,26 +73,26 @@ function profile_setup() {
7173

7274
# Copy custom dotfiles and bin file for the vagrant user from local
7375
rm -f "/home/vagrant/.bash_profile"
74-
noroot cp -f "/srv/provision/core/env/homedir/.bash_profile" "/home/vagrant/.bash_profile"
76+
noroot cp -f "${DIR}/homedir/.bash_profile" "/home/vagrant/.bash_profile"
7577

7678
rm -f "/home/vagrant/.bash_aliases"
77-
noroot cp -f "/srv/provision/core/env/homedir/.bash_aliases" "/home/vagrant/.bash_aliases"
79+
noroot cp -f "${DIR}/homedir/.bash_aliases" "/home/vagrant/.bash_aliases"
7880

7981
rm -f "${HOME}/.bash_aliases"
80-
cp -f "/srv/provision/core/env/homedir/.bash_aliases" "${HOME}/.bash_aliases"
82+
cp -f "${DIR}/homedir/.bash_aliases" "${HOME}/.bash_aliases"
8183

8284
rm -f "/home/vagrant/.vimrc"
83-
noroot cp -f "/srv/provision/core/env/homedir/.vimrc" "/home/vagrant/.vimrc"
85+
noroot cp -f "${DIR}/homedir/.vimrc" "/home/vagrant/.vimrc"
8486

8587
if [[ ! -d "/home/vagrant/.subversion" ]]; then
8688
noroot mkdir -p "/home/vagrant/.subversion"
8789
fi
8890

8991
rm -f /home/vagrant/.subversion/servers
90-
noroot cp "/srv/provision/core/env/homedir/.subversion/subversion-servers" "/home/vagrant/.subversion/servers"
92+
noroot cp "${DIR}/homedir/.subversion/subversion-servers" "/home/vagrant/.subversion/servers"
9193

9294
rm -f /home/vagrant/.subversion/config
93-
noroot cp "/srv/provision/core/env/homedir/.subversion/subversion-config" "/home/vagrant/.subversion/config"
95+
noroot cp "${DIR}/homedir/.subversion/subversion-config" "/home/vagrant/.subversion/config"
9496

9597
# If a bash_prompt file exists in the VVV config/ directory, copy to the VM.
9698
if [[ -f "/srv/config/bash_prompt" ]]; then
@@ -99,8 +101,8 @@ function profile_setup() {
99101
fi
100102

101103
if [ -d "/etc/ssh" ]; then
102-
cp -f /srv/provision/core/env/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts
103-
cp -f /srv/provision/core/env/ssh/sshd_config /etc/ssh/sshd_config
104+
cp -f "${DIR}/ssh/ssh_known_hosts" /etc/ssh/ssh_known_hosts
105+
cp -f "${DIR}/ssh/sshd_config" /etc/ssh/sshd_config
104106
vvv_info " * Reloading SSH Daemon"
105107
if ! sudo service ssh reload; then
106108
vvv_error " ! SSH daemon failed to reload"

‎provision/core/env/ssh/ssh_known_hosts

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# git lfs (large file storage plugin for git)
2+
deb https://packagecloud.io/github/git-lfs/ubuntu/ jammy main
3+
deb-src https://packagecloud.io/github/git-lfs/ubuntu/ jammy main

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# MariaDB 10.5 repository list - created UTC
2+
# https://mariadb.org/download/
3+
deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu jammy main
4+
deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu jammy main

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Provides Nginx mainline
2+
deb https://nginx.org/packages/mainline/ubuntu/ jammy nginx
3+
deb-src https://nginx.org/packages/mainline/ubuntu/ jammy nginx

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Provides Node.js
2+
deb http://deb.nodesource.com/node_14.x jammy main
3+
deb-src http://deb.nodesource.com/node_14.x jammy main

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Provides PHP
2+
deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main
3+
deb-src https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# VVV mirror packages
2+
# deb https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu jammy main
3+
# deb-src https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu jammy main

‎version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.11
1+
3.11.2

0 commit comments

Comments
 (0)