diff --git a/CHANGELOG.MD b/CHANGELOG.MD index cfafe62d..6bf0a220 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file. - **Alpine-AdGuard Home LXC** (Thanks @nicedevil007) - NEW Script +- **Alpine-Docker LXC** + - NEW Script +- **Alpine-Zigbee2MQTT LXC** + - NEW Script ## 2023-03-15 diff --git a/ct/alpine-adguard-v5.sh b/ct/alpine-adguard-v5.sh index a618d254..ce03722e 100644 --- a/ct/alpine-adguard-v5.sh +++ b/ct/alpine-adguard-v5.sh @@ -27,7 +27,6 @@ var_os="alpine" var_version="3.17" NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-v5-install" -timezone=$(cat /etc/timezone) INTEGER='^[0-9]+([.][0-9]+)?$' YW=$(echo "\033[33m") BL=$(echo "\033[36m") @@ -435,12 +434,12 @@ if command -v pveversion >/dev/null 2>&1; then install_script fi -if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /opt/AdGuardHome ]]; then - msg_error "No ${APP} Installation Found!" -fi - if ! command -v pveversion >/dev/null 2>&1; then - update_script + if [[ ! -d /opt/AdGuardHome ]]; then + msg_error "No ${APP} Installation Found!" + else + update_script + fi fi if [ "$VERB" == "yes" ]; then set -x; fi diff --git a/ct/alpine-docker-v5.sh b/ct/alpine-docker-v5.sh index 638b1855..5d92c547 100644 --- a/ct/alpine-docker-v5.sh +++ b/ct/alpine-docker-v5.sh @@ -27,7 +27,6 @@ var_os="alpine" var_version="3.17" NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-v5-install" -timezone=$(cat /etc/timezone) INTEGER='^[0-9]+([.][0-9]+)?$' YW=$(echo "\033[33m") BL=$(echo "\033[36m") @@ -352,6 +351,7 @@ header_info } function update_script() { + header_info normal=$(echo "\033[m") menu=$(echo "\033[36m") number=$(echo "\033[33m") @@ -396,12 +396,12 @@ if command -v pveversion >/dev/null 2>&1; then install_script fi -if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/zigbee2mqtt/configuration.yaml ]]; then - msg_error "No ${APP} Installation Found!" -fi - -if ! command -v pveversion >/dev/null 2>&1 && [[ -f /etc/zigbee2mqtt/configuration.yaml ]]; then - update_script +if ! command -v pveversion >/dev/null 2>&1; then + if [[ ! -d /etc/docker ]]; then + msg_error "No ${APP} Installation Found!" + else + update_script + fi fi if [ "$VERB" == "yes" ]; then set -x; fi diff --git a/ct/alpine-grafana-v5.sh b/ct/alpine-grafana-v5.sh index 72f76fa1..6766e031 100644 --- a/ct/alpine-grafana-v5.sh +++ b/ct/alpine-grafana-v5.sh @@ -27,7 +27,6 @@ var_os="alpine" var_version="3.17" NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-v5-install" -timezone=$(cat /etc/timezone) INTEGER='^[0-9]+([.][0-9]+)?$' YW=$(echo "\033[33m") BL=$(echo "\033[36m") @@ -352,12 +351,73 @@ header_info } function update_script() { -header_info -msg_info "Updating ${APP} LXC" -apk update &>/dev/null -apk upgrade &>/dev/null -msg_ok "Updated ${APP} LXC" -msg_ok "Update Successfull" + header_info + normal=$(echo "\033[m") + menu=$(echo "\033[36m") + number=$(echo "\033[33m") + fgred=$(echo "\033[31m") + LXCIP=$(ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1) + printf "\n${menu}*********************************************${normal}\n" + printf "${menu}**${number} 1)${normal} Update LXC OS + Grafana \n" + printf "${menu}**${number} 2)${normal} Allow 0.0.0.0 for listening \n" + printf "${menu}**${number} 3)${normal} Allow only ${LXCIP} for listening \n" + printf "${menu}*********************************************${normal}\n" + printf "Please choose an option from the menu, or ${fgred}x${normal} to exit." + read opt + +while [ "$opt" != "" ]; do + case $opt in + 1) + clear + echo -e "${fgred}Update LXC OS${normal}" + msg_info "Updating LXC OS + Grafana" + apk update &>/dev/null + apk upgrade &>/dev/null + msg_ok "Update Successfull" + + break + ;; + 2) + clear + echo -e "${fgred}Updating Grafana Config with IP: ${LXCIP}${normal}" + msg_info "Stopping Grafana" + service grafana stop &>/dev/null + sed -i -e "s/cfg:server.http_addr=.*/cfg:server.http_addr=0.0.0.0/g" /etc/conf.d/grafana + msg_ok "Restarted Grafana" + service grafana start &>/dev/null + + break + ;; + 3) + clear + echo -e "${fgred}Updating Grafana Config with host IP: ${LXCIP}${normal}" + msg_info "Stopping Grafana" + service grafana stop &>/dev/null + sed -i -e "s/cfg:server.http_addr=.*/cfg:server.http_addr=$LXCIP/g" /etc/conf.d/grafana + msg_ok "Restarted Grafana" + service grafana start &>/dev/null + + break + ;; + x) + clear + echo -e "⚠ User exited script \n" + exit + ;; + \n) + clear + echo -e "⚠ User exited script \n" + exit + ;; + *) + clear + echo -e "Please choose an option from the menu" + update_script + ;; + esac +done + + exit } @@ -371,12 +431,11 @@ if command -v pveversion >/dev/null 2>&1; then fi if ! command -v pveversion >/dev/null 2>&1; then - if ! (whiptail --title "${APP} LXC UPDATE" --yesno "This will update ${APP} LXC. Proceed?" 10 58); then - clear - echo -e "⚠ User exited script \n" - exit + if [[ ! -f /etc/conf.d/grafana ]]; then + msg_error "No ${APP} Installation Found!" + else + update_script fi - update_script fi if [ "$VERB" == "yes" ]; then set -x; fi diff --git a/ct/alpine-vaultwarden-v5.sh b/ct/alpine-vaultwarden-v5.sh index 7d62d2e9..f9aa6c81 100644 --- a/ct/alpine-vaultwarden-v5.sh +++ b/ct/alpine-vaultwarden-v5.sh @@ -27,7 +27,6 @@ var_os="alpine" var_version="3.17" NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-v5-install" -timezone=$(cat /etc/timezone) INTEGER='^[0-9]+([.][0-9]+)?$' YW=$(echo "\033[33m") BL=$(echo "\033[36m") @@ -352,6 +351,7 @@ header_info } function update_script() { + header_info normal=$(echo "\033[m") menu=$(echo "\033[36m") number=$(echo "\033[33m") @@ -404,12 +404,12 @@ if command -v pveversion >/dev/null 2>&1; then install_script fi -if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/conf.d/vaultwarden ]]; then - msg_error "No ${APP} Installation Found!" -fi - -if ! command -v pveversion >/dev/null 2>&1 && [[ -f /etc/conf.d/vaultwarden ]]; then - update_script +if ! command -v pveversion >/dev/null 2>&1; then + if [[ ! -f /etc/conf.d/vaultwarden ]]; then + msg_error "No ${APP} Installation Found!" + else + update_script + fi fi if [ "$VERB" == "yes" ]; then set -x; fi diff --git a/ct/alpine-zigbee2mqtt-v5.sh b/ct/alpine-zigbee2mqtt-v5.sh index aef1bdfb..329c3fe7 100644 --- a/ct/alpine-zigbee2mqtt-v5.sh +++ b/ct/alpine-zigbee2mqtt-v5.sh @@ -27,7 +27,6 @@ var_os="alpine" var_version="3.17" NSAPP=$(echo ${APP,,} | tr -d ' ') var_install="${NSAPP}-v5-install" -timezone=$(cat /etc/timezone) INTEGER='^[0-9]+([.][0-9]+)?$' YW=$(echo "\033[33m") BL=$(echo "\033[36m") @@ -352,6 +351,7 @@ header_info } function update_script() { + header_info normal=$(echo "\033[m") menu=$(echo "\033[36m") number=$(echo "\033[33m") @@ -396,12 +396,12 @@ if command -v pveversion >/dev/null 2>&1; then install_script fi -if ! command -v pveversion >/dev/null 2>&1 && [[ ! -f /etc/zigbee2mqtt/configuration.yaml ]]; then - msg_error "No ${APP} Installation Found!" -fi - -if ! command -v pveversion >/dev/null 2>&1 && [[ -f /etc/zigbee2mqtt/configuration.yaml ]]; then - update_script +if ! command -v pveversion >/dev/null 2>&1; then + if [[ ! -f /etc/zigbee2mqtt/configuration.yaml ]]; then + msg_error "No ${APP} Installation Found!" + else + update_script + fi fi if [ "$VERB" == "yes" ]; then set -x; fi diff --git a/install/alpine-docker-v5-install.sh b/install/alpine-docker-v5-install.sh index 9d036f0c..8a36fa0e 100644 --- a/install/alpine-docker-v5-install.sh +++ b/install/alpine-docker-v5-install.sh @@ -67,8 +67,8 @@ if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | c exit 1 fi cat </etc/apk/repositories -https://dl-cdn.alpinelinux.org/alpine/edge/main -https://dl-cdn.alpinelinux.org/alpine/edge/community +https://dl-cdn.alpinelinux.org/alpine/latest-stable/main +https://dl-cdn.alpinelinux.org/alpine/latest-stable/community https://dl-cdn.alpinelinux.org/alpine/edge/testing EOF msg_ok "Set up Container OS" diff --git a/install/alpine-zigbee2mqtt-v5-install.sh b/install/alpine-zigbee2mqtt-v5-install.sh index 3616d418..26c35768 100644 --- a/install/alpine-zigbee2mqtt-v5-install.sh +++ b/install/alpine-zigbee2mqtt-v5-install.sh @@ -67,8 +67,8 @@ if [ "$(ip addr show | grep 'inet ' | grep -v '127.0.0.1' | awk '{print $2}' | c exit 1 fi cat </etc/apk/repositories -https://dl-cdn.alpinelinux.org/alpine/edge/main -https://dl-cdn.alpinelinux.org/alpine/edge/community +https://dl-cdn.alpinelinux.org/alpine/latest-stable/main +https://dl-cdn.alpinelinux.org/alpine/latest-stable/community https://dl-cdn.alpinelinux.org/alpine/edge/testing EOF msg_ok "Set up Container OS"