From ec432fce345e6fabd29afd068bf0edcb42e15cb0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 26 Mar 2023 22:56:13 -0400 Subject: [PATCH 01/45] Update nginxproxymanager-install.sh hold v2.9.22 --- install/nginxproxymanager-install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index b2baa37f..bda3670c 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -66,10 +66,10 @@ RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-man grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -msg_info "Downloading Nginx Proxy Manager v$RELEASE" -wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v$RELEASE -O - | tar -xz -cd ./nginx-proxy-manager-$RELEASE -msg_ok "Downloaded Nginx Proxy Manager v$RELEASE" +msg_info "Downloading Nginx Proxy Manager v2.9.22" +wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz +cd ./nginx-proxy-manager-2.9.22 +msg_ok "Downloaded Nginx Proxy Manager v2.9.22" msg_info "Setting up Enviroment" ln -sf /usr/bin/python3 /usr/bin/python @@ -77,8 +77,8 @@ ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx -sed -i "s+0.0.0+${RELEASE}+g" backend/package.json -sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json +sed -i "s+0.0.0+2.9.22+g" backend/package.json +sed -i "s+0.0.0+2.9.22+g" frontend/package.json sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") From 636ca27c9e3aea3cfcd45d96abc34b1e00327340 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 26 Mar 2023 22:58:34 -0400 Subject: [PATCH 02/45] Update nginxproxymanager.sh hold v2.9.22 --- ct/nginxproxymanager.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 99b95e30..ce7fc32f 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -74,18 +74,18 @@ function update_script() { /var/cache/nginx &>/dev/null msg_ok "Cleaned Old Files" - msg_info "Downloading NPM v${RELEASE}" - wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz &>/dev/null - cd nginx-proxy-manager-${RELEASE} - msg_ok "Downloaded NPM v${RELEASE}" + msg_info "Downloading NPM v2.9.22" + wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz &>/dev/null + cd nginx-proxy-manager-2.9.22 + msg_ok "Downloaded NPM v2.9.22" msg_info "Setting up Enviroment" ln -sf /usr/bin/python3 /usr/bin/python ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx - sed -i "s+0.0.0+${RELEASE}+g" backend/package.json - sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json + sed -i "s+0.0.0+2.9.22+g" backend/package.json + sed -i "s+0.0.0+2.9.22+g" frontend/package.json sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") for NGINX_CONF in $NGINX_CONFS; do From 7daa751c3c9866a2148331bd24a27ff07dac2e4e Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 10:03:50 -0400 Subject: [PATCH 03/45] Update grafana-install.sh enable/start grafana --- install/grafana-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/grafana-install.sh b/install/grafana-install.sh index 718cc230..1ab76079 100644 --- a/install/grafana-install.sh +++ b/install/grafana-install.sh @@ -30,6 +30,8 @@ msg_ok "Set up Grafana Repository" msg_info "Installing Grafana" $STD apt-get update $STD apt-get install -y grafana +systemctl start grafana-server +systemctl enable --now -q grafana-server.service msg_ok "Installed Grafana" motd_ssh From c536591de396b07b41e5011a65f24eeb73604042 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 11:09:03 -0400 Subject: [PATCH 04/45] Delete alpine-esphome.sh nonoperational --- ct/alpine-esphome.sh | 88 -------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 ct/alpine-esphome.sh diff --git a/ct/alpine-esphome.sh b/ct/alpine-esphome.sh deleted file mode 100644 index 5497853b..00000000 --- a/ct/alpine-esphome.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) -# Copyright (c) 2021-2023 tteck -# Author: tteck (tteckster) -# License: MIT -# https://github.com/tteck/Proxmox/raw/main/LICENSE - -function header_info { - clear - cat <<"EOF" - ___________ ____ __ __ - / ____/ ___// __ \/ / / /___ ____ ___ ___ - / __/ \__ \/ /_/ / /_/ / __ \/ __ `__ \/ _ \ - / /___ ___/ / ____/ __ / /_/ / / / / / / __/ -/_____//____/_/ /_/ /_/\____/_/ /_/ /_/\___/ - Alpine - -EOF -} -header_info -echo -e "Loading..." -APP="Alpine-ESPHome" -var_disk="2" -var_cpu="1" -var_ram="512" -var_os="alpine" -var_version="3.17" -variables -color -catch_errors - -function default_settings() { - CT_TYPE="1" - PW="" - CT_ID=$NEXTID - HN=$NSAPP - DISK_SIZE="$var_disk" - CORE_COUNT="$var_cpu" - RAM_SIZE="$var_ram" - BRG="vmbr0" - NET=dhcp - GATE="" - DISABLEIP6="no" - MTU="" - SD="" - NS="" - MAC="" - VLAN="" - SSH="no" - VERB="no" - echo_default -} - -function update_script() { - if [[ ! -f /usr/bin/esphome ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - while true; do - CHOICE=$( - whiptail --title "SUPPORT" --menu "Select option" 11 58 1 \ - "1" "Check for ESPHome Updates" 3>&2 2>&1 1>&3 - ) - exit_status=$? - if [ $exit_status == 1 ]; then - clear - exit-script - fi - header_info - case $CHOICE in - 1) - msg_info "Updating ESPHome" - pip3 install esphome --upgrade &>/dev/null - rc-service -q esphome restart - msg_ok "Updated Successfully!" - exit - ;; - esac - done -} - -start -build_container -description - -msg_ok "Completed Successfully!\n" -echo -e "${APP} should be reachable by going to the following URL. - ${BL}http://${IP}:6052${CL} \n" From 0efbaa27eeb0ed12fc0714c84141df9377f7f655 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 11:09:34 -0400 Subject: [PATCH 05/45] Delete alpine-esphome-install.sh nonoperational --- install/alpine-esphome-install.sh | 51 ------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 install/alpine-esphome-install.sh diff --git a/install/alpine-esphome-install.sh b/install/alpine-esphome-install.sh deleted file mode 100644 index d9d84bde..00000000 --- a/install/alpine-esphome-install.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2021-2023 tteck -# Author: tteck (tteckster) -# License: MIT -# https://github.com/tteck/Proxmox/raw/main/LICENSE -source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" - -color -verb_ip6 -catch_errors -setting_up_container -network_check -update_os - -msg_info "Installing Dependencies" -$STD apk add newt -$STD apk add curl -$STD apk add openssh -$STD apk add nano -$STD apk add mc -$STD apk add git -msg_ok "Installed Dependencies" - -msg_info "Installing pip3 Package Manager" -$STD apk add py3-pip -msg_ok "Installed pip3 Package Manager" - -msg_info "Installing Alpine-ESPHome" -$STD pip3 install esphome -$STD pip3 install tornado esptool - -echo "#!/sbin/openrc-run -description=\"ESPHome\" -pidfile=\"/run/esphome.pid\" -start() { - esphome dashboard /root/esphome/config/ > /dev/null 2>&1 & - echo \$! > \$pidfile -} -stop() { - kill \$(cat \$pidfile) - rm \$pidfile -}" >/etc/init.d/esphome - -chmod 755 /etc/init.d/esphome -rc-service -q esphome start -rc-update add -q esphome default -msg_ok "Installed Alpine-ESPHome" - -motd_ssh -root From 8ff557f9c2e53bfc1671ed6138e0390a171d2c47 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 11:11:49 -0400 Subject: [PATCH 06/45] Update CHANGELOG.MD --- CHANGELOG.MD | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 94366868..1463c0d3 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,6 +2,13 @@ # Change Log All notable changes to this project will be documented in this file. +## 2023-03-27 + +### Changed + +- **Removed Alpine-ESPHome LXC** + - Nonoperational + ## 2023-03-25 ### Changed From 3d3a03ce3faefebbcaba6626bdb6fbbe8ea9460b Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 18:58:28 -0400 Subject: [PATCH 07/45] Update alpine-whoogle.sh ssh_check --- ct/alpine-whoogle.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/alpine-whoogle.sh b/ct/alpine-whoogle.sh index b2e2eaa7..7dbf5066 100644 --- a/ct/alpine-whoogle.sh +++ b/ct/alpine-whoogle.sh @@ -79,6 +79,7 @@ function update_script() { done } +ssh_check start build_container description From 36ee55e61d2fbcbadf5c111fe38064ef1e827fe5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 19:02:50 -0400 Subject: [PATCH 08/45] Update build.func tweak --- misc/build.func | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/build.func b/misc/build.func index 45176495..465d132f 100644 --- a/misc/build.func +++ b/misc/build.func @@ -71,6 +71,7 @@ ssh_check() { if whiptail --defaultno --title "SSH DETECTED" --yesno "The scripts suggest using the Proxmox shell instead of SSH, since the latter can create issues while gathering variables. Would you like to proceed with using SSH?" 10 68; then echo "you've been warned" else + clear exit fi fi From 726cbe6ba9ecaf515dc01944df787752a65a326a Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 19:09:22 -0400 Subject: [PATCH 09/45] add ssh_check --- ct/adguard.sh | 1 + ct/alpine-adguard.sh | 1 + ct/alpine-docker.sh | 1 + ct/alpine-grafana.sh | 1 + ct/alpine-vaultwarden.sh | 1 + ct/alpine-zigbee2mqtt.sh | 1 + ct/alpine.sh | 1 + ct/audiobookshelf.sh | 1 + ct/autobrr.sh | 1 + ct/blocky.sh | 1 + ct/casaos.sh | 1 + ct/changedetection.sh | 1 + ct/cronicle.sh | 1 + ct/daemonsync.sh | 1 + ct/dashy.sh | 1 + ct/debian.sh | 1 + ct/deconz.sh | 1 + ct/deluge.sh | 1 + ct/devuan.sh | 1 + ct/docker.sh | 1 + ct/emby.sh | 1 + ct/emqx.sh | 1 + ct/esphome.sh | 1 + ct/go2rtc.sh | 1 + ct/grafana.sh | 1 + ct/grocy.sh | 1 + ct/heimdalldashboard.sh | 1 + ct/homeassistant-core.sh | 1 + ct/homeassistant.sh | 1 + ct/homebridge.sh | 1 + ct/homepage.sh | 1 + ct/homer.sh | 1 + ct/hyperion.sh | 1 + ct/influxdb.sh | 1 + ct/iobroker.sh | 1 + ct/jackett.sh | 1 + ct/jellyfin.sh | 1 + ct/k0s.sh | 1 + ct/kavita.sh | 1 + ct/keycloak.sh | 1 + ct/lidarr.sh | 1 + ct/magicmirror.sh | 1 + ct/mariadb.sh | 1 + ct/meshcentral.sh | 1 + ct/motioneye.sh | 1 + ct/mqtt.sh | 1 + ct/n8n.sh | 1 + ct/navidrome.sh | 1 + ct/nextcloudpi.sh | 1 + ct/nginxproxymanager.sh | 1 + ct/nocodb.sh | 1 + ct/node-red.sh | 1 + ct/omada.sh | 1 + ct/omv.sh | 1 + ct/openhab.sh | 1 + ct/paperless-ngx.sh | 1 + ct/photoprism.sh | 1 + ct/pihole.sh | 1 + ct/plex.sh | 1 + ct/podman-homeassistant.sh | 1 + ct/podman.sh | 1 + ct/postgresql.sh | 1 + ct/prometheus.sh | 1 + ct/prowlarr.sh | 1 + ct/qbittorrent.sh | 1 + ct/radarr.sh | 1 + ct/readarr.sh | 1 + ct/rockylinux.sh | 1 + ct/rstptoweb.sh | 1 + ct/sabnzbd.sh | 1 + ct/scrypted.sh | 1 + ct/shinobi.sh | 1 + ct/sonarr.sh | 1 + ct/syncthing.sh | 1 + ct/tdarr.sh | 1 + ct/technitiumdns.sh | 1 + ct/transmission.sh | 1 + ct/trilium.sh | 1 + ct/ubuntu.sh | 1 + ct/umbrel.sh | 1 + ct/unifi.sh | 1 + ct/uptimekuma.sh | 1 + ct/vaultwarden.sh | 1 + ct/whisparr.sh | 1 + ct/whoogle.sh | 1 + ct/wikijs.sh | 1 + ct/wireguard.sh | 1 + ct/yunohost.sh | 1 + ct/zigbee2mqtt.sh | 1 + ct/zwave-js-ui.sh | 1 + 90 files changed, 90 insertions(+) diff --git a/ct/adguard.sh b/ct/adguard.sh index e8c65085..c36e12bf 100644 --- a/ct/adguard.sh +++ b/ct/adguard.sh @@ -78,6 +78,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/alpine-adguard.sh b/ct/alpine-adguard.sh index 248aa7f2..5dd9e955 100644 --- a/ct/alpine-adguard.sh +++ b/ct/alpine-adguard.sh @@ -81,6 +81,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-docker.sh b/ct/alpine-docker.sh index a7b08ba6..8bde63ce 100644 --- a/ct/alpine-docker.sh +++ b/ct/alpine-docker.sh @@ -75,6 +75,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-grafana.sh b/ct/alpine-grafana.sh index 7cb26ae6..36872876 100644 --- a/ct/alpine-grafana.sh +++ b/ct/alpine-grafana.sh @@ -88,6 +88,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 45ea5390..70b5f7f8 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -81,6 +81,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-zigbee2mqtt.sh b/ct/alpine-zigbee2mqtt.sh index 55df4544..f9185143 100644 --- a/ct/alpine-zigbee2mqtt.sh +++ b/ct/alpine-zigbee2mqtt.sh @@ -75,6 +75,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine.sh b/ct/alpine.sh index a3348a9f..3eb6a0c9 100644 --- a/ct/alpine.sh +++ b/ct/alpine.sh @@ -63,6 +63,7 @@ exit; fi } +ssh_check start build_container description diff --git a/ct/audiobookshelf.sh b/ct/audiobookshelf.sh index 558dbc44..b208249c 100644 --- a/ct/audiobookshelf.sh +++ b/ct/audiobookshelf.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/autobrr.sh b/ct/autobrr.sh index 3261b560..91e8a8be 100644 --- a/ct/autobrr.sh +++ b/ct/autobrr.sh @@ -71,6 +71,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/blocky.sh b/ct/blocky.sh index 08e769e8..4a2f77b2 100644 --- a/ct/blocky.sh +++ b/ct/blocky.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/casaos.sh b/ct/casaos.sh index c98a025d..593379c8 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/changedetection.sh b/ct/changedetection.sh index c8da20ae..d0ba97e8 100644 --- a/ct/changedetection.sh +++ b/ct/changedetection.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/cronicle.sh b/ct/cronicle.sh index 53702989..3f812270 100644 --- a/ct/cronicle.sh +++ b/ct/cronicle.sh @@ -100,6 +100,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/daemonsync.sh b/ct/daemonsync.sh index d13e5b40..7f6ed79f 100644 --- a/ct/daemonsync.sh +++ b/ct/daemonsync.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/dashy.sh b/ct/dashy.sh index 5c76cf70..7b95c492 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -86,6 +86,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/debian.sh b/ct/debian.sh index b67a0a26..dc09cba4 100644 --- a/ct/debian.sh +++ b/ct/debian.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/deconz.sh b/ct/deconz.sh index 6195bd10..f5aee5fc 100644 --- a/ct/deconz.sh +++ b/ct/deconz.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/deluge.sh b/ct/deluge.sh index 0b3ce6c4..b82cebce 100644 --- a/ct/deluge.sh +++ b/ct/deluge.sh @@ -61,6 +61,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/devuan.sh b/ct/devuan.sh index db48bf4e..beb4b23d 100644 --- a/ct/devuan.sh +++ b/ct/devuan.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/docker.sh b/ct/docker.sh index 1805787c..77b9c184 100644 --- a/ct/docker.sh +++ b/ct/docker.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/emby.sh b/ct/emby.sh index 2e617cfb..d87c1aae 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -71,6 +71,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/emqx.sh b/ct/emqx.sh index 7c0ffcd9..e3ce0056 100644 --- a/ct/emqx.sh +++ b/ct/emqx.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/esphome.sh b/ct/esphome.sh index cd6e56d2..82c0c6c8 100644 --- a/ct/esphome.sh +++ b/ct/esphome.sh @@ -68,6 +68,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/go2rtc.sh b/ct/go2rtc.sh index 58b82f5c..b840dc30 100644 --- a/ct/go2rtc.sh +++ b/ct/go2rtc.sh @@ -61,6 +61,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/grafana.sh b/ct/grafana.sh index 3de34626..4a363954 100644 --- a/ct/grafana.sh +++ b/ct/grafana.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/grocy.sh b/ct/grocy.sh index dd30c554..f33b8a87 100644 --- a/ct/grocy.sh +++ b/ct/grocy.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/heimdalldashboard.sh b/ct/heimdalldashboard.sh index aad87f46..6eeaf236 100644 --- a/ct/heimdalldashboard.sh +++ b/ct/heimdalldashboard.sh @@ -140,6 +140,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index 858433c2..b635db1d 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -207,6 +207,7 @@ EOF fi } +ssh_check start build_container description diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index ac667247..7c96ab1c 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -128,6 +128,7 @@ WantedBy=default.target" >$service_path fi } +ssh_check start build_container description diff --git a/ct/homebridge.sh b/ct/homebridge.sh index 22039d22..8b67fdb1 100644 --- a/ct/homebridge.sh +++ b/ct/homebridge.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/homepage.sh b/ct/homepage.sh index e8041087..87bc8cc1 100644 --- a/ct/homepage.sh +++ b/ct/homepage.sh @@ -67,6 +67,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/homer.sh b/ct/homer.sh index 217b2800..05939da2 100644 --- a/ct/homer.sh +++ b/ct/homer.sh @@ -84,6 +84,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/hyperion.sh b/ct/hyperion.sh index 92535765..0021c3be 100644 --- a/ct/hyperion.sh +++ b/ct/hyperion.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/influxdb.sh b/ct/influxdb.sh index f6c078cf..8b6c3150 100644 --- a/ct/influxdb.sh +++ b/ct/influxdb.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/iobroker.sh b/ct/iobroker.sh index 841f135e..17dcd29d 100644 --- a/ct/iobroker.sh +++ b/ct/iobroker.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/jackett.sh b/ct/jackett.sh index f895f4d7..2c6eff8d 100644 --- a/ct/jackett.sh +++ b/ct/jackett.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh index d11b8212..a67c5967 100644 --- a/ct/jellyfin.sh +++ b/ct/jellyfin.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/k0s.sh b/ct/k0s.sh index 75b5648a..5f39de39 100644 --- a/ct/k0s.sh +++ b/ct/k0s.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/kavita.sh b/ct/kavita.sh index 8410daa7..f0ebf4cc 100644 --- a/ct/kavita.sh +++ b/ct/kavita.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/keycloak.sh b/ct/keycloak.sh index 4488dd1a..2585d900 100644 --- a/ct/keycloak.sh +++ b/ct/keycloak.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/lidarr.sh b/ct/lidarr.sh index 6bc88997..c4959153 100644 --- a/ct/lidarr.sh +++ b/ct/lidarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/magicmirror.sh b/ct/magicmirror.sh index c57121c2..aeda1e47 100644 --- a/ct/magicmirror.sh +++ b/ct/magicmirror.sh @@ -63,6 +63,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/mariadb.sh b/ct/mariadb.sh index d6894ed9..857fabbb 100644 --- a/ct/mariadb.sh +++ b/ct/mariadb.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/meshcentral.sh b/ct/meshcentral.sh index 2739b517..932ea4bd 100644 --- a/ct/meshcentral.sh +++ b/ct/meshcentral.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/motioneye.sh b/ct/motioneye.sh index 4a106f03..b5084568 100644 --- a/ct/motioneye.sh +++ b/ct/motioneye.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/mqtt.sh b/ct/mqtt.sh index 0dde1c0e..312c467d 100644 --- a/ct/mqtt.sh +++ b/ct/mqtt.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/n8n.sh b/ct/n8n.sh index d4862ef1..297c9eed 100644 --- a/ct/n8n.sh +++ b/ct/n8n.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/navidrome.sh b/ct/navidrome.sh index c9e53584..0ebb3d38 100644 --- a/ct/navidrome.sh +++ b/ct/navidrome.sh @@ -71,6 +71,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/nextcloudpi.sh b/ct/nextcloudpi.sh index a1718208..52f04f49 100644 --- a/ct/nextcloudpi.sh +++ b/ct/nextcloudpi.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index ce7fc32f..012ebd53 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -171,6 +171,7 @@ EOF exit } +ssh_check start build_container description diff --git a/ct/nocodb.sh b/ct/nocodb.sh index 4b7636f6..e56521ba 100644 --- a/ct/nocodb.sh +++ b/ct/nocodb.sh @@ -63,6 +63,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/node-red.sh b/ct/node-red.sh index 3dba9183..c90d898c 100644 --- a/ct/node-red.sh +++ b/ct/node-red.sh @@ -96,6 +96,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/omada.sh b/ct/omada.sh index 104183df..51127d43 100644 --- a/ct/omada.sh +++ b/ct/omada.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/omv.sh b/ct/omv.sh index 532df042..c898c92e 100644 --- a/ct/omv.sh +++ b/ct/omv.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/openhab.sh b/ct/openhab.sh index 21a77dc7..d197aec1 100644 --- a/ct/openhab.sh +++ b/ct/openhab.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/paperless-ngx.sh b/ct/paperless-ngx.sh index 09d46d45..30b1d9f9 100644 --- a/ct/paperless-ngx.sh +++ b/ct/paperless-ngx.sh @@ -132,6 +132,7 @@ EOF fi } +ssh_check start build_container description diff --git a/ct/photoprism.sh b/ct/photoprism.sh index 231f7d1e..c6c943bd 100644 --- a/ct/photoprism.sh +++ b/ct/photoprism.sh @@ -86,6 +86,7 @@ function update_script() { exit } +ssh_check start build_container description diff --git a/ct/pihole.sh b/ct/pihole.sh index 07e786ea..57f09f15 100644 --- a/ct/pihole.sh +++ b/ct/pihole.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/plex.sh b/ct/plex.sh index 48d12505..beb328e7 100644 --- a/ct/plex.sh +++ b/ct/plex.sh @@ -71,6 +71,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/podman-homeassistant.sh b/ct/podman-homeassistant.sh index d916cc95..e3ccf4d7 100644 --- a/ct/podman-homeassistant.sh +++ b/ct/podman-homeassistant.sh @@ -111,6 +111,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/podman.sh b/ct/podman.sh index b4297c51..c18a858a 100644 --- a/ct/podman.sh +++ b/ct/podman.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/postgresql.sh b/ct/postgresql.sh index f0b606a1..606ee95d 100644 --- a/ct/postgresql.sh +++ b/ct/postgresql.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/prometheus.sh b/ct/prometheus.sh index 16f17758..bfbf2367 100644 --- a/ct/prometheus.sh +++ b/ct/prometheus.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/prowlarr.sh b/ct/prowlarr.sh index 2c323541..cb5c5347 100644 --- a/ct/prowlarr.sh +++ b/ct/prowlarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/qbittorrent.sh b/ct/qbittorrent.sh index 83cc8526..499cfcf3 100644 --- a/ct/qbittorrent.sh +++ b/ct/qbittorrent.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/radarr.sh b/ct/radarr.sh index a379e8ac..df6704a8 100644 --- a/ct/radarr.sh +++ b/ct/radarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/readarr.sh b/ct/readarr.sh index bea527d0..40e2ac20 100644 --- a/ct/readarr.sh +++ b/ct/readarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/rockylinux.sh b/ct/rockylinux.sh index edc69291..715a4a5f 100644 --- a/ct/rockylinux.sh +++ b/ct/rockylinux.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/rstptoweb.sh b/ct/rstptoweb.sh index 1c1bb453..c7db7f59 100644 --- a/ct/rstptoweb.sh +++ b/ct/rstptoweb.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/sabnzbd.sh b/ct/sabnzbd.sh index ea75032d..8514ba30 100644 --- a/ct/sabnzbd.sh +++ b/ct/sabnzbd.sh @@ -66,6 +66,7 @@ msg_ok "Updated $APP" exit } +ssh_check start build_container description diff --git a/ct/scrypted.sh b/ct/scrypted.sh index d307d78c..eadc2f0f 100644 --- a/ct/scrypted.sh +++ b/ct/scrypted.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/shinobi.sh b/ct/shinobi.sh index bc5572e6..b8b003bf 100644 --- a/ct/shinobi.sh +++ b/ct/shinobi.sh @@ -64,6 +64,7 @@ msg_ok "Updated Shinobi LXC" exit } +ssh_check start build_container description diff --git a/ct/sonarr.sh b/ct/sonarr.sh index ac6f2399..48a249e5 100644 --- a/ct/sonarr.sh +++ b/ct/sonarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/syncthing.sh b/ct/syncthing.sh index 292cf4db..f6b3d67c 100644 --- a/ct/syncthing.sh +++ b/ct/syncthing.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/tdarr.sh b/ct/tdarr.sh index 994ae3db..1d570df8 100644 --- a/ct/tdarr.sh +++ b/ct/tdarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/technitiumdns.sh b/ct/technitiumdns.sh index f947cd07..ca568c91 100644 --- a/ct/technitiumdns.sh +++ b/ct/technitiumdns.sh @@ -70,6 +70,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/transmission.sh b/ct/transmission.sh index 94e654d6..cb0f21d8 100644 --- a/ct/transmission.sh +++ b/ct/transmission.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/trilium.sh b/ct/trilium.sh index 3e15c458..1288b82a 100644 --- a/ct/trilium.sh +++ b/ct/trilium.sh @@ -80,6 +80,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/ubuntu.sh b/ct/ubuntu.sh index bc2f0cc6..c30b4067 100644 --- a/ct/ubuntu.sh +++ b/ct/ubuntu.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/umbrel.sh b/ct/umbrel.sh index 46ed1aa2..d35b3ac1 100644 --- a/ct/umbrel.sh +++ b/ct/umbrel.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/unifi.sh b/ct/unifi.sh index 542f1f87..bd619787 100644 --- a/ct/unifi.sh +++ b/ct/unifi.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/uptimekuma.sh b/ct/uptimekuma.sh index 4f64ecc3..77b81ecc 100644 --- a/ct/uptimekuma.sh +++ b/ct/uptimekuma.sh @@ -78,6 +78,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh index 8f887956..e5373967 100644 --- a/ct/vaultwarden.sh +++ b/ct/vaultwarden.sh @@ -131,6 +131,7 @@ function update_script() { fi } +ssh_check start build_container description diff --git a/ct/whisparr.sh b/ct/whisparr.sh index c616282a..2a99863f 100644 --- a/ct/whisparr.sh +++ b/ct/whisparr.sh @@ -61,6 +61,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/whoogle.sh b/ct/whoogle.sh index e93b19d7..67ecf793 100644 --- a/ct/whoogle.sh +++ b/ct/whoogle.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/wikijs.sh b/ct/wikijs.sh index e1ac9863..a8051de0 100644 --- a/ct/wikijs.sh +++ b/ct/wikijs.sh @@ -83,6 +83,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/wireguard.sh b/ct/wireguard.sh index 553de4e5..4afea4d0 100644 --- a/ct/wireguard.sh +++ b/ct/wireguard.sh @@ -115,6 +115,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/yunohost.sh b/ct/yunohost.sh index 22198999..6ffda45d 100644 --- a/ct/yunohost.sh +++ b/ct/yunohost.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/zigbee2mqtt.sh b/ct/zigbee2mqtt.sh index c1c59ff0..a91c9ec4 100644 --- a/ct/zigbee2mqtt.sh +++ b/ct/zigbee2mqtt.sh @@ -126,6 +126,7 @@ function update_script() { exit } +ssh_check start build_container description diff --git a/ct/zwave-js-ui.sh b/ct/zwave-js-ui.sh index ed8c0d64..2dfcaaa5 100644 --- a/ct/zwave-js-ui.sh +++ b/ct/zwave-js-ui.sh @@ -78,6 +78,7 @@ function update_script() { exit } +ssh_check start build_container description From 43ca5981f7c57b87f316be96820013e4be68b0f9 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 20:00:26 -0400 Subject: [PATCH 10/45] Update build.func reword ssh_check --- misc/build.func | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/build.func b/misc/build.func index 465d132f..df2de2d2 100644 --- a/misc/build.func +++ b/misc/build.func @@ -68,7 +68,7 @@ arch_check() { ssh_check() { if command -v pveversion >/dev/null 2>&1; then if [ -n "$SSH_CLIENT" ]; then - if whiptail --defaultno --title "SSH DETECTED" --yesno "The scripts suggest using the Proxmox shell instead of SSH, since the latter can create issues while gathering variables. Would you like to proceed with using SSH?" 10 68; then + if whiptail --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then echo "you've been warned" else clear From 6bf9e68f89aca2a64687be82802099de365988f8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 20:24:49 -0400 Subject: [PATCH 11/45] Update haos-vm.sh add SSH_CHECK --- vm/haos-vm.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 5160d8be..87cf3b3e 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -95,6 +95,18 @@ function ARCH_CHECK() { exit fi } +function SSH_CHECK() { + if command -v pveversion >/dev/null 2>&1; then + if [ -n "$SSH_CLIENT" ]; then + if whiptail --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then + echo "you've been warned" + else + clear + exit + fi + fi + fi +} function default_settings() { BRANCH="$stable" VMID="$NEXTID" @@ -257,6 +269,7 @@ function START_SCRIPT() { } ARCH_CHECK PVE_CHECK +SSH_CHECK START_SCRIPT msg_info "Validating Storage" while read -r line; do From 23d8d1b807038258cb4f62238d68aae9d291868d Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 20:52:46 -0400 Subject: [PATCH 12/45] revert ssh_check --- ct/adguard.sh | 1 - ct/alpine-adguard.sh | 1 - ct/alpine-docker.sh | 1 - ct/alpine-grafana.sh | 1 - ct/alpine-vaultwarden.sh | 1 - ct/alpine-whoogle.sh | 1 - ct/alpine-zigbee2mqtt.sh | 1 - ct/alpine.sh | 1 - ct/audiobookshelf.sh | 1 - ct/autobrr.sh | 1 - ct/blocky.sh | 1 - ct/casaos.sh | 1 - ct/changedetection.sh | 1 - ct/cronicle.sh | 1 - ct/daemonsync.sh | 1 - ct/dashy.sh | 1 - ct/debian.sh | 1 - ct/deconz.sh | 1 - ct/deluge.sh | 1 - ct/devuan.sh | 1 - ct/docker.sh | 1 - ct/emby.sh | 1 - ct/emqx.sh | 1 - ct/esphome.sh | 1 - ct/go2rtc.sh | 1 - ct/grafana.sh | 1 - ct/grocy.sh | 1 - ct/heimdalldashboard.sh | 1 - ct/homeassistant-core.sh | 1 - ct/homeassistant.sh | 1 - ct/homebridge.sh | 1 - ct/homepage.sh | 1 - ct/homer.sh | 1 - ct/hyperion.sh | 1 - ct/influxdb.sh | 1 - ct/iobroker.sh | 1 - ct/jackett.sh | 1 - ct/jellyfin.sh | 1 - ct/k0s.sh | 1 - ct/kavita.sh | 1 - ct/keycloak.sh | 1 - ct/lidarr.sh | 1 - ct/magicmirror.sh | 1 - ct/mariadb.sh | 1 - ct/meshcentral.sh | 1 - ct/motioneye.sh | 1 - ct/mqtt.sh | 1 - ct/n8n.sh | 1 - ct/navidrome.sh | 1 - ct/nextcloudpi.sh | 1 - ct/nginxproxymanager.sh | 1 - ct/nocodb.sh | 1 - ct/node-red.sh | 1 - ct/omada.sh | 1 - ct/omv.sh | 1 - ct/openhab.sh | 1 - ct/paperless-ngx.sh | 1 - ct/photoprism.sh | 1 - ct/pihole.sh | 1 - ct/plex.sh | 1 - ct/podman-homeassistant.sh | 1 - ct/podman.sh | 1 - ct/postgresql.sh | 1 - ct/prometheus.sh | 1 - ct/prowlarr.sh | 1 - ct/qbittorrent.sh | 1 - ct/radarr.sh | 1 - ct/readarr.sh | 1 - ct/rockylinux.sh | 1 - ct/rstptoweb.sh | 1 - ct/sabnzbd.sh | 1 - ct/scrypted.sh | 1 - ct/shinobi.sh | 1 - ct/sonarr.sh | 1 - ct/syncthing.sh | 1 - ct/tdarr.sh | 1 - ct/technitiumdns.sh | 1 - ct/transmission.sh | 1 - ct/trilium.sh | 1 - ct/ubuntu.sh | 1 - ct/umbrel.sh | 1 - ct/unifi.sh | 1 - ct/uptimekuma.sh | 1 - ct/vaultwarden.sh | 1 - ct/whisparr.sh | 1 - ct/whoogle.sh | 1 - ct/wikijs.sh | 1 - ct/wireguard.sh | 1 - ct/yunohost.sh | 1 - ct/zigbee2mqtt.sh | 1 - ct/zwave-js-ui.sh | 1 - 91 files changed, 91 deletions(-) diff --git a/ct/adguard.sh b/ct/adguard.sh index c36e12bf..e8c65085 100644 --- a/ct/adguard.sh +++ b/ct/adguard.sh @@ -78,7 +78,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/alpine-adguard.sh b/ct/alpine-adguard.sh index 5dd9e955..248aa7f2 100644 --- a/ct/alpine-adguard.sh +++ b/ct/alpine-adguard.sh @@ -81,7 +81,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-docker.sh b/ct/alpine-docker.sh index 8bde63ce..a7b08ba6 100644 --- a/ct/alpine-docker.sh +++ b/ct/alpine-docker.sh @@ -75,7 +75,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-grafana.sh b/ct/alpine-grafana.sh index 36872876..7cb26ae6 100644 --- a/ct/alpine-grafana.sh +++ b/ct/alpine-grafana.sh @@ -88,7 +88,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 70b5f7f8..45ea5390 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -81,7 +81,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-whoogle.sh b/ct/alpine-whoogle.sh index 7dbf5066..b2e2eaa7 100644 --- a/ct/alpine-whoogle.sh +++ b/ct/alpine-whoogle.sh @@ -79,7 +79,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-zigbee2mqtt.sh b/ct/alpine-zigbee2mqtt.sh index f9185143..55df4544 100644 --- a/ct/alpine-zigbee2mqtt.sh +++ b/ct/alpine-zigbee2mqtt.sh @@ -75,7 +75,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine.sh b/ct/alpine.sh index 3eb6a0c9..a3348a9f 100644 --- a/ct/alpine.sh +++ b/ct/alpine.sh @@ -63,7 +63,6 @@ exit; fi } -ssh_check start build_container description diff --git a/ct/audiobookshelf.sh b/ct/audiobookshelf.sh index b208249c..558dbc44 100644 --- a/ct/audiobookshelf.sh +++ b/ct/audiobookshelf.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/autobrr.sh b/ct/autobrr.sh index 91e8a8be..3261b560 100644 --- a/ct/autobrr.sh +++ b/ct/autobrr.sh @@ -71,7 +71,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/blocky.sh b/ct/blocky.sh index 4a2f77b2..08e769e8 100644 --- a/ct/blocky.sh +++ b/ct/blocky.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/casaos.sh b/ct/casaos.sh index 593379c8..c98a025d 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/changedetection.sh b/ct/changedetection.sh index d0ba97e8..c8da20ae 100644 --- a/ct/changedetection.sh +++ b/ct/changedetection.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/cronicle.sh b/ct/cronicle.sh index 3f812270..53702989 100644 --- a/ct/cronicle.sh +++ b/ct/cronicle.sh @@ -100,7 +100,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/daemonsync.sh b/ct/daemonsync.sh index 7f6ed79f..d13e5b40 100644 --- a/ct/daemonsync.sh +++ b/ct/daemonsync.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/dashy.sh b/ct/dashy.sh index 7b95c492..5c76cf70 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -86,7 +86,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/debian.sh b/ct/debian.sh index dc09cba4..b67a0a26 100644 --- a/ct/debian.sh +++ b/ct/debian.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/deconz.sh b/ct/deconz.sh index f5aee5fc..6195bd10 100644 --- a/ct/deconz.sh +++ b/ct/deconz.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/deluge.sh b/ct/deluge.sh index b82cebce..0b3ce6c4 100644 --- a/ct/deluge.sh +++ b/ct/deluge.sh @@ -61,7 +61,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/devuan.sh b/ct/devuan.sh index beb4b23d..db48bf4e 100644 --- a/ct/devuan.sh +++ b/ct/devuan.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/docker.sh b/ct/docker.sh index 77b9c184..1805787c 100644 --- a/ct/docker.sh +++ b/ct/docker.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/emby.sh b/ct/emby.sh index d87c1aae..2e617cfb 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -71,7 +71,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/emqx.sh b/ct/emqx.sh index e3ce0056..7c0ffcd9 100644 --- a/ct/emqx.sh +++ b/ct/emqx.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/esphome.sh b/ct/esphome.sh index 82c0c6c8..cd6e56d2 100644 --- a/ct/esphome.sh +++ b/ct/esphome.sh @@ -68,7 +68,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/go2rtc.sh b/ct/go2rtc.sh index b840dc30..58b82f5c 100644 --- a/ct/go2rtc.sh +++ b/ct/go2rtc.sh @@ -61,7 +61,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/grafana.sh b/ct/grafana.sh index 4a363954..3de34626 100644 --- a/ct/grafana.sh +++ b/ct/grafana.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/grocy.sh b/ct/grocy.sh index f33b8a87..dd30c554 100644 --- a/ct/grocy.sh +++ b/ct/grocy.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/heimdalldashboard.sh b/ct/heimdalldashboard.sh index 6eeaf236..aad87f46 100644 --- a/ct/heimdalldashboard.sh +++ b/ct/heimdalldashboard.sh @@ -140,7 +140,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index b635db1d..858433c2 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -207,7 +207,6 @@ EOF fi } -ssh_check start build_container description diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index 7c96ab1c..ac667247 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -128,7 +128,6 @@ WantedBy=default.target" >$service_path fi } -ssh_check start build_container description diff --git a/ct/homebridge.sh b/ct/homebridge.sh index 8b67fdb1..22039d22 100644 --- a/ct/homebridge.sh +++ b/ct/homebridge.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/homepage.sh b/ct/homepage.sh index 87bc8cc1..e8041087 100644 --- a/ct/homepage.sh +++ b/ct/homepage.sh @@ -67,7 +67,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/homer.sh b/ct/homer.sh index 05939da2..217b2800 100644 --- a/ct/homer.sh +++ b/ct/homer.sh @@ -84,7 +84,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/hyperion.sh b/ct/hyperion.sh index 0021c3be..92535765 100644 --- a/ct/hyperion.sh +++ b/ct/hyperion.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/influxdb.sh b/ct/influxdb.sh index 8b6c3150..f6c078cf 100644 --- a/ct/influxdb.sh +++ b/ct/influxdb.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/iobroker.sh b/ct/iobroker.sh index 17dcd29d..841f135e 100644 --- a/ct/iobroker.sh +++ b/ct/iobroker.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/jackett.sh b/ct/jackett.sh index 2c6eff8d..f895f4d7 100644 --- a/ct/jackett.sh +++ b/ct/jackett.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh index a67c5967..d11b8212 100644 --- a/ct/jellyfin.sh +++ b/ct/jellyfin.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/k0s.sh b/ct/k0s.sh index 5f39de39..75b5648a 100644 --- a/ct/k0s.sh +++ b/ct/k0s.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/kavita.sh b/ct/kavita.sh index f0ebf4cc..8410daa7 100644 --- a/ct/kavita.sh +++ b/ct/kavita.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/keycloak.sh b/ct/keycloak.sh index 2585d900..4488dd1a 100644 --- a/ct/keycloak.sh +++ b/ct/keycloak.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/lidarr.sh b/ct/lidarr.sh index c4959153..6bc88997 100644 --- a/ct/lidarr.sh +++ b/ct/lidarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/magicmirror.sh b/ct/magicmirror.sh index aeda1e47..c57121c2 100644 --- a/ct/magicmirror.sh +++ b/ct/magicmirror.sh @@ -63,7 +63,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/mariadb.sh b/ct/mariadb.sh index 857fabbb..d6894ed9 100644 --- a/ct/mariadb.sh +++ b/ct/mariadb.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/meshcentral.sh b/ct/meshcentral.sh index 932ea4bd..2739b517 100644 --- a/ct/meshcentral.sh +++ b/ct/meshcentral.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/motioneye.sh b/ct/motioneye.sh index b5084568..4a106f03 100644 --- a/ct/motioneye.sh +++ b/ct/motioneye.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/mqtt.sh b/ct/mqtt.sh index 312c467d..0dde1c0e 100644 --- a/ct/mqtt.sh +++ b/ct/mqtt.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/n8n.sh b/ct/n8n.sh index 297c9eed..d4862ef1 100644 --- a/ct/n8n.sh +++ b/ct/n8n.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/navidrome.sh b/ct/navidrome.sh index 0ebb3d38..c9e53584 100644 --- a/ct/navidrome.sh +++ b/ct/navidrome.sh @@ -71,7 +71,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/nextcloudpi.sh b/ct/nextcloudpi.sh index 52f04f49..a1718208 100644 --- a/ct/nextcloudpi.sh +++ b/ct/nextcloudpi.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 012ebd53..ce7fc32f 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -171,7 +171,6 @@ EOF exit } -ssh_check start build_container description diff --git a/ct/nocodb.sh b/ct/nocodb.sh index e56521ba..4b7636f6 100644 --- a/ct/nocodb.sh +++ b/ct/nocodb.sh @@ -63,7 +63,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/node-red.sh b/ct/node-red.sh index c90d898c..3dba9183 100644 --- a/ct/node-red.sh +++ b/ct/node-red.sh @@ -96,7 +96,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/omada.sh b/ct/omada.sh index 51127d43..104183df 100644 --- a/ct/omada.sh +++ b/ct/omada.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/omv.sh b/ct/omv.sh index c898c92e..532df042 100644 --- a/ct/omv.sh +++ b/ct/omv.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/openhab.sh b/ct/openhab.sh index d197aec1..21a77dc7 100644 --- a/ct/openhab.sh +++ b/ct/openhab.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/paperless-ngx.sh b/ct/paperless-ngx.sh index 30b1d9f9..09d46d45 100644 --- a/ct/paperless-ngx.sh +++ b/ct/paperless-ngx.sh @@ -132,7 +132,6 @@ EOF fi } -ssh_check start build_container description diff --git a/ct/photoprism.sh b/ct/photoprism.sh index c6c943bd..231f7d1e 100644 --- a/ct/photoprism.sh +++ b/ct/photoprism.sh @@ -86,7 +86,6 @@ function update_script() { exit } -ssh_check start build_container description diff --git a/ct/pihole.sh b/ct/pihole.sh index 57f09f15..07e786ea 100644 --- a/ct/pihole.sh +++ b/ct/pihole.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/plex.sh b/ct/plex.sh index beb328e7..48d12505 100644 --- a/ct/plex.sh +++ b/ct/plex.sh @@ -71,7 +71,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/podman-homeassistant.sh b/ct/podman-homeassistant.sh index e3ccf4d7..d916cc95 100644 --- a/ct/podman-homeassistant.sh +++ b/ct/podman-homeassistant.sh @@ -111,7 +111,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/podman.sh b/ct/podman.sh index c18a858a..b4297c51 100644 --- a/ct/podman.sh +++ b/ct/podman.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/postgresql.sh b/ct/postgresql.sh index 606ee95d..f0b606a1 100644 --- a/ct/postgresql.sh +++ b/ct/postgresql.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/prometheus.sh b/ct/prometheus.sh index bfbf2367..16f17758 100644 --- a/ct/prometheus.sh +++ b/ct/prometheus.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/prowlarr.sh b/ct/prowlarr.sh index cb5c5347..2c323541 100644 --- a/ct/prowlarr.sh +++ b/ct/prowlarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/qbittorrent.sh b/ct/qbittorrent.sh index 499cfcf3..83cc8526 100644 --- a/ct/qbittorrent.sh +++ b/ct/qbittorrent.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/radarr.sh b/ct/radarr.sh index df6704a8..a379e8ac 100644 --- a/ct/radarr.sh +++ b/ct/radarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/readarr.sh b/ct/readarr.sh index 40e2ac20..bea527d0 100644 --- a/ct/readarr.sh +++ b/ct/readarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/rockylinux.sh b/ct/rockylinux.sh index 715a4a5f..edc69291 100644 --- a/ct/rockylinux.sh +++ b/ct/rockylinux.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/rstptoweb.sh b/ct/rstptoweb.sh index c7db7f59..1c1bb453 100644 --- a/ct/rstptoweb.sh +++ b/ct/rstptoweb.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/sabnzbd.sh b/ct/sabnzbd.sh index 8514ba30..ea75032d 100644 --- a/ct/sabnzbd.sh +++ b/ct/sabnzbd.sh @@ -66,7 +66,6 @@ msg_ok "Updated $APP" exit } -ssh_check start build_container description diff --git a/ct/scrypted.sh b/ct/scrypted.sh index eadc2f0f..d307d78c 100644 --- a/ct/scrypted.sh +++ b/ct/scrypted.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/shinobi.sh b/ct/shinobi.sh index b8b003bf..bc5572e6 100644 --- a/ct/shinobi.sh +++ b/ct/shinobi.sh @@ -64,7 +64,6 @@ msg_ok "Updated Shinobi LXC" exit } -ssh_check start build_container description diff --git a/ct/sonarr.sh b/ct/sonarr.sh index 48a249e5..ac6f2399 100644 --- a/ct/sonarr.sh +++ b/ct/sonarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/syncthing.sh b/ct/syncthing.sh index f6b3d67c..292cf4db 100644 --- a/ct/syncthing.sh +++ b/ct/syncthing.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/tdarr.sh b/ct/tdarr.sh index 1d570df8..994ae3db 100644 --- a/ct/tdarr.sh +++ b/ct/tdarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/technitiumdns.sh b/ct/technitiumdns.sh index ca568c91..f947cd07 100644 --- a/ct/technitiumdns.sh +++ b/ct/technitiumdns.sh @@ -70,7 +70,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/transmission.sh b/ct/transmission.sh index cb0f21d8..94e654d6 100644 --- a/ct/transmission.sh +++ b/ct/transmission.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/trilium.sh b/ct/trilium.sh index 1288b82a..3e15c458 100644 --- a/ct/trilium.sh +++ b/ct/trilium.sh @@ -80,7 +80,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/ubuntu.sh b/ct/ubuntu.sh index c30b4067..bc2f0cc6 100644 --- a/ct/ubuntu.sh +++ b/ct/ubuntu.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/umbrel.sh b/ct/umbrel.sh index d35b3ac1..46ed1aa2 100644 --- a/ct/umbrel.sh +++ b/ct/umbrel.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/unifi.sh b/ct/unifi.sh index bd619787..542f1f87 100644 --- a/ct/unifi.sh +++ b/ct/unifi.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/uptimekuma.sh b/ct/uptimekuma.sh index 77b81ecc..4f64ecc3 100644 --- a/ct/uptimekuma.sh +++ b/ct/uptimekuma.sh @@ -78,7 +78,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh index e5373967..8f887956 100644 --- a/ct/vaultwarden.sh +++ b/ct/vaultwarden.sh @@ -131,7 +131,6 @@ function update_script() { fi } -ssh_check start build_container description diff --git a/ct/whisparr.sh b/ct/whisparr.sh index 2a99863f..c616282a 100644 --- a/ct/whisparr.sh +++ b/ct/whisparr.sh @@ -61,7 +61,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/whoogle.sh b/ct/whoogle.sh index 67ecf793..e93b19d7 100644 --- a/ct/whoogle.sh +++ b/ct/whoogle.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/wikijs.sh b/ct/wikijs.sh index a8051de0..e1ac9863 100644 --- a/ct/wikijs.sh +++ b/ct/wikijs.sh @@ -83,7 +83,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/wireguard.sh b/ct/wireguard.sh index 4afea4d0..553de4e5 100644 --- a/ct/wireguard.sh +++ b/ct/wireguard.sh @@ -115,7 +115,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/yunohost.sh b/ct/yunohost.sh index 6ffda45d..22198999 100644 --- a/ct/yunohost.sh +++ b/ct/yunohost.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/zigbee2mqtt.sh b/ct/zigbee2mqtt.sh index a91c9ec4..c1c59ff0 100644 --- a/ct/zigbee2mqtt.sh +++ b/ct/zigbee2mqtt.sh @@ -126,7 +126,6 @@ function update_script() { exit } -ssh_check start build_container description diff --git a/ct/zwave-js-ui.sh b/ct/zwave-js-ui.sh index 2dfcaaa5..ed8c0d64 100644 --- a/ct/zwave-js-ui.sh +++ b/ct/zwave-js-ui.sh @@ -78,7 +78,6 @@ function update_script() { exit } -ssh_check start build_container description From 92c24cefe48ab13c5829789fb835f042eed3fb96 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 20:53:51 -0400 Subject: [PATCH 13/45] revert SSH_CHECK --- vm/haos-vm.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 87cf3b3e..aa19d7b9 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -269,7 +269,6 @@ function START_SCRIPT() { } ARCH_CHECK PVE_CHECK -SSH_CHECK START_SCRIPT msg_info "Validating Storage" while read -r line; do From 8bf03a6cb6d520094d6d659256291c9e934295fe Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 21:16:23 -0400 Subject: [PATCH 14/45] Update build.func update ssh_check code --- misc/build.func | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/build.func b/misc/build.func index df2de2d2..a6e7e0e3 100644 --- a/misc/build.func +++ b/misc/build.func @@ -67,7 +67,7 @@ arch_check() { ssh_check() { if command -v pveversion >/dev/null 2>&1; then - if [ -n "$SSH_CLIENT" ]; then + if [ -n "${SSH_CLIENT:+x}" ]; then if whiptail --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then echo "you've been warned" else From b19b5e1039f38f4be9eefaa5872c9c32d577e609 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 21:21:14 -0400 Subject: [PATCH 15/45] revert revert ssh_check --- ct/adguard.sh | 1 + ct/alpine-adguard.sh | 1 + ct/alpine-docker.sh | 1 + ct/alpine-grafana.sh | 1 + ct/alpine-vaultwarden.sh | 1 + ct/alpine-whoogle.sh | 1 + ct/alpine-zigbee2mqtt.sh | 1 + ct/alpine.sh | 1 + ct/audiobookshelf.sh | 1 + ct/autobrr.sh | 1 + ct/blocky.sh | 1 + ct/casaos.sh | 1 + ct/changedetection.sh | 1 + ct/cronicle.sh | 1 + ct/daemonsync.sh | 1 + ct/dashy.sh | 1 + ct/debian.sh | 1 + ct/deconz.sh | 1 + ct/deluge.sh | 1 + ct/devuan.sh | 1 + ct/docker.sh | 1 + ct/emby.sh | 1 + ct/emqx.sh | 1 + ct/esphome.sh | 1 + ct/go2rtc.sh | 1 + ct/grafana.sh | 1 + ct/grocy.sh | 1 + ct/heimdalldashboard.sh | 1 + ct/homeassistant-core.sh | 1 + ct/homeassistant.sh | 1 + ct/homebridge.sh | 1 + ct/homepage.sh | 1 + ct/homer.sh | 1 + ct/hyperion.sh | 1 + ct/influxdb.sh | 1 + ct/iobroker.sh | 1 + ct/jackett.sh | 1 + ct/jellyfin.sh | 1 + ct/k0s.sh | 1 + ct/kavita.sh | 1 + ct/keycloak.sh | 1 + ct/lidarr.sh | 1 + ct/magicmirror.sh | 1 + ct/mariadb.sh | 1 + ct/meshcentral.sh | 1 + ct/motioneye.sh | 1 + ct/mqtt.sh | 1 + ct/n8n.sh | 1 + ct/navidrome.sh | 1 + ct/nextcloudpi.sh | 1 + ct/nginxproxymanager.sh | 1 + ct/nocodb.sh | 1 + ct/node-red.sh | 1 + ct/omada.sh | 1 + ct/omv.sh | 1 + ct/openhab.sh | 1 + ct/paperless-ngx.sh | 1 + ct/photoprism.sh | 1 + ct/pihole.sh | 1 + ct/plex.sh | 1 + ct/podman-homeassistant.sh | 1 + ct/podman.sh | 1 + ct/postgresql.sh | 1 + ct/prometheus.sh | 1 + ct/prowlarr.sh | 1 + ct/qbittorrent.sh | 1 + ct/radarr.sh | 1 + ct/readarr.sh | 1 + ct/rockylinux.sh | 1 + ct/rstptoweb.sh | 1 + ct/sabnzbd.sh | 1 + ct/scrypted.sh | 1 + ct/shinobi.sh | 1 + ct/sonarr.sh | 1 + ct/syncthing.sh | 1 + ct/tdarr.sh | 1 + ct/technitiumdns.sh | 1 + ct/transmission.sh | 1 + ct/trilium.sh | 1 + ct/ubuntu.sh | 1 + ct/umbrel.sh | 1 + ct/unifi.sh | 1 + ct/uptimekuma.sh | 1 + ct/vaultwarden.sh | 1 + ct/whisparr.sh | 1 + ct/whoogle.sh | 1 + ct/wikijs.sh | 1 + ct/wireguard.sh | 1 + ct/yunohost.sh | 1 + ct/zigbee2mqtt.sh | 1 + ct/zwave-js-ui.sh | 1 + vm/haos-vm.sh | 3 ++- 92 files changed, 93 insertions(+), 1 deletion(-) diff --git a/ct/adguard.sh b/ct/adguard.sh index e8c65085..c36e12bf 100644 --- a/ct/adguard.sh +++ b/ct/adguard.sh @@ -78,6 +78,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/alpine-adguard.sh b/ct/alpine-adguard.sh index 248aa7f2..5dd9e955 100644 --- a/ct/alpine-adguard.sh +++ b/ct/alpine-adguard.sh @@ -81,6 +81,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-docker.sh b/ct/alpine-docker.sh index a7b08ba6..8bde63ce 100644 --- a/ct/alpine-docker.sh +++ b/ct/alpine-docker.sh @@ -75,6 +75,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-grafana.sh b/ct/alpine-grafana.sh index 7cb26ae6..36872876 100644 --- a/ct/alpine-grafana.sh +++ b/ct/alpine-grafana.sh @@ -88,6 +88,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 45ea5390..70b5f7f8 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -81,6 +81,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-whoogle.sh b/ct/alpine-whoogle.sh index b2e2eaa7..7dbf5066 100644 --- a/ct/alpine-whoogle.sh +++ b/ct/alpine-whoogle.sh @@ -79,6 +79,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine-zigbee2mqtt.sh b/ct/alpine-zigbee2mqtt.sh index 55df4544..f9185143 100644 --- a/ct/alpine-zigbee2mqtt.sh +++ b/ct/alpine-zigbee2mqtt.sh @@ -75,6 +75,7 @@ function update_script() { done } +ssh_check start build_container description diff --git a/ct/alpine.sh b/ct/alpine.sh index a3348a9f..3eb6a0c9 100644 --- a/ct/alpine.sh +++ b/ct/alpine.sh @@ -63,6 +63,7 @@ exit; fi } +ssh_check start build_container description diff --git a/ct/audiobookshelf.sh b/ct/audiobookshelf.sh index 558dbc44..b208249c 100644 --- a/ct/audiobookshelf.sh +++ b/ct/audiobookshelf.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/autobrr.sh b/ct/autobrr.sh index 3261b560..91e8a8be 100644 --- a/ct/autobrr.sh +++ b/ct/autobrr.sh @@ -71,6 +71,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/blocky.sh b/ct/blocky.sh index 08e769e8..4a2f77b2 100644 --- a/ct/blocky.sh +++ b/ct/blocky.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/casaos.sh b/ct/casaos.sh index c98a025d..593379c8 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/changedetection.sh b/ct/changedetection.sh index c8da20ae..d0ba97e8 100644 --- a/ct/changedetection.sh +++ b/ct/changedetection.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/cronicle.sh b/ct/cronicle.sh index 53702989..3f812270 100644 --- a/ct/cronicle.sh +++ b/ct/cronicle.sh @@ -100,6 +100,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/daemonsync.sh b/ct/daemonsync.sh index d13e5b40..7f6ed79f 100644 --- a/ct/daemonsync.sh +++ b/ct/daemonsync.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/dashy.sh b/ct/dashy.sh index 5c76cf70..7b95c492 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -86,6 +86,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/debian.sh b/ct/debian.sh index b67a0a26..dc09cba4 100644 --- a/ct/debian.sh +++ b/ct/debian.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/deconz.sh b/ct/deconz.sh index 6195bd10..f5aee5fc 100644 --- a/ct/deconz.sh +++ b/ct/deconz.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/deluge.sh b/ct/deluge.sh index 0b3ce6c4..b82cebce 100644 --- a/ct/deluge.sh +++ b/ct/deluge.sh @@ -61,6 +61,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/devuan.sh b/ct/devuan.sh index db48bf4e..beb4b23d 100644 --- a/ct/devuan.sh +++ b/ct/devuan.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/docker.sh b/ct/docker.sh index 1805787c..77b9c184 100644 --- a/ct/docker.sh +++ b/ct/docker.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/emby.sh b/ct/emby.sh index 2e617cfb..d87c1aae 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -71,6 +71,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/emqx.sh b/ct/emqx.sh index 7c0ffcd9..e3ce0056 100644 --- a/ct/emqx.sh +++ b/ct/emqx.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/esphome.sh b/ct/esphome.sh index cd6e56d2..82c0c6c8 100644 --- a/ct/esphome.sh +++ b/ct/esphome.sh @@ -68,6 +68,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/go2rtc.sh b/ct/go2rtc.sh index 58b82f5c..b840dc30 100644 --- a/ct/go2rtc.sh +++ b/ct/go2rtc.sh @@ -61,6 +61,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/grafana.sh b/ct/grafana.sh index 3de34626..4a363954 100644 --- a/ct/grafana.sh +++ b/ct/grafana.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/grocy.sh b/ct/grocy.sh index dd30c554..f33b8a87 100644 --- a/ct/grocy.sh +++ b/ct/grocy.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/heimdalldashboard.sh b/ct/heimdalldashboard.sh index aad87f46..6eeaf236 100644 --- a/ct/heimdalldashboard.sh +++ b/ct/heimdalldashboard.sh @@ -140,6 +140,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index 858433c2..b635db1d 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -207,6 +207,7 @@ EOF fi } +ssh_check start build_container description diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index ac667247..7c96ab1c 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -128,6 +128,7 @@ WantedBy=default.target" >$service_path fi } +ssh_check start build_container description diff --git a/ct/homebridge.sh b/ct/homebridge.sh index 22039d22..8b67fdb1 100644 --- a/ct/homebridge.sh +++ b/ct/homebridge.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/homepage.sh b/ct/homepage.sh index e8041087..87bc8cc1 100644 --- a/ct/homepage.sh +++ b/ct/homepage.sh @@ -67,6 +67,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/homer.sh b/ct/homer.sh index 217b2800..05939da2 100644 --- a/ct/homer.sh +++ b/ct/homer.sh @@ -84,6 +84,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/hyperion.sh b/ct/hyperion.sh index 92535765..0021c3be 100644 --- a/ct/hyperion.sh +++ b/ct/hyperion.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/influxdb.sh b/ct/influxdb.sh index f6c078cf..8b6c3150 100644 --- a/ct/influxdb.sh +++ b/ct/influxdb.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/iobroker.sh b/ct/iobroker.sh index 841f135e..17dcd29d 100644 --- a/ct/iobroker.sh +++ b/ct/iobroker.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/jackett.sh b/ct/jackett.sh index f895f4d7..2c6eff8d 100644 --- a/ct/jackett.sh +++ b/ct/jackett.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh index d11b8212..a67c5967 100644 --- a/ct/jellyfin.sh +++ b/ct/jellyfin.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/k0s.sh b/ct/k0s.sh index 75b5648a..5f39de39 100644 --- a/ct/k0s.sh +++ b/ct/k0s.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/kavita.sh b/ct/kavita.sh index 8410daa7..f0ebf4cc 100644 --- a/ct/kavita.sh +++ b/ct/kavita.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/keycloak.sh b/ct/keycloak.sh index 4488dd1a..2585d900 100644 --- a/ct/keycloak.sh +++ b/ct/keycloak.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/lidarr.sh b/ct/lidarr.sh index 6bc88997..c4959153 100644 --- a/ct/lidarr.sh +++ b/ct/lidarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/magicmirror.sh b/ct/magicmirror.sh index c57121c2..aeda1e47 100644 --- a/ct/magicmirror.sh +++ b/ct/magicmirror.sh @@ -63,6 +63,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/mariadb.sh b/ct/mariadb.sh index d6894ed9..857fabbb 100644 --- a/ct/mariadb.sh +++ b/ct/mariadb.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/meshcentral.sh b/ct/meshcentral.sh index 2739b517..932ea4bd 100644 --- a/ct/meshcentral.sh +++ b/ct/meshcentral.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/motioneye.sh b/ct/motioneye.sh index 4a106f03..b5084568 100644 --- a/ct/motioneye.sh +++ b/ct/motioneye.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/mqtt.sh b/ct/mqtt.sh index 0dde1c0e..312c467d 100644 --- a/ct/mqtt.sh +++ b/ct/mqtt.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/n8n.sh b/ct/n8n.sh index d4862ef1..297c9eed 100644 --- a/ct/n8n.sh +++ b/ct/n8n.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/navidrome.sh b/ct/navidrome.sh index c9e53584..0ebb3d38 100644 --- a/ct/navidrome.sh +++ b/ct/navidrome.sh @@ -71,6 +71,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/nextcloudpi.sh b/ct/nextcloudpi.sh index a1718208..52f04f49 100644 --- a/ct/nextcloudpi.sh +++ b/ct/nextcloudpi.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index ce7fc32f..012ebd53 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -171,6 +171,7 @@ EOF exit } +ssh_check start build_container description diff --git a/ct/nocodb.sh b/ct/nocodb.sh index 4b7636f6..e56521ba 100644 --- a/ct/nocodb.sh +++ b/ct/nocodb.sh @@ -63,6 +63,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/node-red.sh b/ct/node-red.sh index 3dba9183..c90d898c 100644 --- a/ct/node-red.sh +++ b/ct/node-red.sh @@ -96,6 +96,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/omada.sh b/ct/omada.sh index 104183df..51127d43 100644 --- a/ct/omada.sh +++ b/ct/omada.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/omv.sh b/ct/omv.sh index 532df042..c898c92e 100644 --- a/ct/omv.sh +++ b/ct/omv.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/openhab.sh b/ct/openhab.sh index 21a77dc7..d197aec1 100644 --- a/ct/openhab.sh +++ b/ct/openhab.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/paperless-ngx.sh b/ct/paperless-ngx.sh index 09d46d45..30b1d9f9 100644 --- a/ct/paperless-ngx.sh +++ b/ct/paperless-ngx.sh @@ -132,6 +132,7 @@ EOF fi } +ssh_check start build_container description diff --git a/ct/photoprism.sh b/ct/photoprism.sh index 231f7d1e..c6c943bd 100644 --- a/ct/photoprism.sh +++ b/ct/photoprism.sh @@ -86,6 +86,7 @@ function update_script() { exit } +ssh_check start build_container description diff --git a/ct/pihole.sh b/ct/pihole.sh index 07e786ea..57f09f15 100644 --- a/ct/pihole.sh +++ b/ct/pihole.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/plex.sh b/ct/plex.sh index 48d12505..beb328e7 100644 --- a/ct/plex.sh +++ b/ct/plex.sh @@ -71,6 +71,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/podman-homeassistant.sh b/ct/podman-homeassistant.sh index d916cc95..e3ccf4d7 100644 --- a/ct/podman-homeassistant.sh +++ b/ct/podman-homeassistant.sh @@ -111,6 +111,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/podman.sh b/ct/podman.sh index b4297c51..c18a858a 100644 --- a/ct/podman.sh +++ b/ct/podman.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/postgresql.sh b/ct/postgresql.sh index f0b606a1..606ee95d 100644 --- a/ct/postgresql.sh +++ b/ct/postgresql.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/prometheus.sh b/ct/prometheus.sh index 16f17758..bfbf2367 100644 --- a/ct/prometheus.sh +++ b/ct/prometheus.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/prowlarr.sh b/ct/prowlarr.sh index 2c323541..cb5c5347 100644 --- a/ct/prowlarr.sh +++ b/ct/prowlarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/qbittorrent.sh b/ct/qbittorrent.sh index 83cc8526..499cfcf3 100644 --- a/ct/qbittorrent.sh +++ b/ct/qbittorrent.sh @@ -61,6 +61,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/radarr.sh b/ct/radarr.sh index a379e8ac..df6704a8 100644 --- a/ct/radarr.sh +++ b/ct/radarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/readarr.sh b/ct/readarr.sh index bea527d0..40e2ac20 100644 --- a/ct/readarr.sh +++ b/ct/readarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/rockylinux.sh b/ct/rockylinux.sh index edc69291..715a4a5f 100644 --- a/ct/rockylinux.sh +++ b/ct/rockylinux.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/rstptoweb.sh b/ct/rstptoweb.sh index 1c1bb453..c7db7f59 100644 --- a/ct/rstptoweb.sh +++ b/ct/rstptoweb.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/sabnzbd.sh b/ct/sabnzbd.sh index ea75032d..8514ba30 100644 --- a/ct/sabnzbd.sh +++ b/ct/sabnzbd.sh @@ -66,6 +66,7 @@ msg_ok "Updated $APP" exit } +ssh_check start build_container description diff --git a/ct/scrypted.sh b/ct/scrypted.sh index d307d78c..eadc2f0f 100644 --- a/ct/scrypted.sh +++ b/ct/scrypted.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/shinobi.sh b/ct/shinobi.sh index bc5572e6..b8b003bf 100644 --- a/ct/shinobi.sh +++ b/ct/shinobi.sh @@ -64,6 +64,7 @@ msg_ok "Updated Shinobi LXC" exit } +ssh_check start build_container description diff --git a/ct/sonarr.sh b/ct/sonarr.sh index ac6f2399..48a249e5 100644 --- a/ct/sonarr.sh +++ b/ct/sonarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/syncthing.sh b/ct/syncthing.sh index 292cf4db..f6b3d67c 100644 --- a/ct/syncthing.sh +++ b/ct/syncthing.sh @@ -62,6 +62,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/tdarr.sh b/ct/tdarr.sh index 994ae3db..1d570df8 100644 --- a/ct/tdarr.sh +++ b/ct/tdarr.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/technitiumdns.sh b/ct/technitiumdns.sh index f947cd07..ca568c91 100644 --- a/ct/technitiumdns.sh +++ b/ct/technitiumdns.sh @@ -70,6 +70,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/transmission.sh b/ct/transmission.sh index 94e654d6..cb0f21d8 100644 --- a/ct/transmission.sh +++ b/ct/transmission.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/trilium.sh b/ct/trilium.sh index 3e15c458..1288b82a 100644 --- a/ct/trilium.sh +++ b/ct/trilium.sh @@ -80,6 +80,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/ubuntu.sh b/ct/ubuntu.sh index bc2f0cc6..c30b4067 100644 --- a/ct/ubuntu.sh +++ b/ct/ubuntu.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/umbrel.sh b/ct/umbrel.sh index 46ed1aa2..d35b3ac1 100644 --- a/ct/umbrel.sh +++ b/ct/umbrel.sh @@ -60,6 +60,7 @@ msg_ok "Updated ${APP} LXC" exit } +ssh_check start build_container description diff --git a/ct/unifi.sh b/ct/unifi.sh index 542f1f87..bd619787 100644 --- a/ct/unifi.sh +++ b/ct/unifi.sh @@ -61,6 +61,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/uptimekuma.sh b/ct/uptimekuma.sh index 4f64ecc3..77b81ecc 100644 --- a/ct/uptimekuma.sh +++ b/ct/uptimekuma.sh @@ -78,6 +78,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh index 8f887956..e5373967 100644 --- a/ct/vaultwarden.sh +++ b/ct/vaultwarden.sh @@ -131,6 +131,7 @@ function update_script() { fi } +ssh_check start build_container description diff --git a/ct/whisparr.sh b/ct/whisparr.sh index c616282a..2a99863f 100644 --- a/ct/whisparr.sh +++ b/ct/whisparr.sh @@ -61,6 +61,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/whoogle.sh b/ct/whoogle.sh index e93b19d7..67ecf793 100644 --- a/ct/whoogle.sh +++ b/ct/whoogle.sh @@ -60,6 +60,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/wikijs.sh b/ct/wikijs.sh index e1ac9863..a8051de0 100644 --- a/ct/wikijs.sh +++ b/ct/wikijs.sh @@ -83,6 +83,7 @@ msg_ok "Update Successfull" exit } +ssh_check start build_container description diff --git a/ct/wireguard.sh b/ct/wireguard.sh index 553de4e5..4afea4d0 100644 --- a/ct/wireguard.sh +++ b/ct/wireguard.sh @@ -115,6 +115,7 @@ exit fi } +ssh_check start build_container description diff --git a/ct/yunohost.sh b/ct/yunohost.sh index 22198999..6ffda45d 100644 --- a/ct/yunohost.sh +++ b/ct/yunohost.sh @@ -60,6 +60,7 @@ msg_ok "Updated $APP LXC" exit } +ssh_check start build_container description diff --git a/ct/zigbee2mqtt.sh b/ct/zigbee2mqtt.sh index c1c59ff0..a91c9ec4 100644 --- a/ct/zigbee2mqtt.sh +++ b/ct/zigbee2mqtt.sh @@ -126,6 +126,7 @@ function update_script() { exit } +ssh_check start build_container description diff --git a/ct/zwave-js-ui.sh b/ct/zwave-js-ui.sh index ed8c0d64..2dfcaaa5 100644 --- a/ct/zwave-js-ui.sh +++ b/ct/zwave-js-ui.sh @@ -78,6 +78,7 @@ function update_script() { exit } +ssh_check start build_container description diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index aa19d7b9..ab628f89 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -97,7 +97,7 @@ function ARCH_CHECK() { } function SSH_CHECK() { if command -v pveversion >/dev/null 2>&1; then - if [ -n "$SSH_CLIENT" ]; then + if [ -n "${SSH_CLIENT:+x}" ]; then if whiptail --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then echo "you've been warned" else @@ -269,6 +269,7 @@ function START_SCRIPT() { } ARCH_CHECK PVE_CHECK +SSH_CHECK START_SCRIPT msg_info "Validating Storage" while read -r line; do From 0cc475115a286ab7d5c75a2c03952830c10a1a52 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 27 Mar 2023 21:44:58 -0400 Subject: [PATCH 16/45] Update CHANGELOG.MD --- CHANGELOG.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 1463c0d3..dd74f685 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -8,6 +8,8 @@ All notable changes to this project will be documented in this file. - **Removed Alpine-ESPHome LXC** - Nonoperational +- **All Scripts** + - Incorporate code that examines whether SSH is being used and, if yes, offers a suggestion against it without restricting or blocking its usage. ## 2023-03-25 From b800e3485683fa3b5335a4a4fc9dfbd24f293b68 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 28 Mar 2023 17:32:30 -0400 Subject: [PATCH 17/45] Update blocky-install.sh fix path change --- install/blocky-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/blocky-install.sh b/install/blocky-install.sh index e4656a13..aafff542 100644 --- a/install/blocky-install.sh +++ b/install/blocky-install.sh @@ -23,10 +23,10 @@ msg_info "Installing Blocky" systemctl stop systemd-resolved $STD systemctl disable systemd-resolved.service RELEASE=$(curl -s https://api.github.com/repos/0xERR0R/blocky/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -wget -q https://github.com/0xERR0R/blocky/releases/download/v$RELEASE/blocky_${RELEASE}_Linux_x86_64.tar.gz +wget -q https://github.com/0xERR0R/blocky/releases/download/v$RELEASE/blocky_v${RELEASE}_Linux_x86_64.tar.gz mkdir -p /opt/blocky -tar -xf blocky_${RELEASE}_Linux_x86_64.tar.gz -C /opt/blocky -rm -rf blocky_${RELEASE}_Linux_x86_64.tar.gz +tar -xf blocky_v${RELEASE}_Linux_x86_64.tar.gz -C /opt/blocky +rm -rf blocky_v${RELEASE}_Linux_x86_64.tar.gz cat </opt/blocky/config.yml upstream: # these external DNS resolvers will be used. Blocky picks 2 random resolvers from the list for each query From 5b414def47ef8bdc1653e8922c9790d82cd57c1d Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 29 Mar 2023 06:14:21 -0400 Subject: [PATCH 18/45] Update nginxproxymanager-install.sh fix for v2.10.1 --- install/nginxproxymanager-install.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index bda3670c..5e920bbb 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -66,10 +66,10 @@ RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-man grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -msg_info "Downloading Nginx Proxy Manager v2.9.22" -wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz -cd ./nginx-proxy-manager-2.9.22 -msg_ok "Downloaded Nginx Proxy Manager v2.9.22" +msg_info "Downloading Nginx Proxy Manager v${RELEASE}" +wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz +cd ./nginx-proxy-manager-${RELEASE} +msg_ok "Downloaded Nginx Proxy Manager v${RELEASE}" msg_info "Setting up Enviroment" ln -sf /usr/bin/python3 /usr/bin/python @@ -77,8 +77,8 @@ ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx -sed -i "s+0.0.0+2.9.22+g" backend/package.json -sed -i "s+0.0.0+2.9.22+g" frontend/package.json +sed -i "s+0.0.0+${RELEASE}+g" backend/package.json +sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") @@ -181,6 +181,7 @@ motd_ssh root msg_info "Starting Services" +sed -i 's/^pid/#pid/' /usr/local/openresty/nginx/conf/nginx.conf $STD systemctl enable --now openresty $STD systemctl enable --now npm msg_ok "Started Services" From 420492341f4e0ce49683693804cbe33a60929308 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 29 Mar 2023 06:14:49 -0400 Subject: [PATCH 19/45] Update nginxproxymanager.sh fix update for v2.10.1 --- ct/nginxproxymanager.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 012ebd53..7e7fafd2 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -158,6 +158,7 @@ EOF msg_ok "Initialized Backend" msg_info "Starting Services" + sed -i 's/^pid/#pid/' /usr/local/openresty/nginx/conf/nginx.conf systemctl enable npm &>/dev/null systemctl start openresty systemctl start npm From 46836f0583045f4f10f77ec979e18861ae7b9186 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 29 Mar 2023 06:17:21 -0400 Subject: [PATCH 20/45] Update nginxproxymanager.sh download latest --- ct/nginxproxymanager.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 7e7fafd2..c17e3c53 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -74,18 +74,18 @@ function update_script() { /var/cache/nginx &>/dev/null msg_ok "Cleaned Old Files" - msg_info "Downloading NPM v2.9.22" - wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz &>/dev/null - cd nginx-proxy-manager-2.9.22 - msg_ok "Downloaded NPM v2.9.22" + msg_info "Downloading NPM v${RELEASE}" + wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz &>/dev/null + cd nginx-proxy-manager-${RELEASE} + msg_ok "Downloaded NPM v${RELEASE}" msg_info "Setting up Enviroment" ln -sf /usr/bin/python3 /usr/bin/python ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx - sed -i "s+0.0.0+2.9.22+g" backend/package.json - sed -i "s+0.0.0+2.9.22+g" frontend/package.json + sed -i "s+0.0.0+${RELEASE}+g" backend/package.json + sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") for NGINX_CONF in $NGINX_CONFS; do From d0528d4913272b81d23baca1ad35044f3f48d4fb Mon Sep 17 00:00:00 2001 From: Jimi Ford Date: Wed, 29 Mar 2023 18:21:05 -0400 Subject: [PATCH 21/45] Update CONTRIBUTING.md (#1272) --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2f938e25..bc95960c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,4 +2,4 @@ Everybody is invited and welcome to contribute to Proxmox Helper Scripts. -- Pull requests are always created against the [**pull-requests**](https://github.com/tteck/Proxmox/tree/pull-requests) branch. +- Pull requests submitted against [**main**](https://github.com/tteck/Proxmox/tree/main) are meticulously scrutinized, so please do not take it personally if I reject your request. If you follow the patterns that have been established throughout the codebase, you greatly increase the likelihood that your changes will get merged into [**main**](https://github.com/tteck/Proxmox/tree/main) :partying_face:! From 651b81c7e27aebe509abe306bc6d7e7a66257d1d Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 29 Mar 2023 18:41:02 -0400 Subject: [PATCH 22/45] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index acdc8c2d..74a9f44a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +

