Compare commits

..

6 Commits

Author SHA1 Message Date
github-actions[bot]
f95dffabfe Update CHANGELOG.md 2024-11-28 04:52:43 +00:00
TJ Computer Services
1558b0d875
Remove changing DISK_REF for zfspool mikrotik-routeros.sh (#529)
* Remove changing DISK_REF for zfspool mikrotik-routeros.sh

When running the original script using zfspool as storage I  got the error:

"unable to parse zfs volume name..."

Removing the part that cchnages the DISK_REF is disk is to be located on a zfspool has solved this.

* Fix in live repo

---------

Co-authored-by: CanbiZ <47820557+MickLesk@users.noreply.github.com>
2024-11-28 05:52:30 +01:00
CanbiZ
1cb822b34c
Fix Z-Wave JS UI script (#546)
* Revert & Updated ZWave JS UI

* Tweak for StorageDB
2024-11-28 05:48:58 +01:00
community-scripts-pr-app[bot]
24cfb32c3d
Update CHANGELOG.md (#559)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-11-28 05:48:18 +01:00
CanbiZ
2599bff463
Show Changelog on Mobile Devices (#558) 2024-11-28 05:46:32 +01:00
community-scripts-pr-app[bot]
e40de17874
Update CHANGELOG.md (#552)
Some checks are pending
Create Changelog Pull Request / update-changelog-pull-request (push) Waiting to run
Deploy Next.js site to Pages / build (push) Waiting to run
Deploy Next.js site to Pages / deploy (push) Blocked by required conditions
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-11-27 20:40:24 +01:00
6 changed files with 67 additions and 50 deletions

View File

@ -16,6 +16,19 @@ All LXC instances created using this repository come pre-installed with Midnight
> [!IMPORTANT] > [!IMPORTANT]
Do not break established syntax in this file, as it is automatically updated by a Github Workflow Do not break established syntax in this file, as it is automatically updated by a Github Workflow
## 2024-11-28
### Changed
### 🚀 Updated Scripts
- Remove changing DISK_REF for zfspool mikrotik-routeros.sh [@tjcomserv](https://github.com/tjcomserv) ([#529](https://github.com/community-scripts/ProxmoxVE/pull/529))
- Fix Z-Wave JS UI script [@MickLesk](https://github.com/MickLesk) ([#546](https://github.com/community-scripts/ProxmoxVE/pull/546))
### 🌐 Website
- Show Changelog on Mobile Devices [@MickLesk](https://github.com/MickLesk) ([#558](https://github.com/community-scripts/ProxmoxVE/pull/558))
## 2024-11-27 ## 2024-11-27
### Changed ### Changed

View File

@ -53,44 +53,33 @@ function default_settings() {
} }
function update_script() { function update_script() {
header_info header_info
check_container_storage check_container_storage
check_container_resources check_container_resources
if [[ ! -d /opt/zwave-js-ui ]]; then if [[ ! -d /opt/zwave-js-ui ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
msg_error "No ${APP} Installation Found!" RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
exit if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
fi msg_info "Stopping Service"
RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') systemctl stop zwave-js-ui
msg_info "Stopping Z-wave JS UI" msg_ok "Stopped Service"
systemctl stop zwave-js-ui.service
msg_ok "Stopped Z-wave JS UI"
msg_info "Updating Z-wave JS UI" msg_info "Updating Z-Wave JS UI"
wget https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip &>/dev/null rm -rf /opt/zwave-js-ui/*
unzip zwave-js-ui-${RELEASE}-linux.zip &>/dev/null cd /opt/zwave-js-ui
\cp -R zwave-js-ui-linux /opt/zwave-js-ui wget -q https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip
service_path="/etc/systemd/system/zwave-js-ui.service" unzip -q zwave-js-ui-${RELEASE}-linux.zip
echo "[Unit] msg_ok "Updated Z-Wave JS UI"
Description=zwave-js-ui
Wants=network-online.target
After=network-online.target
[Service]
User=root
WorkingDirectory=/opt/zwave-js-ui
ExecStart=/opt/zwave-js-ui/zwave-js-ui-linux
[Install]
WantedBy=multi-user.target" >$service_path
msg_ok "Updated Z-wave JS UI"
msg_info "Starting Z-wave JS UI" msg_info "Starting Service"
systemctl enable --now zwave-js-ui.service systemctl start zwave-js-ui
msg_ok "Started Z-wave JS UI" msg_ok "Started Service"
msg_info "Cleanup" msg_info "Cleanup"
rm -rf zwave-js-ui-${RELEASE}-linux.zip zwave-js-ui-linux store rm -rf /opt/zwave-js-ui/zwave-js-ui-${RELEASE}-linux.zip
msg_ok "Cleaned" rm -rf /opt/zwave-js-ui/store
msg_ok "Updated Successfully!\n" msg_ok "Cleaned"
exit msg_ok "Updated Successfully!\n"
exit
} }
start start

View File

@ -20,7 +20,7 @@ export const navbarLinks = [
{ {
href: `https://github.com/community-scripts/${basePath}/blob/main/CHANGELOG.md`, href: `https://github.com/community-scripts/${basePath}/blob/main/CHANGELOG.md`,
event: "Change Log", event: "Change Log",
icon: <Scroll className="h-4 w-4 hidden sm:block" />, icon: <Scroll className="h-4 w-4" />,
text: "Change Log", text: "Change Log",
}, },
{ {

View File

@ -14,33 +14,43 @@ network_check
update_os update_os
msg_info "Installing Dependencies" msg_info "Installing Dependencies"
$STD apt-get install -y curl $STD apt-get install -y \
$STD apt-get install -y sudo curl \
$STD apt-get install -y mc sudo \
mc
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
msg_info "Installing Z-Wave JS UI" msg_info "Installing Z-Wave JS UI"
mkdir /opt/zwave-js-ui mkdir -p /opt/zwave-js-ui
mkdir -p /opt/zwave_store
cd /opt/zwave-js-ui cd /opt/zwave-js-ui
RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') RELEASE=$(curl -s https://api.github.com/repos/zwave-js/zwave-js-ui/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
$STD wget https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip wget -q https://github.com/zwave-js/zwave-js-ui/releases/download/${RELEASE}/zwave-js-ui-${RELEASE}-linux.zip
$STD unzip zwave-js-ui-${RELEASE}-linux.zip unzip -q zwave-js-ui-${RELEASE}-linux.zip
cat <<EOF >/opt/.env
ZWAVEJS_EXTERNAL_CONFIG=/opt/zwave_store/.config-db
STORE_DIR=/opt/zwave_store
EOF
echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
msg_ok "Installed Z-Wave JS UI" msg_ok "Installed Z-Wave JS UI"
msg_info "Creating Service" msg_info "Creating Service"
service_path="/etc/systemd/system/zwave-js-ui.service" cat <<EOF > /etc/systemd/system/zwave-js-ui.service
echo "[Unit] [Unit]
Description=zwave-js-ui Description=zwave-js-ui
Wants=network-online.target Wants=network-online.target
After=network-online.target After=network-online.target
[Service] [Service]
User=root User=root
WorkingDirectory=/opt/zwave-js-ui WorkingDirectory=/opt/zwave-js-ui
ExecStart=/opt/zwave-js-ui/zwave-js-ui-linux ExecStart=/opt/zwave-js-ui/zwave-js-ui-linux
EnvironmentFile=/opt/.env
[Install] [Install]
WantedBy=multi-user.target" >$service_path WantedBy=multi-user.target
systemctl start zwave-js-ui EOF
$STD systemctl enable zwave-js-ui systemctl enable -q --now zwave-js-ui
msg_ok "Created Service" msg_ok "Created Service"
motd_ssh motd_ssh

View File

@ -9,7 +9,7 @@
"updateable": true, "updateable": true,
"privileged": true, "privileged": true,
"interface_port": "8091", "interface_port": "8091",
"documentation": null, "documentation": "https://zwave-js.github.io/zwave-js-ui/#/",
"website": "https://github.com/zwave-js/zwave-js-ui#", "website": "https://github.com/zwave-js/zwave-js-ui#",
"logo": "https://raw.githubusercontent.com/loganmarchione/homelab-svg-assets/main/assets/zwave.svg", "logo": "https://raw.githubusercontent.com/loganmarchione/homelab-svg-assets/main/assets/zwave.svg",
"description": "Z-Wave JS UI is an open-source software that serves as a gateway between Z-Wave devices and MQTT (Message Queuing Telemetry Transport) protocol, allowing users to control and monitor their Z-Wave devices via a user interface. The software provides a configurable platform to manage Z-Wave networks and integrate with other smart home systems through MQTT.", "description": "Z-Wave JS UI is an open-source software that serves as a gateway between Z-Wave devices and MQTT (Message Queuing Telemetry Transport) protocol, allowing users to control and monitor their Z-Wave devices via a user interface. The software provides a configurable platform to manage Z-Wave networks and integrate with other smart home systems through MQTT.",

View File

@ -251,11 +251,16 @@ nfs | dir)
DISK_REF="$VMID/" DISK_REF="$VMID/"
DISK_IMPORT="-format qcow2" DISK_IMPORT="-format qcow2"
;; ;;
btrfs | zfspool) btrfs)
DISK_EXT="" DISK_EXT=".raw"
DISK_REF="$VMID/" DISK_REF="$VMID/"
DISK_IMPORT="-format raw" DISK_IMPORT="-format raw"
;; ;;
zfspool)
DISK_EXT=""
DISK_REF=""
DISK_IMPORT="-format raw"
;;
esac esac
DISK_VAR="vm-${VMID}-disk-0${DISK_EXT:-}" DISK_VAR="vm-${VMID}-disk-0${DISK_EXT:-}"