From ffe796fa99d771911c28a5e5f5379ca8538df211 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 27 Aug 2024 21:05:14 +0100 Subject: [PATCH 1/4] include the https apt transport package --- provision/core/vvv/provision.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/core/vvv/provision.sh b/provision/core/vvv/provision.sh index 5c1a00048..65c4024a2 100644 --- a/provision/core/vvv/provision.sh +++ b/provision/core/vvv/provision.sh @@ -16,6 +16,7 @@ function vvv_register_packages() { software-properties-common ca-certificates libgnutls30 + apt-transport-https # Daily automatic security package upgrades unattended-upgrades From de16c6b8f2ba1664c334a76b535c67cc6b1cde8a Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 27 Aug 2024 21:06:01 +0100 Subject: [PATCH 2/4] Add the mariadb signing PGP key --- .../apt-keys/mariadb_release_signing_key.pgp | Bin 0 -> 4797 bytes provision/core/mariadb/provision.sh | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 provision/core/mariadb/apt-keys/mariadb_release_signing_key.pgp diff --git a/provision/core/mariadb/apt-keys/mariadb_release_signing_key.pgp b/provision/core/mariadb/apt-keys/mariadb_release_signing_key.pgp new file mode 100644 index 0000000000000000000000000000000000000000..f6f2f2191852cca9dcba9a063211287d97067a9d GIT binary patch literal 4797 zcmY+{WmFVev5idO1nDjb!I2J$ zcYSx=_161%_Bv~SIO})z+W)~`2&Ud0umTMT_)P;h5o6H~Z$b{U=(uyN@e3f*rQo|o zXOD_2KdZ#1dT3FaD2P5o%V>ldiuh-F8c!k}BGc(p;6n|O9VcU#*H}D>NMl=;#k>fx}Cv567xmAtW& zeA;ElaWXVxvkp3^36GO*CAtJX%P@#`-J}!|LK3mb3aV{I#Afr7(dj5^+xC69e&|az zO`!gv+`j&Cl0wRv>wwEZ=UHXto>yAY$xlBAmlYB9WurRhPggR-SYO6Xtv)O^XzTEn zEa`bxTTPUdS0uv@RE4IasTq|HMnz?*_g%+LnYc2mdMyu<-FLihbs-B!gw>R3D&N3Q zq#k9IQAa)Gg_#Y7QJTvQYA;3T-rcXdyc?pc^sr)kv3wRXaAz$-sphjq` zbCG5Q0CYx|ppm%a;-C|kYpV-NMFrjfZUE$_(uNk%BwoY&-TSgUYA4W;He-GRa z);`jXe=k^B@Ho5LN+El_G0D+z0U#{&zlzXlF|Y~naB(ouu_@qj1R&fp={Zwo9rB#$|dIbB|<+0kBTgtF`40yaD>74d<0lDQbEWQRDF5;prbe!>c0Naf~SS zFaXyQlUG|Xt*)e-NyH^pPlF-rXrO#n6XG>gFSA%2aw-sLxD2eFp)($Wv)OY&S+ixH zsmMty#OYX}bL7ND(FYNu*~(PCd_5YM60EUEW54F%T;Hy5YOBIKbJQo1cfeteKF;V8 z_WMiDDkhh3re4oAsSX_ z#lL<_a?*0oAZr z4xod3W*}OAj#R)TBgF+^|CIyQ`>SJY43~qpRd$)p43Hn;owKcxuKJEZjN~*^iaUDK zaZVqQ=c;pscJ=wW>Un5Q!O!qKLYy#UDYDlHlk6XY|27K!+bHoJbw!0JqA4Yk?-L?S~mCrpxmDDF=sIVmAVY1O*V?OfUvCTiwf>$lq* zNFAfqq=M?*@VW^P_aMZta$BMtNDXs8Br(4WDbMOiG%Tu;b6k<^o@2@o+OWuwgiblH5sd+Dn?P(w? zaR%`#licABaI*SGyOT59jevoUl`SU@Pqb*$8S!KGd*OFN4!4c~n?+cKxmH1E+&gV9 zJMMUVk!{|Boz-HxU#M5HKN*5OZpmp%5|&vJqTKYr1bK7`F{LvXS9ea4pb8qtOg=Ft{8NUy)#(6d}Y! zIa%1hiAQWrA~{LL%UZQ{a2w8>heIJ%t^E7;ck!Ogoj|`IsAGD1fp)1z>(Sv0L2)7f zlWs0}7VrGi`x7O4Q*8c?B*BfH-`P}AwBzxWX1x;W)vgXu{5xz}FNwo^i>_KpZ=)** z!FMuYsgckfGM$ZU-u^RJ4Jdwm$E6i>3Qor}G{h*bk)sbFlM3TfkCA~*vLqUAqD<^5 zLP#69)#4-Yta%6r{n0V>jy;3l`@7cfz2s{uyg+Jg8JV|m3D)Fv2Lg!S6w#uKrd0J? z!osnEKktrS@sNV_jqub5L(Nfi(pBGLua)_dliUZBh_H&!ZBKTlB_WKOG@rVC?`^{o zM|7f5Aa?@Mrc9jxajukV<=c{V7+!%30?|YKeDs}UPk5P0mR-!(ih)W|kxGDxPK7>I zu&&rLYM1(s;u1z5DQk>=DSi}RGVFK8n~M(0X1phmSn{<0gZY}DV^!tVJ~qan*}pvS z|4t7B@^Xy7Jh~R-@+S9}BH5fsZqOhOmR+*YF^&dM%blof=RWFkS1S?HI%n$5ctF(1 z$OdtmCEYVPig9CSvu~F!?3D#ao4xZCV;(-j3~6Qh^o`&Ge;~n2KBOQ%9yY>wFE@u^ z;OMfa|7 zPKucYVDJ;$CgrL5pK@<{7r7lzYGS#7;wzQZ(+GV{MMbtsihbZR{D=Pta_D8TIK#)e zq|4?OBFkCQ$EO%sofB-xIVsj`y(*iAW zq{A_xtgGw-H~%PoC`2x+6lu$agR&>Nxk*;PTJ~dF`tj21_`7|f66pb{WwtC@T1f;F zzg(*{QoX{j)g%=rbf3JmZ>537du4LucM%!tWIfXSTj;6S^=!ZbOYhH?Vc0LWW?(Z| zz+DGVKX{Pn74ih74Q=#zz=|F2O-RWiHLNMP)*sLu0yduKm}E^4&aM~c<>}%@1j(`iaxH;dXD$K+`#+QR3K{i%d9rS5`u)MgBG538U^xTM*p8#_ z6QpZ@KsUG4t5ArYXOc#3d-%;lRp)&f@oI`{YGr(^fEH0Nt0w>pl};3C&;O_qWj+}5 zE`!;^Iv9AM(6@RcitKg61ft;s=${hi2aUGoM z8W@WK^?phwbtni_8;Rq~V)G`vjWEAR^_MhR0Q8B~nk<_umW z?b}KH65lD;ta4b4{1HxmJwND$xy7&X=6gCrK2A-ERkKF;xhQ+h_U2T)?NqW=_LJwD zIre+HIaF)n!WsGroM11Za5-;64X!KeefjT32OKz)7isS1S*+0)0U@P7wMk|inD0Z# z;+s1zdB)vF8K{nj#Z?JbX{TYdvZs>C7mz%T&o3UOmf~GCkLWOQ-&%!GzWw$hdoPT) zwT`g%w{B#vq$I1PotP!fo|^c^n?aw>BI`SD1@awm9|sC%+E9J zm-Bq3C`HtB*aPsH2J}3eePF1h zA^vXYARR=3_Hj6DZb6bE7PcVYqcTew2&@26VRH(Z#u7(uvwI)t&}llXK2L62G{Qpm zxc#$|{HsRw4ap;_e`dwdD_nPy=H=}6h`JIMx)Fd;{I8n-DumKF4N3hwUl_{#QaQ`lzRmHqpysjv z7BqY=tk$EUypMGgtc0r}v!nFm`tdgo^0HK8xb*Vi{@T>y&0$CjKmOoejpYl$B7!nq zWNR@2X$}Qm>bto|X^njtgeIfpBklK3gWYK#w;)qvZkB=bPCck+T z^rA;6jevM@w9izft#WC-1xurMAu0 z&8;s>rw7s$U7-y5Fy;2b4J=Uch%WAJn3~}pouke;Pa9$Vqzb)Fj;@7;{Vvl4W!^zH zCIR^Z1(EQrrY#8$CesC%)Nz>>XBP|jGwV7Y_voehI3Y}g>*)KW@5rY5;id}hUh+qS33fdI%(}#j0$R9f7|F-tLI42u`5>QXN6&TT#^P#GPqOTYpk_ zs7kitFmE%o^7P5M`JrI9Vgcjvrjey8%(++>bg$E6w&3@_Q54y0ib?&?VvqMm1Y+VAF>Y2eJb{X`LyKu*der2|yC8AtIFPV@9lEriQ2@;HYvGDH%Mda-^T3L$$?I>VHG zPtiZUyiyYX;AgF<_w!TG;A9CJ*3}DAc8Ht$`zfCK>?)iomy7xPUNu=BsY<>Z$+e*f zI6s~>-|LKZGy$*WTgRHx__GTN_t3Em$bQ(F*F@!<9&w@TCr|4hCh}~0&vO~o-(S{$ zgwkzukYb1#XSh)Gtuvucosj3wu3MD;C@@R*jaG=uHg?XmO6EiDb{1}I6WZ!!TP9T! zyPm^>#M9*Juz0KC@?6rU##F3%IAJmA;g{*OFNroa!k+gmML*FJ`{HD>O&a7f`2|dw zSQG-U@f*`d*jf(xs)Z?aQ(q4jwQ>2}l^WMPNG?pp$vF-Ul^%VS{%#0t1@e<4BWofH0>d2G* E4-~5gO8@`> literal 0 HcmV?d00001 diff --git a/provision/core/mariadb/provision.sh b/provision/core/mariadb/provision.sh index 702203645..2d3ad15a9 100644 --- a/provision/core/mariadb/provision.sh +++ b/provision/core/mariadb/provision.sh @@ -38,18 +38,24 @@ vvv_add_hook before_packages mariadb_before_packages function mariadb_register_apt_keys() { if ! vvv_apt_keys_has 'MariaDB'; then - # Apply the MariaDB signing keyg + # Apply the MariaDB signing key vvv_info " * Applying the MariaDB signing key..." apt-key add /srv/provision/core/mariadb/apt-keys/mariadb.key fi + mkdir -p /etc/apt/keyrings + cp -f "/srv/provision/core/mariadb/apt-keys/mariadb_release_signing_key.pgp" /etc/apt/keyrings/mariadb-keyring.pgp } vvv_add_hook register_apt_keys mariadb_register_apt_keys function mariadb_register_apt_sources() { vvv_info " * installing MariaDB apt sources" - local OSID=$(lsb_release --id --short) - local OSCODENAME=$(lsb_release --codename --short) - local APTSOURCE="/srv/provision/core/mariadb/sources-${OSID,,}-${OSCODENAME,,}.list" + local OSID + local OSCODENAME + local APTSOURCE + + OSID=$(lsb_release --id --short) + OSCODENAME=$(lsb_release --codename --short) + APTSOURCE="/srv/provision/core/mariadb/sources-${OSID,,}-${OSCODENAME,,}.list" if [ -f "${APTSOURCE}" ]; then cp -f "${APTSOURCE}" "/etc/apt/sources.list.d/vvv-mariadb-sources.list" else From d6ee483c894a7f88b99838fdfb3f4bc04f7b7827 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 27 Aug 2024 21:06:48 +0100 Subject: [PATCH 3/4] Switch MariaDB mirror and upgrade to v10.11, add source files for new distros --- provision/core/mariadb/provision.sh | 4 ++-- provision/core/mariadb/sources-debian-bookworm.list | 6 ++++++ provision/core/mariadb/sources-debian-bullseye.list | 6 ++++++ provision/core/mariadb/sources-debian-buster.list | 8 +++++--- provision/core/mariadb/sources-ubuntu-bionic.list | 8 +++++--- provision/core/mariadb/sources-ubuntu-focal.list | 8 +++++--- provision/core/mariadb/sources-ubuntu-jammy.list | 8 +++++--- provision/core/mariadb/sources-ubuntu-noble.list | 6 ++++++ 8 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 provision/core/mariadb/sources-debian-bookworm.list create mode 100644 provision/core/mariadb/sources-debian-bullseye.list create mode 100644 provision/core/mariadb/sources-ubuntu-noble.list diff --git a/provision/core/mariadb/provision.sh b/provision/core/mariadb/provision.sh index 2d3ad15a9..7c3edf216 100644 --- a/provision/core/mariadb/provision.sh +++ b/provision/core/mariadb/provision.sh @@ -8,8 +8,8 @@ function mariadb_before_packages() { # Use debconf-set-selections to specify the default password for the root MariaDB # account. This runs on every provision, even if MariaDB has been installed. If # MariaDB is already installed, it will not affect anything. - echo mariadb-server-10.5 mysql-server/root_password password "root" | debconf-set-selections - echo mariadb-server-10.5 mysql-server/root_password_again password "root" | debconf-set-selections + echo mariadb-server-10.11 mysql-server/root_password password "root" | debconf-set-selections + echo mariadb-server-10.11 mysql-server/root_password_again password "root" | debconf-set-selections vvv_info " * Setting up MySQL configuration file links..." diff --git a/provision/core/mariadb/sources-debian-bookworm.list b/provision/core/mariadb/sources-debian-bookworm.list new file mode 100644 index 000000000..ae454453b --- /dev/null +++ b/provision/core/mariadb/sources-debian-bookworm.list @@ -0,0 +1,6 @@ +# MariaDB 10.11 repository list - created 2024-08-27 19:49 UTC +# https://mariadb.org/download/ +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bookworm main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main diff --git a/provision/core/mariadb/sources-debian-bullseye.list b/provision/core/mariadb/sources-debian-bullseye.list new file mode 100644 index 000000000..13496b13f --- /dev/null +++ b/provision/core/mariadb/sources-debian-bullseye.list @@ -0,0 +1,6 @@ +# MariaDB 10.11 repository list - created 2024-08-27 19:49 UTC +# https://mariadb.org/download/ +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bullseye main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main diff --git a/provision/core/mariadb/sources-debian-buster.list b/provision/core/mariadb/sources-debian-buster.list index ee8184a0c..ee7118c20 100644 --- a/provision/core/mariadb/sources-debian-buster.list +++ b/provision/core/mariadb/sources-debian-buster.list @@ -1,4 +1,6 @@ -# MariaDB 10.5 repository list - created 2021-11-14 10:28 UTC +# MariaDB 10.11 repository list - created 2024-08-27 19:49 UTC # https://mariadb.org/download/ -deb [arch=amd64,arm64,ppc64el] https://mirror.rackspace.com/mariadb/repo/10.5/debian buster main -deb-src https://mirror.rackspace.com/mariadb/repo/10.5/debian buster main +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian buster main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main diff --git a/provision/core/mariadb/sources-ubuntu-bionic.list b/provision/core/mariadb/sources-ubuntu-bionic.list index 7eb7c38b8..283e4f30c 100644 --- a/provision/core/mariadb/sources-ubuntu-bionic.list +++ b/provision/core/mariadb/sources-ubuntu-bionic.list @@ -1,4 +1,6 @@ -# MariaDB 10.5 repository list - created UTC +# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC # https://mariadb.org/download/ -deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu bionic main -deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu bionic main +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu bionic main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main diff --git a/provision/core/mariadb/sources-ubuntu-focal.list b/provision/core/mariadb/sources-ubuntu-focal.list index 2e79e8fd9..a8bf3ac60 100644 --- a/provision/core/mariadb/sources-ubuntu-focal.list +++ b/provision/core/mariadb/sources-ubuntu-focal.list @@ -1,4 +1,6 @@ -# MariaDB 10.5 repository list - created UTC +# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC # https://mariadb.org/download/ -deb [arch=amd64,arm64,ppc64el,s390x] https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu focal main -deb-src https://mirror.rackspace.com/mariadb/repo/10.5/ubuntu focal main +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu focal main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu focal main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu focal main diff --git a/provision/core/mariadb/sources-ubuntu-jammy.list b/provision/core/mariadb/sources-ubuntu-jammy.list index 2bc69bbb2..4e1c521b4 100644 --- a/provision/core/mariadb/sources-ubuntu-jammy.list +++ b/provision/core/mariadb/sources-ubuntu-jammy.list @@ -1,4 +1,6 @@ -# MariaDB 10.5 repository list - created UTC +# MariaDB 10.11 repository list - created 2024-08-27 19:47 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 +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu jammy main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu jammy main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu jammy main diff --git a/provision/core/mariadb/sources-ubuntu-noble.list b/provision/core/mariadb/sources-ubuntu-noble.list new file mode 100644 index 000000000..ae026623b --- /dev/null +++ b/provision/core/mariadb/sources-ubuntu-noble.list @@ -0,0 +1,6 @@ +# MariaDB 10.11 repository list - created 2024-08-27 19:48 UTC +# https://mariadb.org/download/ +# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details. +# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu noble main +deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu noble main +# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu noble main From 3a1550c6ef35bc6c22674c2495a16309902bf77c Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Tue, 27 Aug 2024 21:08:29 +0100 Subject: [PATCH 4/4] add mariadb change to changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7d59a358..ad21a4b5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,14 @@ permalink: /docs/en-US/changelog/ ## 3.14 ( 2024 ETA ) +### Enhancements + +* Upgraded MariaDB from 10.5 to 10.11 ( #2728 ) + ### Bug Fixes * VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 ) +* Switched from Rackspace to Starburst services for MariaDB mirrors ( #2728 ) ## 3.13.2 ( 2024 July 19th )