From 9bbe81fe4279fd83a64597271e1c0769257e6225 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 21:05:15 -0400 Subject: [PATCH 01/10] Update dashy-install.sh update node.js to 20.x --- install/dashy-install.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index d2bbc8331..aa85ef4b2 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -19,13 +19,15 @@ $STD apt-get install -y sudo $STD apt-get install -y mc msg_ok "Installed Dependencies" -msg_info "Installing Node.js (Patience)" -$STD apt-get install -y npm -$STD npm cache clean -f -$STD npm install -g n -$STD n 16.20.1 -$STD npm install -g pnpm -ln -sf /usr/local/bin/node /usr/bin/node +msg_info "Setting up Node.js Repository" +mkdir -p /etc/apt/keyrings +curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list +msg_ok "Set up Node.js Repository" + +msg_info "Installing Node.js" +$STD apt-get update +$STD apt-get install -y nodejs msg_ok "Installed Node.js" msg_info "Installing Yarn" From 22c03c89d310f2dc3417c91e9fd47da85a6b9af5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 21:09:11 -0400 Subject: [PATCH 02/10] Update dashy-install.sh add gpg --- install/dashy-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index aa85ef4b2..992161ff7 100644 --- a/install/dashy-install.sh +++ b/install/dashy-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 gpg msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" From faf133ffed2a8d2c7b98e186e0b3f6b7f1fda2aa Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 21:27:36 -0400 Subject: [PATCH 03/10] Update dashy-install.sh tweak --- install/dashy-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index 992161ff7..4ae6bf5d4 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -33,7 +33,6 @@ msg_ok "Installed Node.js" msg_info "Installing Yarn" $STD npm install -g yarn -ln -sf /usr/local/bin/yarn /usr/bin/yarn msg_ok "Installed Yarn" RELEASE=$(curl -s https://api.github.com/repos/Lissy93/dashy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') From 44fc9b43cc756cc908a0c289e77b682bfa73f23c Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 21:40:23 -0400 Subject: [PATCH 04/10] Update dashy-install.sh tweak --- install/dashy-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index 4ae6bf5d4..4436e6aa0 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -40,7 +40,7 @@ msg_info "Installing Dashy ${RELEASE} (Patience)" mkdir -p /opt/dashy wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1 cd /opt/dashy -sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json +#sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json $STD yarn $STD yarn build echo "${RELEASE}" >/opt/${APPLICATION}_version.txt From 3dd1da2cf14f9829d31916b31810a8941c675f69 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 22:04:10 -0400 Subject: [PATCH 05/10] Update dashy-install.sh test --- install/dashy-install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index 4436e6aa0..4db71a277 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -41,8 +41,10 @@ mkdir -p /opt/dashy wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1 cd /opt/dashy #sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json -$STD yarn -$STD yarn build +#$STD yarn +#$STD yarn build +$STD npm install +$STD npm run build echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Installed Dashy ${RELEASE}" From 2e268c2f49e7d40399973db07b692c2ef72392c7 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 22:12:34 -0400 Subject: [PATCH 06/10] Update dashy-install.sh fix install --- install/dashy-install.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index 4db71a277..d7c31367b 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -31,18 +31,11 @@ $STD apt-get update $STD apt-get install -y nodejs msg_ok "Installed Node.js" -msg_info "Installing Yarn" -$STD npm install -g yarn -msg_ok "Installed Yarn" - RELEASE=$(curl -s https://api.github.com/repos/Lissy93/dashy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') msg_info "Installing Dashy ${RELEASE} (Patience)" mkdir -p /opt/dashy wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1 cd /opt/dashy -#sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json -#$STD yarn -#$STD yarn build $STD npm install $STD npm run build echo "${RELEASE}" >/opt/${APPLICATION}_version.txt From 0812983a6460b5372c793e1205c5748edcc1b896 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 22:22:30 -0400 Subject: [PATCH 07/10] Update dashy-install.sh fix service --- install/dashy-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index d7c31367b..a81749aef 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -49,7 +49,7 @@ Description=dashy [Service] Type=simple WorkingDirectory=/opt/dashy -ExecStart=/usr/bin/yarn start +ExecStart=/usr/bin/npm start [Install] WantedBy=multi-user.target EOF From 37f42468ba295b42f4cd636fb31d8eacbd2703ab Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 30 May 2024 22:29:14 -0400 Subject: [PATCH 08/10] Update dashy.sh fix update Breaking Change --- ct/dashy.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ct/dashy.sh b/ct/dashy.sh index 314802db9..60ea57db0 100644 --- a/ct/dashy.sh +++ b/ct/dashy.sh @@ -75,10 +75,9 @@ if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP} rm -rf /opt/dashy mkdir -p /opt/dashy wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1 - sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json cd /opt/dashy - yarn &>/dev/null - yarn build &>/dev/null + npm install &>/dev/null + npm run build &>/dev/null echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}" From fc9dff220b4ea426d3a75178ad8accacae4683ca Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 May 2024 16:00:33 -0400 Subject: [PATCH 09/10] Update build.func Mask passwords Closes https://github.com/tteck/Proxmox/issues/3103 --- misc/build.func | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/misc/build.func b/misc/build.func index cd87d2c7f..7a5bffd59 100644 --- a/misc/build.func +++ b/misc/build.func @@ -232,16 +232,24 @@ advanced_settings() { done while true; do - if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then + if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD (leave blank for automatic login)" 3>&1 1>&2 2>&3); then if [[ ! -z "$PW1" ]]; then if [[ "$PW1" == *" "* ]]; then whiptail --msgbox "Password cannot contain spaces. Please try again." 8 58 elif [ ${#PW1} -lt 5 ]; then whiptail --msgbox "Password must be at least 5 characters long. Please try again." 8 58 else - PW="-password $PW1" - echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}" - break + if PW2=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "\nVerify Root Password" 9 58 --title "PASSWORD VERIFICATION" 3>&1 1>&2 2>&3); then + if [[ "$PW1" == "$PW2" ]]; then + PW="-password $PW1" + echo -e "${DGN}Using Root Password: ${BGN}********${CL}" + break + else + whiptail --msgbox "Passwords do not match. Please try again." 8 58 + fi + else + exit-script + fi fi else PW1="Automatic Login" From 5e515c1e23156617e16219668d5dea8e839542ce Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 31 May 2024 16:48:07 -0400 Subject: [PATCH 10/10] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2b6e0655..7fa13f54e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent Proxmox VE - Support Lifecycle** +## 2024-05-31 + +### Changed + +- **Advanced Settings** + - Passwords are now masked + ## 2024-05-30 ### Changed