Contributing to Proxmox Helper Scripts

+ These script's allows for the creation of a Linux container or virtual machine in an interactive manner, with options for both basic and advanced configurations. The basic setup uses default settings, while the advanced setup provides additional options such as container type, root password, hostname, disk size, core count, RAM size, network settings, and others. The options are presented in a dialog box format using the whiptail command and the script collects and validates the user's input to generate the final configuration of the container or virtual machine.

Proxmox Helper Scripts

From 12a51913390165aa34b6a374661d79ddf91bf5a9 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 29 Mar 2023 18:45:27 -0400 Subject: [PATCH 23/45] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74a9f44a..3e093c9a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

Contributing to Proxmox Helper Scripts

-These script's allows for the creation of a Linux container or virtual machine in an interactive manner, with options for both basic and advanced configurations. The basic setup uses default settings, while the advanced setup provides additional options such as container type, root password, hostname, disk size, core count, RAM size, network settings, and others. The options are presented in a dialog box format using the whiptail command and the script collects and validates the user's input to generate the final configuration of the container or virtual machine. +These script's allows for the creation of a Linux container or virtual machine in an interactive manner, with options for both basic and advanced configurations. The basic setup uses default settings, while The advanced setup offers the possibility to modify the default settings. The options are presented in a dialog box format using the whiptail command and the script collects and validates the user's input to generate the final configuration of the container or virtual machine.

