Compare commits

..

No commits in common. "e80dbb4aade8467995a108dc8c80e8359deca584" and "0d5754de1249cc509087863bb1db22f448993c63" have entirely different histories.

3 changed files with 51 additions and 90 deletions

View File

@ -4,13 +4,6 @@
- All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.
## 2023-06-16
### Changed
- **Proxmox VE Monitor-All**
- Skip instances based on onboot and templates. [8c2a3cc](https://github.com/tteck/Proxmox/commit/8c2a3cc4d774fa13d17f695d6bdf9a4deedb1372).
## 2023-06-12 ## 2023-06-12
### Changed ### Changed

View File

@ -5,7 +5,7 @@
# License: MIT # License: MIT
# https://github.com/tteck/Proxmox/raw/main/LICENSE # https://github.com/tteck/Proxmox/raw/main/LICENSE
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
catch_errors catch_errors
@ -13,82 +13,53 @@ setting_up_container
network_check network_check
update_os update_os
if [[ "$PCT_OSVERSION" == "12" ]]; then msg_info "Installing Dependencies (Patience)"
msg_info "Installing Dependencies, Bookworm (Patience)" $STD apt-get install -y \
$STD apt-get install -y \ git \
git \ curl \
curl \ sudo \
sudo \ mc \
mc \ build-essential \
python3 \ libssl-dev \
python3-dev \ zlib1g-dev \
python3-venv \ libbz2-dev \
python3-pip \ libpcap-dev \
bluez \ libreadline-dev \
libffi-dev \ libsqlite3-dev \
libssl-dev \ libncursesw5-dev \
libjpeg-dev \ xz-utils \
zlib1g-dev \ tk-dev \
autoconf \ llvm \
build-essential \ libxml2-dev \
libopenjp2-7 \ libxmlsec1-dev \
libturbojpeg0-dev \ libffi-dev \
tzdata \ liblzma-dev \
ffmpeg \ dbus-broker \
liblapack3 \ bluez \
liblapack-dev \ libmariadb-dev-compat \
libatlas-base-dev libjpeg-dev \
$STD systemctl disable systemd-networkd-wait-online.service autoconf \
msg_ok "Installed Dependencies" libopenjp2-7 \
else libtiff5 \
msg_info "Installing Dependencies, Bullseye (Patience)" libturbojpeg0-dev \
$STD apt-get install -y \ liblapack3 \
git \ liblapack-dev \
curl \ libatlas-base-dev
sudo \ msg_ok "Installed Dependencies"
mc \
build-essential \
libssl-dev \
zlib1g-dev \
libbz2-dev \
libpcap-dev \
libreadline-dev \
libsqlite3-dev \
libncursesw5-dev \
xz-utils \
tk-dev \
llvm \
libxml2-dev \
libxmlsec1-dev \
libffi-dev \
liblzma-dev \
dbus-broker \
bluez \
libmariadb-dev-compat \
libjpeg-dev \
autoconf \
libopenjp2-7 \
libtiff5 \
libturbojpeg0-dev \
liblapack3 \
liblapack-dev \
libatlas-base-dev
msg_ok "Installed Dependencies"
msg_info "Installing pyenv" msg_info "Installing pyenv"
$STD git clone https://github.com/pyenv/pyenv.git ~/.pyenv $STD git clone https://github.com/pyenv/pyenv.git ~/.pyenv
set +e set +e
echo 'export PYENV_ROOT="$HOME/.pyenv"' >>~/.bashrc echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc
echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >>~/.bashrc echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc
echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init --path)"\nfi' >>~/.bashrc echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init --path)"\nfi' >> ~/.bashrc
msg_ok "Installed pyenv" msg_ok "Installed pyenv"
. ~/.bashrc . ~/.bashrc
set -e set -e
msg_info "Installing Python 3.11.3 (Patience)" msg_info "Installing Python 3.11.3 (Patience)"
$STD pyenv install 3.11.3 $STD pyenv install 3.11.3
pyenv global 3.11.3 pyenv global 3.11.3
msg_ok "Installed Python 3.11.3" msg_ok "Installed Python 3.11.3"
fi
msg_info "Installing Home Assistant-Core" msg_info "Installing Home Assistant-Core"
mkdir /srv/homeassistant mkdir /srv/homeassistant
@ -97,6 +68,8 @@ python3 -m venv .
source bin/activate source bin/activate
$STD pip install --upgrade pip $STD pip install --upgrade pip
$STD python3 -m pip install wheel $STD python3 -m pip install wheel
$STD pip install mysqlclient
$STD pip install psycopg2-binary
$STD pip install homeassistant $STD pip install homeassistant
mkdir -p /root/.homeassistant mkdir -p /root/.homeassistant
msg_ok "Installed Home Assistant-Core" msg_ok "Installed Home Assistant-Core"

View File

@ -49,14 +49,9 @@ while true; do
IP=$(qm guest cmd $instance network-get-interfaces | egrep -o "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -E "192\.|10\." | head -n 1) IP=$(qm guest cmd $instance network-get-interfaces | egrep -o "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -E "192\.|10\." | head -n 1)
fi fi
# Skip instances based on onboot and templates # Skip instances based on templates
onboot=$($config_cmd $instance | grep onboot | grep -q "onboot: 0" && echo "true" || echo "false")
template=$($config_cmd $instance | grep template | grep -q "template:" && echo "true" || echo "false") template=$($config_cmd $instance | grep template | grep -q "template:" && echo "true" || echo "false")
if [ "$template" == "true" ]; then
if [ "$onboot" == "true" ]; then
echo "Skipping $instance because it is set not to boot"
continue
elif [ "$template" == "true" ]; then
echo "Skipping $instance because it is a template" echo "Skipping $instance because it is a template"
continue continue
fi fi