fix(fleet,mysql): switch Fleet to MariaDB, add mysql case to manage_tool_repository
- fleet: use setup_mariadb instead of setup_mysql (MariaDB works fine for Fleet and avoids MySQL repo complexity on trixie) - tools.func: add missing mysql) case block to manage_tool_repository (was causing 'Unknown tool repository: mysql' error)
This commit is contained in:
@@ -13,7 +13,7 @@ setting_up_container
|
|||||||
network_check
|
network_check
|
||||||
update_os
|
update_os
|
||||||
|
|
||||||
setup_mysql
|
setup_mariadb
|
||||||
|
|
||||||
msg_info "Setting up Database"
|
msg_info "Setting up Database"
|
||||||
FLEET_DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c 13)
|
FLEET_DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c 13)
|
||||||
|
|||||||
@@ -894,6 +894,41 @@ Suites: $distro_codename-pgdg
|
|||||||
Components: main
|
Components: main
|
||||||
Architectures: $(dpkg --print-architecture)
|
Architectures: $(dpkg --print-architecture)
|
||||||
Signed-By: /etc/apt/keyrings/postgresql.gpg
|
Signed-By: /etc/apt/keyrings/postgresql.gpg
|
||||||
|
EOF
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
|
||||||
|
mysql)
|
||||||
|
if [[ -z "$repo_url" || -z "$gpg_key_url" ]]; then
|
||||||
|
msg_error "MySQL repository requires repo_url and gpg_key_url"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cleanup_old_repo_files "mysql"
|
||||||
|
|
||||||
|
if ! download_gpg_key "$gpg_key_url" "/etc/apt/keyrings/mysql.gpg" "dearmor"; then
|
||||||
|
msg_error "Failed to import MySQL GPG key"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local distro_codename
|
||||||
|
distro_codename=$(awk -F= '/^VERSION_CODENAME=/{print $2}' /etc/os-release)
|
||||||
|
|
||||||
|
local mysql_suite="$distro_codename"
|
||||||
|
if [[ "$distro_id" == "debian" ]]; then
|
||||||
|
case "$distro_codename" in
|
||||||
|
trixie | bookworm | bullseye) mysql_suite="$distro_codename" ;;
|
||||||
|
*) mysql_suite="bookworm" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat <<EOF >/etc/apt/sources.list.d/mysql.sources
|
||||||
|
Types: deb
|
||||||
|
URIs: $repo_url
|
||||||
|
Suites: $mysql_suite
|
||||||
|
Components: mysql-$version mysql-tools
|
||||||
|
Architectures: $(dpkg --print-architecture)
|
||||||
|
Signed-By: /etc/apt/keyrings/mysql.gpg
|
||||||
EOF
|
EOF
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
@@ -4464,7 +4499,7 @@ function setup_hwaccel() {
|
|||||||
msg_info "Configuring: ${gpu_name}"
|
msg_info "Configuring: ${gpu_name}"
|
||||||
|
|
||||||
case "$gpu_type" in
|
case "$gpu_type" in
|
||||||
# ─────────────────────────────────────────────────────────────────────────
|
# ──────────<EFBFBD><EFBFBD>──────────────────────────────────────────────────────────────
|
||||||
# Intel Arc GPUs (DG1, DG2, Arc A-series)
|
# Intel Arc GPUs (DG1, DG2, Arc A-series)
|
||||||
# ─────────────────────────────────────────────────────────────────────────
|
# ─────────────────────────────────────────────────────────────────────────
|
||||||
INTEL_ARC)
|
INTEL_ARC)
|
||||||
|
|||||||
Reference in New Issue
Block a user