Proxmox Helper Scripts

Be cautious and thoroughly evaluate scripts and automation tasks obtained from external sources.
 From 5f8c6ecdf85b1b1686cd7c538440fbbdb852686a Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 29 Mar 2023 18:46:33 -0400 Subject: [PATCH 24/45] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e093c9a..a94517d8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

Contributing to Proxmox Helper Scripts

-These script's allows for the creation of a Linux container or virtual machine in an interactive manner, with options for both basic and advanced configurations. The basic setup uses default settings, while The advanced setup offers the possibility to modify the default settings. The options are presented in a dialog box format using the whiptail command and the script collects and validates the user's input to generate the final configuration of the container or virtual machine. +These script's allows for the creation of a Linux container or virtual machine in an interactive manner, with options for both basic and advanced configurations. The basic setup uses default settings, while the advanced setup offers the possibility to modify the default settings. The options are presented in a dialog box format using the whiptail command and the script collects and validates the user's input to generate the final configuration of the container or virtual machine.

Proxmox Helper Scripts

Be cautious and thoroughly evaluate scripts and automation tasks obtained from external sources.
 From 8d5e6aedd4d6a721d76af260c824d1b4198172b5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 Mar 2023 05:09:03 -0400 Subject: [PATCH 25/45] Update homepage-install.sh Change the installation method from using git to using releases. --- install/homepage-install.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/install/homepage-install.sh b/install/homepage-install.sh index 4ebc685e..157352c0 100644 --- a/install/homepage-install.sh +++ b/install/homepage-install.sh @@ -17,7 +17,6 @@ msg_info "Installing Dependencies" $STD apt-get install -y curl $STD apt-get install -y sudo $STD apt-get install -y mc -$STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" @@ -30,7 +29,12 @@ $STD npm install -g pnpm msg_ok "Installed Node.js" msg_info "Installing Homepage (Patience)" -$STD git clone https://github.com/benphelps/homepage.git /opt/homepage +RELEASE=$(curl -s https://api.github.com/repos/benphelps/homepage/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') +wget -q https://github.com/benphelps/homepage/archive/refs/tags/v${RELEASE}.tar.gz +$STD tar -xvf v${RELEASE}.tar.gz +mkdir -p /opt/homepage +cp -r homepage-${RELEASE}/* /opt/homepage +rm -rf v${RELEASE}.tar.gz homepage-${RELEASE} cd /opt/homepage mkdir -p config cp /opt/homepage/src/skeleton/* /opt/homepage/config From a243d8ef260f97fb14f0344f8c7245ababe52cd9 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 Mar 2023 05:17:16 -0400 Subject: [PATCH 26/45] Update homepage-install.sh add back git for update --- install/homepage-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/homepage-install.sh b/install/homepage-install.sh index 157352c0..3800244f 100644 --- a/install/homepage-install.sh +++ b/install/homepage-install.sh @@ -17,6 +17,7 @@ msg_info "Installing Dependencies" $STD apt-get install -y curl $STD apt-get install -y sudo $STD apt-get install -y mc +$STD apt-get install -y git msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" From 3b2c81cf1c21fa6d811e3f23a9f116b61c8520fc Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 Mar 2023 07:02:00 -0400 Subject: [PATCH 27/45] Optimizing code --- ct/adguard.sh | 1 - ct/alpine-adguard.sh | 1 - ct/alpine-docker.sh | 1 - ct/alpine-grafana.sh | 1 - ct/alpine-vaultwarden.sh | 1 - ct/alpine-whoogle.sh | 1 - ct/alpine-zigbee2mqtt.sh | 1 - ct/alpine.sh | 1 - ct/audiobookshelf.sh | 1 - ct/autobrr.sh | 1 - ct/blocky.sh | 1 - ct/casaos.sh | 1 - ct/changedetection.sh | 1 - ct/cronicle.sh | 1 - ct/daemonsync.sh | 1 - ct/dashy.sh | 1 - ct/debian.sh | 1 - ct/deconz.sh | 1 - ct/deluge.sh | 1 - ct/devuan.sh | 1 - ct/docker.sh | 1 - ct/emby.sh | 1 - ct/emqx.sh | 1 - ct/esphome.sh | 1 - ct/go2rtc.sh | 1 - ct/grafana.sh | 1 - ct/grocy.sh | 1 - ct/heimdalldashboard.sh | 1 - ct/homeassistant-core.sh | 1 - ct/homeassistant.sh | 1 - ct/homebridge.sh | 1 - ct/homepage.sh | 1 - ct/homer.sh | 1 - ct/hyperion.sh | 1 - ct/influxdb.sh | 1 - ct/iobroker.sh | 1 - ct/jackett.sh | 1 - ct/jellyfin.sh | 1 - ct/k0s.sh | 1 - ct/kavita.sh | 1 - ct/keycloak.sh | 1 - ct/lidarr.sh | 1 - ct/magicmirror.sh | 1 - ct/mariadb.sh | 1 - ct/meshcentral.sh | 1 - ct/motioneye.sh | 1 - ct/mqtt.sh | 1 - ct/n8n.sh | 1 - ct/navidrome.sh | 1 - ct/nextcloudpi.sh | 1 - ct/nginxproxymanager.sh | 1 - ct/nocodb.sh | 1 - ct/node-red.sh | 1 - ct/omada.sh | 1 - ct/omv.sh | 1 - ct/openhab.sh | 1 - ct/paperless-ngx.sh | 1 - ct/photoprism.sh | 1 - ct/pihole.sh | 1 - ct/plex.sh | 1 - ct/podman-homeassistant.sh | 1 - ct/podman.sh | 1 - ct/postgresql.sh | 1 - ct/prometheus.sh | 1 - ct/prowlarr.sh | 1 - ct/qbittorrent.sh | 1 - ct/radarr.sh | 1 - ct/readarr.sh | 1 - ct/rockylinux.sh | 1 - ct/rstptoweb.sh | 1 - ct/sabnzbd.sh | 1 - ct/scrypted.sh | 1 - ct/shinobi.sh | 1 - ct/sonarr.sh | 1 - ct/syncthing.sh | 1 - ct/tdarr.sh | 1 - ct/technitiumdns.sh | 1 - ct/transmission.sh | 1 - ct/trilium.sh | 1 - ct/ubuntu.sh | 1 - ct/umbrel.sh | 1 - ct/unifi.sh | 1 - ct/uptimekuma.sh | 1 - ct/vaultwarden.sh | 1 - ct/whisparr.sh | 1 - ct/whoogle.sh | 1 - ct/wikijs.sh | 1 - ct/wireguard.sh | 1 - ct/yunohost.sh | 1 - ct/zigbee2mqtt.sh | 1 - ct/zwave-js-ui.sh | 1 - misc/build.func | 1 + 92 files changed, 1 insertion(+), 91 deletions(-) diff --git a/ct/adguard.sh b/ct/adguard.sh index c36e12bf..e8c65085 100644 --- a/ct/adguard.sh +++ b/ct/adguard.sh @@ -78,7 +78,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/alpine-adguard.sh b/ct/alpine-adguard.sh index 5dd9e955..248aa7f2 100644 --- a/ct/alpine-adguard.sh +++ b/ct/alpine-adguard.sh @@ -81,7 +81,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-docker.sh b/ct/alpine-docker.sh index 8bde63ce..a7b08ba6 100644 --- a/ct/alpine-docker.sh +++ b/ct/alpine-docker.sh @@ -75,7 +75,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-grafana.sh b/ct/alpine-grafana.sh index 36872876..7cb26ae6 100644 --- a/ct/alpine-grafana.sh +++ b/ct/alpine-grafana.sh @@ -88,7 +88,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 70b5f7f8..45ea5390 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -81,7 +81,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-whoogle.sh b/ct/alpine-whoogle.sh index 7dbf5066..b2e2eaa7 100644 --- a/ct/alpine-whoogle.sh +++ b/ct/alpine-whoogle.sh @@ -79,7 +79,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine-zigbee2mqtt.sh b/ct/alpine-zigbee2mqtt.sh index f9185143..55df4544 100644 --- a/ct/alpine-zigbee2mqtt.sh +++ b/ct/alpine-zigbee2mqtt.sh @@ -75,7 +75,6 @@ function update_script() { done } -ssh_check start build_container description diff --git a/ct/alpine.sh b/ct/alpine.sh index 3eb6a0c9..a3348a9f 100644 --- a/ct/alpine.sh +++ b/ct/alpine.sh @@ -63,7 +63,6 @@ exit; fi } -ssh_check start build_container description diff --git a/ct/audiobookshelf.sh b/ct/audiobookshelf.sh index b208249c..558dbc44 100644 --- a/ct/audiobookshelf.sh +++ b/ct/audiobookshelf.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/autobrr.sh b/ct/autobrr.sh index 91e8a8be..3261b560 100644 --- a/ct/autobrr.sh +++ b/ct/autobrr.sh @@ -71,7 +71,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/blocky.sh b/ct/blocky.sh index 4a2f77b2..08e769e8 100644 --- a/ct/blocky.sh +++ b/ct/blocky.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/casaos.sh b/ct/casaos.sh index 593379c8..c98a025d 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/changedetection.sh b/ct/changedetection.sh index d0ba97e8..c8da20ae 100644 --- a/ct/changedetection.sh +++ b/ct/changedetection.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/cronicle.sh b/ct/cronicle.sh index 3f812270..53702989 100644 --- a/ct/cronicle.sh +++ b/ct/cronicle.sh @@ -100,7 +100,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/daemonsync.sh b/ct/daemonsync.sh index 7f6ed79f..d13e5b40 100644 --- a/ct/daemonsync.sh +++ b/ct/daemonsync.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/dashy.sh b/ct/dashy.sh index 7b95c492..5c76cf70 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -86,7 +86,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/debian.sh b/ct/debian.sh index dc09cba4..b67a0a26 100644 --- a/ct/debian.sh +++ b/ct/debian.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/deconz.sh b/ct/deconz.sh index f5aee5fc..6195bd10 100644 --- a/ct/deconz.sh +++ b/ct/deconz.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/deluge.sh b/ct/deluge.sh index b82cebce..0b3ce6c4 100644 --- a/ct/deluge.sh +++ b/ct/deluge.sh @@ -61,7 +61,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/devuan.sh b/ct/devuan.sh index beb4b23d..db48bf4e 100644 --- a/ct/devuan.sh +++ b/ct/devuan.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/docker.sh b/ct/docker.sh index 77b9c184..1805787c 100644 --- a/ct/docker.sh +++ b/ct/docker.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/emby.sh b/ct/emby.sh index d87c1aae..2e617cfb 100644 --- a/ct/emby.sh +++ b/ct/emby.sh @@ -71,7 +71,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/emqx.sh b/ct/emqx.sh index e3ce0056..7c0ffcd9 100644 --- a/ct/emqx.sh +++ b/ct/emqx.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/esphome.sh b/ct/esphome.sh index 82c0c6c8..cd6e56d2 100644 --- a/ct/esphome.sh +++ b/ct/esphome.sh @@ -68,7 +68,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/go2rtc.sh b/ct/go2rtc.sh index b840dc30..58b82f5c 100644 --- a/ct/go2rtc.sh +++ b/ct/go2rtc.sh @@ -61,7 +61,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/grafana.sh b/ct/grafana.sh index 4a363954..3de34626 100644 --- a/ct/grafana.sh +++ b/ct/grafana.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/grocy.sh b/ct/grocy.sh index f33b8a87..dd30c554 100644 --- a/ct/grocy.sh +++ b/ct/grocy.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/heimdalldashboard.sh b/ct/heimdalldashboard.sh index 6eeaf236..aad87f46 100644 --- a/ct/heimdalldashboard.sh +++ b/ct/heimdalldashboard.sh @@ -140,7 +140,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/homeassistant-core.sh b/ct/homeassistant-core.sh index b635db1d..858433c2 100644 --- a/ct/homeassistant-core.sh +++ b/ct/homeassistant-core.sh @@ -207,7 +207,6 @@ EOF fi } -ssh_check start build_container description diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index 7c96ab1c..ac667247 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -128,7 +128,6 @@ WantedBy=default.target" >$service_path fi } -ssh_check start build_container description diff --git a/ct/homebridge.sh b/ct/homebridge.sh index 8b67fdb1..22039d22 100644 --- a/ct/homebridge.sh +++ b/ct/homebridge.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/homepage.sh b/ct/homepage.sh index 87bc8cc1..e8041087 100644 --- a/ct/homepage.sh +++ b/ct/homepage.sh @@ -67,7 +67,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/homer.sh b/ct/homer.sh index 05939da2..217b2800 100644 --- a/ct/homer.sh +++ b/ct/homer.sh @@ -84,7 +84,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/hyperion.sh b/ct/hyperion.sh index 0021c3be..92535765 100644 --- a/ct/hyperion.sh +++ b/ct/hyperion.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/influxdb.sh b/ct/influxdb.sh index 8b6c3150..f6c078cf 100644 --- a/ct/influxdb.sh +++ b/ct/influxdb.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/iobroker.sh b/ct/iobroker.sh index 17dcd29d..841f135e 100644 --- a/ct/iobroker.sh +++ b/ct/iobroker.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/jackett.sh b/ct/jackett.sh index 2c6eff8d..f895f4d7 100644 --- a/ct/jackett.sh +++ b/ct/jackett.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh index a67c5967..d11b8212 100644 --- a/ct/jellyfin.sh +++ b/ct/jellyfin.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/k0s.sh b/ct/k0s.sh index 5f39de39..75b5648a 100644 --- a/ct/k0s.sh +++ b/ct/k0s.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/kavita.sh b/ct/kavita.sh index f0ebf4cc..8410daa7 100644 --- a/ct/kavita.sh +++ b/ct/kavita.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/keycloak.sh b/ct/keycloak.sh index 2585d900..4488dd1a 100644 --- a/ct/keycloak.sh +++ b/ct/keycloak.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/lidarr.sh b/ct/lidarr.sh index c4959153..6bc88997 100644 --- a/ct/lidarr.sh +++ b/ct/lidarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/magicmirror.sh b/ct/magicmirror.sh index aeda1e47..c57121c2 100644 --- a/ct/magicmirror.sh +++ b/ct/magicmirror.sh @@ -63,7 +63,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/mariadb.sh b/ct/mariadb.sh index 857fabbb..d6894ed9 100644 --- a/ct/mariadb.sh +++ b/ct/mariadb.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/meshcentral.sh b/ct/meshcentral.sh index 932ea4bd..2739b517 100644 --- a/ct/meshcentral.sh +++ b/ct/meshcentral.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/motioneye.sh b/ct/motioneye.sh index b5084568..4a106f03 100644 --- a/ct/motioneye.sh +++ b/ct/motioneye.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/mqtt.sh b/ct/mqtt.sh index 312c467d..0dde1c0e 100644 --- a/ct/mqtt.sh +++ b/ct/mqtt.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/n8n.sh b/ct/n8n.sh index 297c9eed..d4862ef1 100644 --- a/ct/n8n.sh +++ b/ct/n8n.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/navidrome.sh b/ct/navidrome.sh index 0ebb3d38..c9e53584 100644 --- a/ct/navidrome.sh +++ b/ct/navidrome.sh @@ -71,7 +71,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/nextcloudpi.sh b/ct/nextcloudpi.sh index 52f04f49..a1718208 100644 --- a/ct/nextcloudpi.sh +++ b/ct/nextcloudpi.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index c17e3c53..e8c5be3a 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -172,7 +172,6 @@ EOF exit } -ssh_check start build_container description diff --git a/ct/nocodb.sh b/ct/nocodb.sh index e56521ba..4b7636f6 100644 --- a/ct/nocodb.sh +++ b/ct/nocodb.sh @@ -63,7 +63,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/node-red.sh b/ct/node-red.sh index c90d898c..3dba9183 100644 --- a/ct/node-red.sh +++ b/ct/node-red.sh @@ -96,7 +96,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/omada.sh b/ct/omada.sh index 51127d43..104183df 100644 --- a/ct/omada.sh +++ b/ct/omada.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/omv.sh b/ct/omv.sh index c898c92e..532df042 100644 --- a/ct/omv.sh +++ b/ct/omv.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/openhab.sh b/ct/openhab.sh index d197aec1..21a77dc7 100644 --- a/ct/openhab.sh +++ b/ct/openhab.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/paperless-ngx.sh b/ct/paperless-ngx.sh index 30b1d9f9..09d46d45 100644 --- a/ct/paperless-ngx.sh +++ b/ct/paperless-ngx.sh @@ -132,7 +132,6 @@ EOF fi } -ssh_check start build_container description diff --git a/ct/photoprism.sh b/ct/photoprism.sh index c6c943bd..231f7d1e 100644 --- a/ct/photoprism.sh +++ b/ct/photoprism.sh @@ -86,7 +86,6 @@ function update_script() { exit } -ssh_check start build_container description diff --git a/ct/pihole.sh b/ct/pihole.sh index 57f09f15..07e786ea 100644 --- a/ct/pihole.sh +++ b/ct/pihole.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/plex.sh b/ct/plex.sh index beb328e7..48d12505 100644 --- a/ct/plex.sh +++ b/ct/plex.sh @@ -71,7 +71,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/podman-homeassistant.sh b/ct/podman-homeassistant.sh index e3ccf4d7..d916cc95 100644 --- a/ct/podman-homeassistant.sh +++ b/ct/podman-homeassistant.sh @@ -111,7 +111,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/podman.sh b/ct/podman.sh index c18a858a..b4297c51 100644 --- a/ct/podman.sh +++ b/ct/podman.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/postgresql.sh b/ct/postgresql.sh index 606ee95d..f0b606a1 100644 --- a/ct/postgresql.sh +++ b/ct/postgresql.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/prometheus.sh b/ct/prometheus.sh index bfbf2367..16f17758 100644 --- a/ct/prometheus.sh +++ b/ct/prometheus.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/prowlarr.sh b/ct/prowlarr.sh index cb5c5347..2c323541 100644 --- a/ct/prowlarr.sh +++ b/ct/prowlarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/qbittorrent.sh b/ct/qbittorrent.sh index 499cfcf3..83cc8526 100644 --- a/ct/qbittorrent.sh +++ b/ct/qbittorrent.sh @@ -61,7 +61,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/radarr.sh b/ct/radarr.sh index df6704a8..a379e8ac 100644 --- a/ct/radarr.sh +++ b/ct/radarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/readarr.sh b/ct/readarr.sh index 40e2ac20..bea527d0 100644 --- a/ct/readarr.sh +++ b/ct/readarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/rockylinux.sh b/ct/rockylinux.sh index 715a4a5f..edc69291 100644 --- a/ct/rockylinux.sh +++ b/ct/rockylinux.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/rstptoweb.sh b/ct/rstptoweb.sh index c7db7f59..1c1bb453 100644 --- a/ct/rstptoweb.sh +++ b/ct/rstptoweb.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/sabnzbd.sh b/ct/sabnzbd.sh index 8514ba30..ea75032d 100644 --- a/ct/sabnzbd.sh +++ b/ct/sabnzbd.sh @@ -66,7 +66,6 @@ msg_ok "Updated $APP" exit } -ssh_check start build_container description diff --git a/ct/scrypted.sh b/ct/scrypted.sh index eadc2f0f..d307d78c 100644 --- a/ct/scrypted.sh +++ b/ct/scrypted.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/shinobi.sh b/ct/shinobi.sh index b8b003bf..bc5572e6 100644 --- a/ct/shinobi.sh +++ b/ct/shinobi.sh @@ -64,7 +64,6 @@ msg_ok "Updated Shinobi LXC" exit } -ssh_check start build_container description diff --git a/ct/sonarr.sh b/ct/sonarr.sh index 48a249e5..ac6f2399 100644 --- a/ct/sonarr.sh +++ b/ct/sonarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/syncthing.sh b/ct/syncthing.sh index f6b3d67c..292cf4db 100644 --- a/ct/syncthing.sh +++ b/ct/syncthing.sh @@ -62,7 +62,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/tdarr.sh b/ct/tdarr.sh index 1d570df8..994ae3db 100644 --- a/ct/tdarr.sh +++ b/ct/tdarr.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/technitiumdns.sh b/ct/technitiumdns.sh index ca568c91..f947cd07 100644 --- a/ct/technitiumdns.sh +++ b/ct/technitiumdns.sh @@ -70,7 +70,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/transmission.sh b/ct/transmission.sh index cb0f21d8..94e654d6 100644 --- a/ct/transmission.sh +++ b/ct/transmission.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/trilium.sh b/ct/trilium.sh index 1288b82a..3e15c458 100644 --- a/ct/trilium.sh +++ b/ct/trilium.sh @@ -80,7 +80,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/ubuntu.sh b/ct/ubuntu.sh index c30b4067..bc2f0cc6 100644 --- a/ct/ubuntu.sh +++ b/ct/ubuntu.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/umbrel.sh b/ct/umbrel.sh index d35b3ac1..46ed1aa2 100644 --- a/ct/umbrel.sh +++ b/ct/umbrel.sh @@ -60,7 +60,6 @@ msg_ok "Updated ${APP} LXC" exit } -ssh_check start build_container description diff --git a/ct/unifi.sh b/ct/unifi.sh index bd619787..542f1f87 100644 --- a/ct/unifi.sh +++ b/ct/unifi.sh @@ -61,7 +61,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/uptimekuma.sh b/ct/uptimekuma.sh index 77b81ecc..4f64ecc3 100644 --- a/ct/uptimekuma.sh +++ b/ct/uptimekuma.sh @@ -78,7 +78,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh index e5373967..8f887956 100644 --- a/ct/vaultwarden.sh +++ b/ct/vaultwarden.sh @@ -131,7 +131,6 @@ function update_script() { fi } -ssh_check start build_container description diff --git a/ct/whisparr.sh b/ct/whisparr.sh index 2a99863f..c616282a 100644 --- a/ct/whisparr.sh +++ b/ct/whisparr.sh @@ -61,7 +61,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/whoogle.sh b/ct/whoogle.sh index 67ecf793..e93b19d7 100644 --- a/ct/whoogle.sh +++ b/ct/whoogle.sh @@ -60,7 +60,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/wikijs.sh b/ct/wikijs.sh index a8051de0..e1ac9863 100644 --- a/ct/wikijs.sh +++ b/ct/wikijs.sh @@ -83,7 +83,6 @@ msg_ok "Update Successfull" exit } -ssh_check start build_container description diff --git a/ct/wireguard.sh b/ct/wireguard.sh index 4afea4d0..553de4e5 100644 --- a/ct/wireguard.sh +++ b/ct/wireguard.sh @@ -115,7 +115,6 @@ exit fi } -ssh_check start build_container description diff --git a/ct/yunohost.sh b/ct/yunohost.sh index 6ffda45d..22198999 100644 --- a/ct/yunohost.sh +++ b/ct/yunohost.sh @@ -60,7 +60,6 @@ msg_ok "Updated $APP LXC" exit } -ssh_check start build_container description diff --git a/ct/zigbee2mqtt.sh b/ct/zigbee2mqtt.sh index a91c9ec4..c1c59ff0 100644 --- a/ct/zigbee2mqtt.sh +++ b/ct/zigbee2mqtt.sh @@ -126,7 +126,6 @@ function update_script() { exit } -ssh_check start build_container description diff --git a/ct/zwave-js-ui.sh b/ct/zwave-js-ui.sh index 2dfcaaa5..ed8c0d64 100644 --- a/ct/zwave-js-ui.sh +++ b/ct/zwave-js-ui.sh @@ -78,7 +78,6 @@ function update_script() { exit } -ssh_check start build_container description diff --git a/misc/build.func b/misc/build.func index a6e7e0e3..43dd3fbe 100644 --- a/misc/build.func +++ b/misc/build.func @@ -342,6 +342,7 @@ advanced_settings() { } install_script() { + ssh_check arch_check pve_check NEXTID=$(pvesh get /cluster/nextid) From ca8ed4f5cb78eced991f4ec0e27d7a4a8b96581d Mon Sep 17 00:00:00 2001 From: LordXaosa Date: Fri, 31 Mar 2023 00:37:54 +0300 Subject: [PATCH 28/45] Fix missing methods (#1275) Some Heimdall apps uses method simplexml_load_string() which depends on php-xml package. Since Heimdall uses php 7.4 I added such dependency. --- install/heimdalldashboard-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/heimdalldashboard-install.sh b/install/heimdalldashboard-install.sh index 8e83e9ef..a26b67ea 100644 --- a/install/heimdalldashboard-install.sh +++ b/install/heimdalldashboard-install.sh @@ -23,6 +23,7 @@ msg_info "Installing PHP" $STD apt-get install -y php $STD apt-get install -y php-sqlite3 $STD apt-get install -y php-zip +$STD apt-get install -y php7.4-xml msg_ok "Installed PHP" RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]') From 645f0ab431f2a7694f75120e38c90daee3e9aafd Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 Mar 2023 23:25:02 -0400 Subject: [PATCH 29/45] Update heimdalldashboard-install.sh By default, Debian 11 (Bullseye) includes PHP version 7.4 --- install/heimdalldashboard-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/heimdalldashboard-install.sh b/install/heimdalldashboard-install.sh index a26b67ea..df8e7cc2 100644 --- a/install/heimdalldashboard-install.sh +++ b/install/heimdalldashboard-install.sh @@ -23,7 +23,7 @@ msg_info "Installing PHP" $STD apt-get install -y php $STD apt-get install -y php-sqlite3 $STD apt-get install -y php-zip -$STD apt-get install -y php7.4-xml +$STD apt-get install -y php-xml msg_ok "Installed PHP" RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]') From 4ca034ed11449001f2ff445c0855100438715aa8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 00:57:43 -0400 Subject: [PATCH 30/45] Update nginxproxymanager.sh prep for v2.10.2 --- ct/nginxproxymanager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index e8c5be3a..1b9c33f6 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -158,7 +158,7 @@ EOF msg_ok "Initialized Backend" msg_info "Starting Services" - sed -i 's/^pid/#pid/' /usr/local/openresty/nginx/conf/nginx.conf + sed -i -e 's/^pid/#pid/' -e 's/^user/#user/' /usr/local/openresty/nginx/conf/nginx.conf systemctl enable npm &>/dev/null systemctl start openresty systemctl start npm From 1088e52b615caa366ddf6dade3fdbba691f0fb68 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 00:58:44 -0400 Subject: [PATCH 31/45] Update nginxproxymanager-install.sh prep for v2.10.2 --- install/nginxproxymanager-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 5e920bbb..1108198d 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -181,7 +181,7 @@ motd_ssh root msg_info "Starting Services" -sed -i 's/^pid/#pid/' /usr/local/openresty/nginx/conf/nginx.conf +sed -i -e 's/^pid/#pid/' -e 's/^user/#user/' /usr/local/openresty/nginx/conf/nginx.conf $STD systemctl enable --now openresty $STD systemctl enable --now npm msg_ok "Started Services" From 59bfc8d3e3fa2dc77f2c1f52957e2a666389ada0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 17:26:56 -0400 Subject: [PATCH 32/45] Update haos-vm.sh Include a choice within the "Advanced" settings to configure the disk cache. --- vm/haos-vm.sh | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index ab628f89..8f3c244b 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -112,6 +112,7 @@ function default_settings() { VMID="$NEXTID" FORMAT=",efitype=4m" MACHINE="" + DISK_CACHE="" HN="haos$stable" CORE_COUNT="2" RAM_SIZE="4096" @@ -123,6 +124,7 @@ function default_settings() { echo -e "${DGN}Using HAOS Version: ${BGN}${BRANCH}${CL}" echo -e "${DGN}Using Virtual Machine ID: ${BGN}${VMID}${CL}" echo -e "${DGN}Using Machine Type: ${BGN}i440fx${CL}" + echo -e "${DGN}Using Disk Cache: ${BGN}Default${CL}" echo -e "${DGN}Using Hostname: ${BGN}${HN}${CL}" echo -e "${DGN}Allocated Cores: ${BGN}${CORE_COUNT}${CL}" echo -e "${DGN}Allocated RAM: ${BGN}${RAM_SIZE}${CL}" @@ -141,6 +143,7 @@ function advanced_settings() { 3>&1 1>&2 2>&3) exitstatus=$? if [ $exitstatus = 0 ]; then echo -e "${DGN}Using HAOS Version: ${BGN}$BRANCH${CL}"; fi + while true; do VMID=$(whiptail --inputbox "Set Virtual Machine ID" 8 58 $NEXTID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? @@ -173,6 +176,20 @@ function advanced_settings() { FORMAT=",efitype=4m" MACHINE="" fi + + DISK_CACHE1=$(whiptail --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \ + "0" "Default" ON \ + "1" "Write Through" OFF \ + 3>&1 1>&2 2>&3) + exitstatus=$? + if [ $DISK_CACHE1 = "1" ]; then + echo -e "${DGN}Using Disk Cache: ${BGN}Write Through${CL}" + DISK_CACHE="cache=writethrough," + else + echo -e "${DGN}Using Disk Cache: ${BGN}Default${CL}" + DISK_CACHE="" + fi + VM_NAME=$(whiptail --inputbox "Set Hostname" 8 58 haos${BRANCH} --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ -z $VM_NAME ]; then @@ -184,6 +201,7 @@ function advanced_settings() { echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}" fi fi + CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ -z $CORE_COUNT ]; then @@ -192,6 +210,7 @@ function advanced_settings() { else if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi fi + RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 4096 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ -z $RAM_SIZE ]; then @@ -200,6 +219,7 @@ function advanced_settings() { else if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi fi + BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ -z $BRG ]; then @@ -208,6 +228,7 @@ function advanced_settings() { else if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi fi + MAC1=$(whiptail --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ -z $MAC1 ]; then @@ -219,6 +240,7 @@ function advanced_settings() { echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}" fi fi + VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ $exitstatus = 0 ]; then @@ -230,6 +252,7 @@ function advanced_settings() { echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" fi fi + MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3) exitstatus=$? if [ $exitstatus = 0 ]; then @@ -241,6 +264,7 @@ function advanced_settings() { echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}" fi fi + if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}" START_VM="yes" @@ -248,6 +272,7 @@ function advanced_settings() { echo -e "${DGN}Start VM when completed: ${BGN}no${CL}" START_VM="no" fi + if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create HAOS ${BRANCH} VM?" --no-button Do-Over 10 58); then echo -e "${RD}Creating a HAOS VM using the above advanced settings${CL}" else @@ -342,7 +367,7 @@ pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null qm importdisk $VMID ${FILE%.*} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null qm set $VMID \ -efidisk0 ${DISK0_REF}${FORMAT} \ - -scsi0 ${DISK1_REF},${THIN}size=32G \ + -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=32G \ -boot order=scsi0 \ -description "# Home Assistant OS ### https://github.com/tteck/Proxmox From 324a485930d8a2e292f9a224ccce34ad331a6653 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 17:30:53 -0400 Subject: [PATCH 33/45] Update CHANGELOG.MD --- CHANGELOG.MD | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index dd74f685..b577dfc1 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,6 +2,13 @@ # Change Log All notable changes to this project will be documented in this file. +## 2023-03-31 + +### Changed + +- **Home Assistant OS VM** + - Include a choice within the "Advanced" settings to configure the disk cache. + ## 2023-03-27 ### Changed From daa1720d85e5288c4b279fc4eaccd31f2b06e75a Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 18:02:24 -0400 Subject: [PATCH 34/45] Update nginxproxymanager-install.sh --- install/nginxproxymanager-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 1108198d..e3eb7d8b 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -40,7 +40,7 @@ $STD python3 -m venv /opt/certbot/ if [ "$(getconf LONG_BIT)" = "32" ]; then $STD python3 -m pip install --no-cache-dir -U cryptography==3.3.2 fi -$STD python3 -m pip install --no-cache-dir cffi certbot +$STD python3 -m pip install --no-cache-dir cffi certbot certbot-dns-cloudflare msg_ok "Installed Python" msg_info "Installing Openresty" From 1f17d282a611670e767f166f746e76bb3fccba0e Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 18:04:25 -0400 Subject: [PATCH 35/45] Update nginxproxymanager.sh --- ct/nginxproxymanager.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index 1b9c33f6..cb447ad2 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -124,6 +124,7 @@ function update_script() { mkdir -p /app/global /app/frontend/images cp -r backend/* /app cp -r global/* /app/global + python3 -m pip install --no-cache-dir certbot-dns-cloudflare &>/dev/null msg_ok "Setup Enviroment" msg_info "Building Frontend" From d8ed7b5060033ce3a9653d4961181e10534f2ac3 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 20:02:47 -0400 Subject: [PATCH 36/45] Update nginxproxymanager-install.sh lock script to version 2.9.22 --- install/nginxproxymanager-install.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index e3eb7d8b..bda3670c 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -40,7 +40,7 @@ $STD python3 -m venv /opt/certbot/ if [ "$(getconf LONG_BIT)" = "32" ]; then $STD python3 -m pip install --no-cache-dir -U cryptography==3.3.2 fi -$STD python3 -m pip install --no-cache-dir cffi certbot certbot-dns-cloudflare +$STD python3 -m pip install --no-cache-dir cffi certbot msg_ok "Installed Python" msg_info "Installing Openresty" @@ -66,10 +66,10 @@ RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-man grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -msg_info "Downloading Nginx Proxy Manager v${RELEASE}" -wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz -cd ./nginx-proxy-manager-${RELEASE} -msg_ok "Downloaded Nginx Proxy Manager v${RELEASE}" +msg_info "Downloading Nginx Proxy Manager v2.9.22" +wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz +cd ./nginx-proxy-manager-2.9.22 +msg_ok "Downloaded Nginx Proxy Manager v2.9.22" msg_info "Setting up Enviroment" ln -sf /usr/bin/python3 /usr/bin/python @@ -77,8 +77,8 @@ ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx -sed -i "s+0.0.0+${RELEASE}+g" backend/package.json -sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json +sed -i "s+0.0.0+2.9.22+g" backend/package.json +sed -i "s+0.0.0+2.9.22+g" frontend/package.json sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") @@ -181,7 +181,6 @@ motd_ssh root msg_info "Starting Services" -sed -i -e 's/^pid/#pid/' -e 's/^user/#user/' /usr/local/openresty/nginx/conf/nginx.conf $STD systemctl enable --now openresty $STD systemctl enable --now npm msg_ok "Started Services" From 5826ee33b36c82bd91ac5dda1f18d04294532038 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 Mar 2023 20:04:57 -0400 Subject: [PATCH 37/45] Update nginxproxymanager.sh lock script version to 2.9.22 --- ct/nginxproxymanager.sh | 326 +++++++++++++++++++++------------------- 1 file changed, 168 insertions(+), 158 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index cb447ad2..bda3670c 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -1,145 +1,144 @@ #!/usr/bin/env bash -source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) + # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT # https://github.com/tteck/Proxmox/raw/main/LICENSE -function header_info { - clear - cat <<"EOF" - _ __ _ ____ __ ___ - / | / /___ _(_)___ _ __ / __ \_________ __ ____ __ / |/ /___ _____ ____ _____ ____ _____ - / |/ / __ / / __ \| |/_/ / /_/ / ___/ __ \| |/_/ / / / / /|_/ / __ / __ \/ __ / __ / _ \/ ___/ - / /| / /_/ / / / / /> < / ____/ / / /_/ /> /etc/apt/sources.list.d/openresty.list' +$STD apt-get -y update +$STD apt-get -y install --no-install-recommends openresty +msg_ok "Installed Openresty" + +msg_info "Setting up Node.js Repository" +$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x) +msg_ok "Set up Node.js Repository" + +msg_info "Installing Node.js" +$STD apt-get install -y nodejs +msg_ok "Installed Node.js" + +msg_info "Installing Yarn" +$STD npm install --global yarn +msg_ok "Installed Yarn" + +RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | + grep "tag_name" | + awk '{print substr($2, 3, length($2)-4) }') + +msg_info "Downloading Nginx Proxy Manager v2.9.22" +wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz +cd ./nginx-proxy-manager-2.9.22 +msg_ok "Downloaded Nginx Proxy Manager v2.9.22" + +msg_info "Setting up Enviroment" +ln -sf /usr/bin/python3 /usr/bin/python +ln -sf /usr/bin/certbot /opt/certbot/bin/certbot +ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx +ln -sf /usr/local/openresty/nginx/ /etc/nginx + +sed -i "s+0.0.0+2.9.22+g" backend/package.json +sed -i "s+0.0.0+2.9.22+g" frontend/package.json + +sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf +NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") +for NGINX_CONF in $NGINX_CONFS; do + sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF" +done -function update_script() { - header_info - if [[ ! -f /lib/systemd/system/npm.service ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | - grep "tag_name" | - awk '{print substr($2, 3, length($2)-4) }') - msg_info "Stopping Services" - systemctl stop openresty - systemctl stop npm - msg_ok "Stopped Services" - - msg_info "Cleaning Old Files" - rm -rf /app \ - /var/www/html \ - /etc/nginx \ - /var/log/nginx \ - /var/lib/nginx \ - /var/cache/nginx &>/dev/null - msg_ok "Cleaned Old Files" - - msg_info "Downloading NPM v${RELEASE}" - wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE} -O - | tar -xz &>/dev/null - cd nginx-proxy-manager-${RELEASE} - msg_ok "Downloaded NPM v${RELEASE}" - - msg_info "Setting up Enviroment" - ln -sf /usr/bin/python3 /usr/bin/python - ln -sf /usr/bin/certbot /opt/certbot/bin/certbot - ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx - ln -sf /usr/local/openresty/nginx/ /etc/nginx - sed -i "s+0.0.0+${RELEASE}+g" backend/package.json - sed -i "s+0.0.0+${RELEASE}+g" frontend/package.json - sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf - NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") - for NGINX_CONF in $NGINX_CONFS; do - sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF" - done - mkdir -p /var/www/html /etc/nginx/logs - cp -r docker/rootfs/var/www/html/* /var/www/html/ - cp -r docker/rootfs/etc/nginx/* /etc/nginx/ - cp docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini - cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager - ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf - rm -f /etc/nginx/conf.d/dev.conf - mkdir -p /tmp/nginx/body \ - /run/nginx \ - /data/nginx \ - /data/custom_ssl \ - /data/logs \ - /data/access \ - /data/nginx/default_host \ - /data/nginx/default_www \ - /data/nginx/proxy_host \ - /data/nginx/redirection_host \ - /data/nginx/stream \ - /data/nginx/dead_host \ - /data/nginx/temp \ - /var/lib/nginx/cache/public \ - /var/lib/nginx/cache/private \ - /var/cache/nginx/proxy_temp - chmod -R 777 /var/cache/nginx - chown root /tmp/nginx - echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf - if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then - echo -e "${CHECKMARK} \e[1;92m Generating dummy SSL Certificate... \e[0m" - openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null - fi - mkdir -p /app/global /app/frontend/images - cp -r backend/* /app - cp -r global/* /app/global - python3 -m pip install --no-cache-dir certbot-dns-cloudflare &>/dev/null - msg_ok "Setup Enviroment" - - msg_info "Building Frontend" - cd ./frontend - export NODE_ENV=development - yarn install --network-timeout=30000 &>/dev/null - yarn build &>/dev/null - cp -r dist/* /app/frontend - cp -r app-images/* /app/frontend/images - msg_ok "Built Frontend" - - msg_info "Initializing Backend" - rm -rf /app/config/default.json &>/dev/null - if [ ! -f /app/config/production.json ]; then - cat <<'EOF' >/app/config/production.json +mkdir -p /var/www/html /etc/nginx/logs +cp -r docker/rootfs/var/www/html/* /var/www/html/ +cp -r docker/rootfs/etc/nginx/* /etc/nginx/ +cp docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini +cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager +ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf +rm -f /etc/nginx/conf.d/dev.conf + +mkdir -p /tmp/nginx/body \ + /run/nginx \ + /data/nginx \ + /data/custom_ssl \ + /data/logs \ + /data/access \ + /data/nginx/default_host \ + /data/nginx/default_www \ + /data/nginx/proxy_host \ + /data/nginx/redirection_host \ + /data/nginx/stream \ + /data/nginx/dead_host \ + /data/nginx/temp \ + /var/lib/nginx/cache/public \ + /var/lib/nginx/cache/private \ + /var/cache/nginx/proxy_temp + +chmod -R 777 /var/cache/nginx +chown root /tmp/nginx + +echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf + +if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then + echo -en "${GN} Generating dummy SSL Certificate... " + openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null +fi + +mkdir -p /app/global /app/frontend/images +cp -r backend/* /app +cp -r global/* /app/global +msg_ok "Set up Enviroment" + +msg_info "Building Frontend" +cd ./frontend +export NODE_ENV=development +$STD yarn install --network-timeout=30000 +$STD yarn build +cp -r dist/* /app/frontend +cp -r app-images/* /app/frontend/images +msg_ok "Built Frontend" + +msg_info "Initializing Backend" +rm -rf /app/config/default.json +if [ ! -f /app/config/production.json ]; then + cat <<'EOF' >/app/config/production.json { "database": { "engine": "knex-native", @@ -152,31 +151,42 @@ function update_script() { } } EOF - fi - cd /app - export NODE_ENV=development - yarn install --network-timeout=30000 &>/dev/null - msg_ok "Initialized Backend" - - msg_info "Starting Services" - sed -i -e 's/^pid/#pid/' -e 's/^user/#user/' /usr/local/openresty/nginx/conf/nginx.conf - systemctl enable npm &>/dev/null - systemctl start openresty - systemctl start npm - msg_ok "Started Services" - - msg_info "Cleaning up" - rm -rf ~/nginx-proxy-manager-* - msg_ok "Cleaned" - - msg_ok "Update Successfull" - exit -} +fi +cd /app +export NODE_ENV=development +$STD yarn install --network-timeout=30000 +msg_ok "Initialized Backend" + +msg_info "Creating Service" +cat <<'EOF' >/lib/systemd/system/npm.service +[Unit] +Description=Nginx Proxy Manager +After=network.target +Wants=openresty.service + +[Service] +Type=simple +Environment=NODE_ENV=production +ExecStartPre=-mkdir -p /tmp/nginx/body /data/letsencrypt-acme-challenge +ExecStart=/usr/bin/node index.js --abort_on_uncaught_exception --max_old_space_size=250 +WorkingDirectory=/app +Restart=on-failure + +[Install] +WantedBy=multi-user.target +EOF +msg_ok "Created Service" + +motd_ssh +root -start -build_container -description +msg_info "Starting Services" +$STD systemctl enable --now openresty +$STD systemctl enable --now npm +msg_ok "Started Services" -msg_ok "Completed Successfully!\n" -echo -e "${APP} should be reachable by going to the following URL. - ${BL}http://${IP}:81${CL} \n" +msg_info "Cleaning up" +rm -rf ../nginx-proxy-manager-* +$STD apt-get autoremove +$STD apt-get autoclean +msg_ok "Cleaned" From a03831227ad3f501c1b07f3454e900c8c9ef0994 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 1 Apr 2023 05:36:01 -0400 Subject: [PATCH 38/45] Update nginxproxymanager.sh --- ct/nginxproxymanager.sh | 324 +++++++++++++++++++--------------------- 1 file changed, 156 insertions(+), 168 deletions(-) diff --git a/ct/nginxproxymanager.sh b/ct/nginxproxymanager.sh index bda3670c..ce7fc32f 100644 --- a/ct/nginxproxymanager.sh +++ b/ct/nginxproxymanager.sh @@ -1,144 +1,144 @@ #!/usr/bin/env bash - +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) # Copyright (c) 2021-2023 tteck # Author: tteck (tteckster) # License: MIT # https://github.com/tteck/Proxmox/raw/main/LICENSE -source /dev/stdin <<< "$FUNCTIONS_FILE_PATH" +function header_info { + clear + cat <<"EOF" + _ __ _ ____ __ ___ + / | / /___ _(_)___ _ __ / __ \_________ __ ____ __ / |/ /___ _____ ____ _____ ____ _____ + / |/ / __ / / __ \| |/_/ / /_/ / ___/ __ \| |/_/ / / / / /|_/ / __ / __ \/ __ / __ / _ \/ ___/ + / /| / /_/ / / / / /> < / ____/ / / /_/ /> /etc/apt/sources.list.d/openresty.list' -$STD apt-get -y update -$STD apt-get -y install --no-install-recommends openresty -msg_ok "Installed Openresty" - -msg_info "Setting up Node.js Repository" -$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x) -msg_ok "Set up Node.js Repository" - -msg_info "Installing Node.js" -$STD apt-get install -y nodejs -msg_ok "Installed Node.js" - -msg_info "Installing Yarn" -$STD npm install --global yarn -msg_ok "Installed Yarn" - -RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | - grep "tag_name" | - awk '{print substr($2, 3, length($2)-4) }') - -msg_info "Downloading Nginx Proxy Manager v2.9.22" -wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz -cd ./nginx-proxy-manager-2.9.22 -msg_ok "Downloaded Nginx Proxy Manager v2.9.22" - -msg_info "Setting up Enviroment" -ln -sf /usr/bin/python3 /usr/bin/python -ln -sf /usr/bin/certbot /opt/certbot/bin/certbot -ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx -ln -sf /usr/local/openresty/nginx/ /etc/nginx - -sed -i "s+0.0.0+2.9.22+g" backend/package.json -sed -i "s+0.0.0+2.9.22+g" frontend/package.json - -sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf -NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") -for NGINX_CONF in $NGINX_CONFS; do - sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF" -done -mkdir -p /var/www/html /etc/nginx/logs -cp -r docker/rootfs/var/www/html/* /var/www/html/ -cp -r docker/rootfs/etc/nginx/* /etc/nginx/ -cp docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini -cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager -ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf -rm -f /etc/nginx/conf.d/dev.conf - -mkdir -p /tmp/nginx/body \ - /run/nginx \ - /data/nginx \ - /data/custom_ssl \ - /data/logs \ - /data/access \ - /data/nginx/default_host \ - /data/nginx/default_www \ - /data/nginx/proxy_host \ - /data/nginx/redirection_host \ - /data/nginx/stream \ - /data/nginx/dead_host \ - /data/nginx/temp \ - /var/lib/nginx/cache/public \ - /var/lib/nginx/cache/private \ - /var/cache/nginx/proxy_temp - -chmod -R 777 /var/cache/nginx -chown root /tmp/nginx - -echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf - -if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then - echo -en "${GN} Generating dummy SSL Certificate... " - openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null -fi - -mkdir -p /app/global /app/frontend/images -cp -r backend/* /app -cp -r global/* /app/global -msg_ok "Set up Enviroment" - -msg_info "Building Frontend" -cd ./frontend -export NODE_ENV=development -$STD yarn install --network-timeout=30000 -$STD yarn build -cp -r dist/* /app/frontend -cp -r app-images/* /app/frontend/images -msg_ok "Built Frontend" +function default_settings() { + CT_TYPE="1" + PW="" + CT_ID=$NEXTID + HN=$NSAPP + DISK_SIZE="$var_disk" + CORE_COUNT="$var_cpu" + RAM_SIZE="$var_ram" + BRG="vmbr0" + NET=dhcp + GATE="" + DISABLEIP6="no" + MTU="" + SD="" + NS="" + MAC="" + VLAN="" + SSH="no" + VERB="no" + echo_default +} -msg_info "Initializing Backend" -rm -rf /app/config/default.json -if [ ! -f /app/config/production.json ]; then - cat <<'EOF' >/app/config/production.json +function update_script() { + header_info + if [[ ! -f /lib/systemd/system/npm.service ]]; then + msg_error "No ${APP} Installation Found!" + exit + fi + RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest | + grep "tag_name" | + awk '{print substr($2, 3, length($2)-4) }') + msg_info "Stopping Services" + systemctl stop openresty + systemctl stop npm + msg_ok "Stopped Services" + + msg_info "Cleaning Old Files" + rm -rf /app \ + /var/www/html \ + /etc/nginx \ + /var/log/nginx \ + /var/lib/nginx \ + /var/cache/nginx &>/dev/null + msg_ok "Cleaned Old Files" + + msg_info "Downloading NPM v2.9.22" + wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz &>/dev/null + cd nginx-proxy-manager-2.9.22 + msg_ok "Downloaded NPM v2.9.22" + + msg_info "Setting up Enviroment" + ln -sf /usr/bin/python3 /usr/bin/python + ln -sf /usr/bin/certbot /opt/certbot/bin/certbot + ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx + ln -sf /usr/local/openresty/nginx/ /etc/nginx + sed -i "s+0.0.0+2.9.22+g" backend/package.json + sed -i "s+0.0.0+2.9.22+g" frontend/package.json + sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf + NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") + for NGINX_CONF in $NGINX_CONFS; do + sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF" + done + mkdir -p /var/www/html /etc/nginx/logs + cp -r docker/rootfs/var/www/html/* /var/www/html/ + cp -r docker/rootfs/etc/nginx/* /etc/nginx/ + cp docker/rootfs/etc/letsencrypt.ini /etc/letsencrypt.ini + cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-proxy-manager + ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf + rm -f /etc/nginx/conf.d/dev.conf + mkdir -p /tmp/nginx/body \ + /run/nginx \ + /data/nginx \ + /data/custom_ssl \ + /data/logs \ + /data/access \ + /data/nginx/default_host \ + /data/nginx/default_www \ + /data/nginx/proxy_host \ + /data/nginx/redirection_host \ + /data/nginx/stream \ + /data/nginx/dead_host \ + /data/nginx/temp \ + /var/lib/nginx/cache/public \ + /var/lib/nginx/cache/private \ + /var/cache/nginx/proxy_temp + chmod -R 777 /var/cache/nginx + chown root /tmp/nginx + echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf + if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then + echo -e "${CHECKMARK} \e[1;92m Generating dummy SSL Certificate... \e[0m" + openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null + fi + mkdir -p /app/global /app/frontend/images + cp -r backend/* /app + cp -r global/* /app/global + msg_ok "Setup Enviroment" + + msg_info "Building Frontend" + cd ./frontend + export NODE_ENV=development + yarn install --network-timeout=30000 &>/dev/null + yarn build &>/dev/null + cp -r dist/* /app/frontend + cp -r app-images/* /app/frontend/images + msg_ok "Built Frontend" + + msg_info "Initializing Backend" + rm -rf /app/config/default.json &>/dev/null + if [ ! -f /app/config/production.json ]; then + cat <<'EOF' >/app/config/production.json { "database": { "engine": "knex-native", @@ -151,42 +151,30 @@ if [ ! -f /app/config/production.json ]; then } } EOF -fi -cd /app -export NODE_ENV=development -$STD yarn install --network-timeout=30000 -msg_ok "Initialized Backend" - -msg_info "Creating Service" -cat <<'EOF' >/lib/systemd/system/npm.service -[Unit] -Description=Nginx Proxy Manager -After=network.target -Wants=openresty.service - -[Service] -Type=simple -Environment=NODE_ENV=production -ExecStartPre=-mkdir -p /tmp/nginx/body /data/letsencrypt-acme-challenge -ExecStart=/usr/bin/node index.js --abort_on_uncaught_exception --max_old_space_size=250 -WorkingDirectory=/app -Restart=on-failure - -[Install] -WantedBy=multi-user.target -EOF -msg_ok "Created Service" - -motd_ssh -root + fi + cd /app + export NODE_ENV=development + yarn install --network-timeout=30000 &>/dev/null + msg_ok "Initialized Backend" + + msg_info "Starting Services" + systemctl enable npm &>/dev/null + systemctl start openresty + systemctl start npm + msg_ok "Started Services" + + msg_info "Cleaning up" + rm -rf ~/nginx-proxy-manager-* + msg_ok "Cleaned" + + msg_ok "Update Successfull" + exit +} -msg_info "Starting Services" -$STD systemctl enable --now openresty -$STD systemctl enable --now npm -msg_ok "Started Services" +start +build_container +description -msg_info "Cleaning up" -rm -rf ../nginx-proxy-manager-* -$STD apt-get autoremove -$STD apt-get autoclean -msg_ok "Cleaned" +msg_ok "Completed Successfully!\n" +echo -e "${APP} should be reachable by going to the following URL. + ${BL}http://${IP}:81${CL} \n" From 2ff5df2ea8e84ef636d23c824fcb8a977043d83f Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 1 Apr 2023 09:06:28 -0400 Subject: [PATCH 39/45] Update haos-vm.sh Code refactoring --- vm/haos-vm.sh | 199 +++++++++++++++++++++++++++++--------------------- 1 file changed, 116 insertions(+), 83 deletions(-) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 8f3c244b..4af0722f 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -48,16 +48,19 @@ function error_handler() { echo -e "\n$error_message\n" cleanup_vmid } + function cleanup_vmid() { if qm status $VMID &>/dev/null; then qm stop $VMID &>/dev/null qm destroy $VMID &>/dev/null fi } + function cleanup() { popd >/dev/null rm -rf $TEMP_DIR } + TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null if whiptail --title "HOME ASSISTANT OS VM" --yesno "This will create a New Home Assistant OS VM. Proceed?" 10 58; then @@ -70,15 +73,18 @@ function msg_info() { local msg="$1" echo -ne " ${HOLD} ${YW}${msg}..." } + function msg_ok() { local msg="$1" echo -e "${BFR} ${CM} ${GN}${msg}${CL}" } + function msg_error() { local msg="$1" echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}" } -function PVE_CHECK() { + +function pve_check() { if [ $(pveversion | grep -c "pve-manager/7\.[2-9]") -eq 0 ]; then echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported" echo -e "Requires PVE Version 7.2 or higher" @@ -87,7 +93,8 @@ function PVE_CHECK() { exit fi } -function ARCH_CHECK() { + +function arch_check() { if [ "$(dpkg --print-architecture)" != "amd64" ]; then echo -e "\n ${CROSS} This script will not work with PiMox! \n" echo -e "Exiting..." @@ -95,7 +102,8 @@ function ARCH_CHECK() { exit fi } -function SSH_CHECK() { + +function ssh_check() { if command -v pveversion >/dev/null 2>&1; then if [ -n "${SSH_CLIENT:+x}" ]; then if whiptail --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then @@ -107,6 +115,13 @@ function SSH_CHECK() { fi fi } + +exit-script() { + clear + echo -e "⚠ User exited script \n" + exit +} + function default_settings() { BRANCH="$stable" VMID="$NEXTID" @@ -136,133 +151,149 @@ function default_settings() { echo -e "${BL}Creating a HAOS VM using the above default settings${CL}" } function advanced_settings() { - BRANCH=$(whiptail --title "HAOS VERSION" --radiolist "Choose Version" --cancel-button Exit-Script 10 58 3 \ + if BRANCH=$(whiptail --title "HAOS VERSION" --radiolist "Choose Version" --cancel-button Exit-Script 10 58 3 \ "$stable" "Stable " ON \ "$beta" "Beta " OFF \ "$dev" "Dev " OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? - if [ $exitstatus = 0 ]; then echo -e "${DGN}Using HAOS Version: ${BGN}$BRANCH${CL}"; fi + 3>&1 1>&2 2>&3); then + echo -e "${DGN}Using HAOS Version: ${BGN}$BRANCH${CL}" + else + exit-script + fi while true; do - VMID=$(whiptail --inputbox "Set Virtual Machine ID" 8 58 $NEXTID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ -z "$VMID" ]; then - VMID="$NEXTID" - echo -e "${DGN}Virtual Machine ID: ${BGN}$VMID${CL}" - break - else - if pct status "$VMID" &>/dev/null || qm status "$VMID" &>/dev/null; then - echo -e "${CROSS}${RD} ID $VMID is already in use${CL}" - sleep 2 - continue + if VMID=$(whiptail --inputbox "Set Virtual Machine ID" 8 58 $NEXTID --title "VIRTUAL MACHINE ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + if [ -z "$VMID" ]; then + VMID="$NEXTID" + echo -e "${DGN}Virtual Machine ID: ${BGN}$VMID${CL}" + break + else + if pct status "$VMID" &>/dev/null || qm status "$VMID" &>/dev/null; then + echo -e "${CROSS}${RD} ID $VMID is already in use${CL}" + sleep 2 + continue + fi + echo -e "${DGN}Virtual Machine ID: ${BGN}$VMID${CL}" + break fi - echo -e "${DGN}Virtual Machine ID: ${BGN}$VMID${CL}" - break + else + exit-script fi done - MACH=$(whiptail --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \ + if MACH=$(whiptail --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \ "i440fx" "Machine i440fx" ON \ "q35" "Machine q35" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? - if [ $MACH = q35 ]; then - echo -e "${DGN}Using Machine Type: ${BGN}$MACH${CL}" - FORMAT="" - MACHINE=" -machine q35" + 3>&1 1>&2 2>&3); then + if [ $MACH = q35 ]; then + echo -e "${DGN}Using Machine Type: ${BGN}$MACH${CL}" + FORMAT="" + MACHINE=" -machine q35" + else + echo -e "${DGN}Using Machine Type: ${BGN}$MACH${CL}" + FORMAT=",efitype=4m" + MACHINE="" + fi else - echo -e "${DGN}Using Machine Type: ${BGN}$MACH${CL}" - FORMAT=",efitype=4m" - MACHINE="" + exit-script fi - DISK_CACHE1=$(whiptail --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \ + if DISK_CACHE1=$(whiptail --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \ "0" "Default" ON \ "1" "Write Through" OFF \ - 3>&1 1>&2 2>&3) - exitstatus=$? - if [ $DISK_CACHE1 = "1" ]; then - echo -e "${DGN}Using Disk Cache: ${BGN}Write Through${CL}" - DISK_CACHE="cache=writethrough," + 3>&1 1>&2 2>&3); then + if [ $DISK_CACHE1 = "1" ]; then + echo -e "${DGN}Using Disk Cache: ${BGN}Write Through${CL}" + DISK_CACHE="cache=writethrough," + else + echo -e "${DGN}Using Disk Cache: ${BGN}Default${CL}" + DISK_CACHE="" + fi else - echo -e "${DGN}Using Disk Cache: ${BGN}Default${CL}" - DISK_CACHE="" + exit-script fi - VM_NAME=$(whiptail --inputbox "Set Hostname" 8 58 haos${BRANCH} --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ -z $VM_NAME ]; then - HN="haos${BRANCH}" - echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}" - else - if [ $exitstatus = 0 ]; then + if VM_NAME=$(whiptail --inputbox "Set Hostname" 8 58 haos${BRANCH} --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + if [ -z $VM_NAME ]; then + HN="haos${BRANCH}" + echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}" + else HN=$(echo ${VM_NAME,,} | tr -d ' ') echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}" fi + else + exit-script fi - CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ -z $CORE_COUNT ]; then - CORE_COUNT="2" - echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}" + if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + if [ -z $CORE_COUNT ]; then + CORE_COUNT="2" + echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}" + else + echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}" + fi else - if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi + exit-script fi - RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 4096 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ -z $RAM_SIZE ]; then - RAM_SIZE="4096" - echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}" + if RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 4096 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + if [ -z $RAM_SIZE ]; then + RAM_SIZE="4096" + echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}" + else + echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}" + fi else - if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi + exit-script fi - BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ -z $BRG ]; then - BRG="vmbr0" - echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}" + if BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + if [ -z $BRG ]; then + BRG="vmbr0" + echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}" + else + echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}" + fi else - if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi + exit-script fi - MAC1=$(whiptail --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ -z $MAC1 ]; then - MAC="$GEN_MAC" - echo -e "${DGN}Using MAC Address: ${BGN}$MAC${CL}" - else - if [ $exitstatus = 0 ]; then + if MAC1=$(whiptail --inputbox "Set a MAC Address" 8 58 $GEN_MAC --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then + if [ -z $MAC1 ]; then + MAC="$GEN_MAC" + echo -e "${DGN}Using MAC Address: ${BGN}$MAC${CL}" + else MAC="$MAC1" echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}" fi + else + exit-script fi - VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ $exitstatus = 0 ]; then + if VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $VLAN1 ]; then - VLAN1="Default" VLAN="" + VLAN1="Default" + VLAN="" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" else VLAN=",tag=$VLAN1" echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}" fi + else + exit-script fi - MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3) - exitstatus=$? - if [ $exitstatus = 0 ]; then + if MTU1=$(whiptail --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $MTU1 ]; then - MTU1="Default" MTU="" + MTU1="Default" + MTU="" echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}" else MTU=",mtu=$MTU1" echo -e "${DGN}Using Interface MTU Size: ${BGN}$MTU1${CL}" fi + else + exit-script fi if (whiptail --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then @@ -281,7 +312,8 @@ function advanced_settings() { advanced_settings fi } -function START_SCRIPT() { + +function start_script() { if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then header_info echo -e "${BL}Using Default Settings${CL}" @@ -292,10 +324,11 @@ function START_SCRIPT() { advanced_settings fi } -ARCH_CHECK -PVE_CHECK -SSH_CHECK -START_SCRIPT + +arch_check +pve_check +ssh_check +start_script msg_info "Validating Storage" while read -r line; do TAG=$(echo $line | awk '{print $1}') From a2b5ce070d93e100accb9a51b4cd49eb844bb536 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 2 Apr 2023 08:48:09 -0400 Subject: [PATCH 40/45] Update haos-vm.sh tweak --- vm/haos-vm.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 4af0722f..64eea8ba 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -116,7 +116,7 @@ function ssh_check() { fi } -exit-script() { +function exit-script() { clear echo -e "⚠ User exited script \n" exit @@ -150,6 +150,7 @@ function default_settings() { echo -e "${DGN}Start VM when completed: ${BGN}yes${CL}" echo -e "${BL}Creating a HAOS VM using the above default settings${CL}" } + function advanced_settings() { if BRANCH=$(whiptail --title "HAOS VERSION" --radiolist "Choose Version" --cancel-button Exit-Script 10 58 3 \ "$stable" "Stable " ON \ @@ -329,6 +330,7 @@ arch_check pve_check ssh_check start_script + msg_info "Validating Storage" while read -r line; do TAG=$(echo $line | awk '{print $1}') From 49263e9874b602dccabb22cbc4adb43943411207 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 2 Apr 2023 11:26:00 -0400 Subject: [PATCH 41/45] Update haos-vm.sh Include a choice within the "Advanced" settings to configure the CPU model between kvm64 (default) or host. --- vm/haos-vm.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 64eea8ba..199dabaa 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -129,6 +129,7 @@ function default_settings() { MACHINE="" DISK_CACHE="" HN="haos$stable" + CPU_TYPE="" CORE_COUNT="2" RAM_SIZE="4096" BRG="vmbr0" @@ -141,6 +142,7 @@ function default_settings() { echo -e "${DGN}Using Machine Type: ${BGN}i440fx${CL}" echo -e "${DGN}Using Disk Cache: ${BGN}Default${CL}" echo -e "${DGN}Using Hostname: ${BGN}${HN}${CL}" + echo -e "${DGN}Using CPU Model: ${BGN}Default${CL}" echo -e "${DGN}Allocated Cores: ${BGN}${CORE_COUNT}${CL}" echo -e "${DGN}Allocated RAM: ${BGN}${RAM_SIZE}${CL}" echo -e "${DGN}Using Bridge: ${BGN}${BRG}${CL}" @@ -226,6 +228,21 @@ function advanced_settings() { exit-script fi + if CPU_TYPE1=$(whiptail --title "CPU MODEL" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \ + "0" "KVM64 (Default)" ON \ + "1" "Host" OFF \ + 3>&1 1>&2 2>&3); then + if [ $CPU_TYPE1 = "1" ]; then + echo -e "${DGN}Using CPU Model: ${BGN}Host${CL}" + CPU_TYPE=" -cpu host" + else + echo -e "${DGN}Using CPU Model: ${BGN}Default${CL}" + CPU_TYPE="" + fi + else + exit-script + fi + if CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 2 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then if [ -z $CORE_COUNT ]; then CORE_COUNT="2" @@ -396,7 +413,7 @@ for i in {0,1}; do done msg_ok "Extracted KVM Disk Image" msg_info "Creating HAOS VM" -qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf -cores $CORE_COUNT -memory $RAM_SIZE \ +qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \ -name $HN -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null qm importdisk $VMID ${FILE%.*} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null From b1451e795e1f0675fcd6c0d12cc216939edab9e0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 2 Apr 2023 11:28:39 -0400 Subject: [PATCH 42/45] Update CHANGELOG.MD --- CHANGELOG.MD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index b577dfc1..352231e8 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,12 +2,19 @@ # Change Log All notable changes to this project will be documented in this file. +## 2023-04-02 + +### Changed + +- **Home Assistant OS VM** + - Include a choice within the "Advanced" settings to configure the CPU model between kvm64 (default) or host. + ## 2023-03-31 ### Changed - **Home Assistant OS VM** - - Include a choice within the "Advanced" settings to configure the disk cache. + - Include a choice within the "Advanced" settings to configure the disk cache between none (default) or Write Through. ## 2023-03-27 From 3e7f070ea836bf9436757f964269bb43b8a06a25 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 5 Apr 2023 06:41:33 -0400 Subject: [PATCH 43/45] Update jellyfin-install.sh Use the Deb822 format jellyfin.sources --- install/jellyfin-install.sh | 47 +++++++++++++++---------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/install/jellyfin-install.sh b/install/jellyfin-install.sh index e0ac97b4..98d427b0 100644 --- a/install/jellyfin-install.sh +++ b/install/jellyfin-install.sh @@ -16,9 +16,8 @@ update_os msg_info "Installing Dependencies" $STD apt-get install -y curl $STD apt-get install -y sudo +$STD apt-get install -y gnupg $STD apt-get install -y mc -$STD apt-get install -y apt-transport-https -$STD apt-get install -y software-properties-common msg_ok "Installed Dependencies" if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then @@ -37,36 +36,28 @@ if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then msg_ok "Set Up Hardware Acceleration" fi -msg_info "Setting Up Jellyfin Repository" -$STD add-apt-repository universe -y -$STD apt-key add <(curl -fsSL https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key) -sh -c 'echo "deb [arch=$(dpkg --print-architecture)] https://repo.jellyfin.org/ubuntu $(lsb_release -c -s) main" > /etc/apt/sources.list.d/jellyfin.list' -msg_ok "Set Up Jellyfin Repository" - msg_info "Installing Jellyfin" +VERSION="$( awk -F'=' '/^UBUNTU_CODENAME=/{ print $NF }' /etc/os-release )" +# If the keyring directory is absent, create it +if [[ ! -d /etc/apt/keyrings ]]; then + mkdir -p /etc/apt/keyrings +fi +# Download the repository signing key and install it to the keyring directory +curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | gpg --dearmor --yes --output /etc/apt/keyrings/jellyfin.gpg +# Install the Deb822 format jellyfin.sources entry +cat </etc/apt/sources.list.d/jellyfin.sources +Types: deb +URIs: https://repo.jellyfin.org/${PCT_OSTYPE} +Suites: ${VERSION} +Components: main +Architectures: amd64 +Signed-By: /etc/apt/keyrings/jellyfin.gpg +EOF +# Install Jellyfin using the metapackage (which will fetch jellyfin-server, jellyfin-web, and jellyfin-ffmpeg5) $STD apt-get update -$STD apt install jellyfin-server -y -$STD apt install jellyfin-ffmpeg5 -y +$STD apt-get install -y jellyfin msg_ok "Installed Jellyfin" -msg_info "Creating Service" -cat <<'EOF' >/lib/systemd/system/jellyfin.service -[Unit] -Description = Jellyfin Media Server -After = network.target -[Service] -Type = simple -EnvironmentFile = /etc/default/jellyfin -User = root -ExecStart = /usr/bin/jellyfin -Restart = on-failure -TimeoutSec = 15 -[Install] -WantedBy = multi-user.target -EOF -ln -s /usr/share/jellyfin/web/ /usr/lib/jellyfin/bin/jellyfin-web -msg_ok "Created Service" - motd_ssh root From cd275ac57adb7f5a33a6e257495f3c67d790afb3 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 5 Apr 2023 06:42:37 -0400 Subject: [PATCH 44/45] Update jellyfin.sh Set v22.04 as default --- ct/jellyfin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh index d11b8212..88eb4d8d 100644 --- a/ct/jellyfin.sh +++ b/ct/jellyfin.sh @@ -24,7 +24,7 @@ var_disk="8" var_cpu="2" var_ram="2048" var_os="ubuntu" -var_version="20.04" +var_version="22.04" variables color catch_errors From 6d644b35d73c7874dcf8202d3ef8a0af57f04e7c Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 5 Apr 2023 06:44:12 -0400 Subject: [PATCH 45/45] Update CHANGELOG.MD --- CHANGELOG.MD | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 352231e8..7c6899db 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,6 +2,14 @@ # Change Log All notable changes to this project will be documented in this file. +## 2023-04-05 + +### Changed + +- **Jellyfin LXC** + - Set Ubuntu 22.04 as default + - Use the Deb822 format jellyfin.sources configuration (jellyfin.list configuration has been obsoleted) + ## 2023-04-02 ### Changed