Skip to content

fix: add proxmox support #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eball merged 1 commit into from
Aug 26, 2024
Merged

fix: add proxmox support #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/installer/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

set -o pipefail

SUDO=$(command -v sudo)
export VERSION="#__VERSION__"
if [ "x${VERSION}" = "x" ]; then
echo "Unable to get latest Install-Wizard version. Set VERSION env var and re-run. For example: export VERSION=1.0.0"
Expand Down Expand Up @@ -61,7 +62,7 @@ echo "Install-Wizard ${VERSION} Download Complete!"
echo ""

if command -v tar &>/dev/null; then
sudo rm -rf ${foldername} && mkdir -p ${foldername} && cd ${foldername} && tar -xzf "../${filename}"
${SUDO} rm -rf ${foldername} && mkdir -p ${foldername} && cd ${foldername} && tar -xzf "../${filename}"

CLI_VERSION="0.1.13"
CLI_FILE="terminus-cli-v${CLI_VERSION}_linux_${ARCH}.tar.gz"
Expand Down
80 changes: 72 additions & 8 deletions build/installer/install_cmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ precheck_os() {
# check os type and arch and os vesion
os_type=$(uname -s)
os_arch=$(uname -m)
os_info=$(uname -a)
os_verion=$(lsb_release -r 2>&1 | awk -F'\t' '{print $2}')

case "$os_arch" in
Expand All @@ -230,8 +231,14 @@ precheck_os() {
log_fatal "unsupported os arch '${os_arch}', only supported 'x86_64' or 'aarch64' architecture"
fi

if [[ $(is_ubuntu) -eq 0 && $(is_debian) -eq 0 && $(is_raspbian) -eq 0 ]]; then
log_fatal "unsupported os version '${os_verion}'"
if [ $(is_pve) -eq 1 ]; then
if [ $(pve_support) -eq 0 ]; then
log_fatal "unsupported os version '${os_info}'"
fi
else
if [[ $(is_ubuntu) -eq 0 && $(is_debian) -eq 0 && $(is_raspbian) -eq 0 ]]; then
log_fatal "unsupported os version '${os_verion}'"
fi
fi

OS_ARCH="$os_arch"
Expand Down Expand Up @@ -371,6 +378,43 @@ precheck_localip() {
local_ip="$ip"
}

pve_support() {
lsb_release=$(lsb_release -d 2>&1 | awk -F'\t' '{print $2}')
if [ -z "$lsb_release" ]; then
p=$(cat /etc/os-release | grep "^NAME" /etc/os-release | cut -d'=' -f2 | tr -d '"')
v=$(cat /etc/os-release | grep "^VERSION_ID" /etc/os-release | cut -d'=' -f2 | tr -d '"')
lsb_release="${p} ${v}"
fi
case "$lsb_release" in
*Debian* | *debian*)
case "$lsb_release" in
*12* | *11*)
echo 1
;;
*)
echo 0
;;
esac
;;
*Ubuntu* | *ubuntu*)
case "$lsb_release" in
*24.*)
echo 2
;;
*22.* | *20.*)
echo 1
;;
*)
echo 0
;;
esac
;;
*)
echo 0
;;
esac
}


is_debian() {
lsb_release=$(lsb_release -d 2>&1 | awk -F'\t' '{print $2}')
Expand Down Expand Up @@ -446,17 +490,35 @@ is_wsl(){
echo 0
}

is_pve(){
pve=$(uname -a 2>&1)
if [[ ${pve} == *-pve* ]]; then
echo 1
return
fi

echo 0
}

install_deps() {
if [ x"$PREPARED" == x"1" ]; then
return
fi
case "$lsb_dist" in
ubuntu|debian|raspbian)
pre_reqs="apt-transport-https ca-certificates curl"
if ! command -v gpg > /dev/null; then
pre_reqs="$pre_reqs gnupg"
fi
ensure_success $sh_c 'apt-get update -qq >/dev/null'
if ! command -v gpg > /dev/null; then
pre_reqs="$pre_reqs gnupg"
fi
if ! command -v sudo > /dev/null; then
pre_reqs="$pre_reqs sudo"
fi

if [ $(is_pve) -eq 0 ]; then
ensure_success $sh_c 'apt-get update -qq >/dev/null'
else
$sh_c 'apt-get update -qq >/dev/null'
fi
ensure_success $sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pre_reqs >/dev/null"
ensure_success $sh_c 'DEBIAN_FRONTEND=noninteractive apt-get install -y conntrack socat apache2-utils ntpdate net-tools make gcc openssh-server >/dev/null'
;;
Expand Down Expand Up @@ -1118,7 +1180,9 @@ WantedBy=multi-user.target
_END

ensure_success $sh_c "cat redis-server.service > /etc/systemd/system/redis-server.service"
ensure_success $sh_c "sysctl -w vm.overcommit_memory=1 net.core.somaxconn=10240 >/dev/null"
if [ $(is_pve) -eq 0 ]; then
ensure_success $sh_c "sysctl -w vm.overcommit_memory=1 net.core.somaxconn=10240 >/dev/null"
fi

ensure_success $sh_c "systemctl daemon-reload >/dev/null"
ensure_success $sh_c "systemctl restart redis-server >/dev/null; true"
Expand Down Expand Up @@ -2278,7 +2342,7 @@ Main() {
log_info 'Installing terminus ...\n'
config_proxy_resolv_conf

if [[ $(is_wsl) -eq 0 ]]; then
if [[ $(is_wsl) -eq 0 && $(is_pve) -eq 0 ]]; then
install_storage
fi

Expand Down
3 changes: 2 additions & 1 deletion build/installer/publicInstaller.latest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@



SUDO=$(command -v sudo)
set -o pipefail

VERSION="#{{LATEST_VERSION}}"
Expand Down Expand Up @@ -64,7 +65,7 @@ echo "Install-Wizard ${VERSION} Download Complete!"
echo ""

if command -v tar &>/dev/null; then
sudo rm -rf ${foldername} && mkdir -p ${foldername} && cd ${foldername} && tar -xzf "../${filename}"
${SUDO} rm -rf ${foldername} && mkdir -p ${foldername} && cd ${foldername} && tar -xzf "../${filename}"

CLI_VERSION="0.1.13"
CLI_FILE="terminus-cli-v${CLI_VERSION}_linux_${ARCH}.tar.gz"
Expand Down
3 changes: 2 additions & 1 deletion build/installer/publicInstaller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@



SUDO=$(command -v sudo)
set -o pipefail

if [ "x${VERSION}" = "x" ]; then
Expand Down Expand Up @@ -30,7 +31,7 @@ fi
ret='0'
command -v tar >/dev/null 2>&1 || { ret='1'; }
if [ "$ret" -eq 0 ]; then
sudo rm -rf install-wizard && mkdir -p install-wizard && cd install-wizard && tar -xzf "../${filename}"
${SUDO} rm -rf install-wizard && mkdir -p install-wizard && cd install-wizard && tar -xzf "../${filename}"
else
echo "Install-Wizard ${VERSION} Download Complete!"
echo ""
Expand Down