From 9a62e3ceeaae4b0ddbee4e490df78e06c3eeb180 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 2 Sep 2023 08:27:13 -0400 Subject: [PATCH 1/4] Update wikijs.sh default Debian 12 --- ct/wikijs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ct/wikijs.sh b/ct/wikijs.sh index a8f58ce8..341c251d 100644 --- a/ct/wikijs.sh +++ b/ct/wikijs.sh @@ -20,11 +20,11 @@ EOF header_info echo -e "Loading..." APP="Wikijs" -var_disk="2" +var_disk="3" var_cpu="1" var_ram="512" var_os="debian" -var_version="11" +var_version="12" variables color catch_errors From faf3bb8dd74b63fd7253d5ee5a8a18a6c29bcb31 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 2 Sep 2023 08:28:55 -0400 Subject: [PATCH 2/4] Update wikijs-install.sh node v18 fixes https://github.com/tteck/Proxmox/issues/1752 --- install/wikijs-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/wikijs-install.sh b/install/wikijs-install.sh index 71171f54..7ad7e3f3 100644 --- a/install/wikijs-install.sh +++ b/install/wikijs-install.sh @@ -24,7 +24,7 @@ msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" 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_16.x nodistro main" >/etc/apt/sources.list.d/nodesource.list +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" From 145123220d450221e64c0e51344b0718853d4153 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 2 Sep 2023 08:36:54 -0400 Subject: [PATCH 3/4] create /etc/apt/keyrings for Debian 11 --- ct/cronicle.sh | 3 ++- install/changedetection-install.sh | 1 + install/homarr-install.sh | 1 + install/homepage-install.sh | 1 + install/jellyseerr-install.sh | 1 + install/n8n-install.sh | 1 + install/node-red-install.sh | 1 + install/overseerr-install.sh | 1 + install/photoprism-install.sh | 1 + install/scrypted-install.sh | 1 + install/shinobi-install.sh | 1 + install/uptimekuma-install.sh | 1 + install/wikijs-install.sh | 1 + install/zigbee2mqtt-install.sh | 1 + 14 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ct/cronicle.sh b/ct/cronicle.sh index 65ee9e8f..5421eef4 100644 --- a/ct/cronicle.sh +++ b/ct/cronicle.sh @@ -78,8 +78,9 @@ apt-get install -y gnupg &>/dev/null msg_ok "Installed Dependencies" 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_16.x nodistro main" >/etc/apt/sources.list.d/nodesource.list +echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" msg_info "Installing Node.js" diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index 1ff0af91..7ad0e307 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -54,6 +54,7 @@ $STD apt-get install -y \ msg_ok "Updated Python3" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/homarr-install.sh b/install/homarr-install.sh index 16348ea6..8ef64f09 100644 --- a/install/homarr-install.sh +++ b/install/homarr-install.sh @@ -23,6 +23,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/homepage-install.sh b/install/homepage-install.sh index 264aa2ce..52dbd17e 100644 --- a/install/homepage-install.sh +++ b/install/homepage-install.sh @@ -26,6 +26,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/jellyseerr-install.sh b/install/jellyseerr-install.sh index e310dda6..45e29472 100644 --- a/install/jellyseerr-install.sh +++ b/install/jellyseerr-install.sh @@ -23,6 +23,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/n8n-install.sh b/install/n8n-install.sh index 2ee84d21..6a250703 100644 --- a/install/n8n-install.sh +++ b/install/n8n-install.sh @@ -22,6 +22,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/node-red-install.sh b/install/node-red-install.sh index d5985427..5b673133 100644 --- a/install/node-red-install.sh +++ b/install/node-red-install.sh @@ -23,6 +23,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/overseerr-install.sh b/install/overseerr-install.sh index f3d47f23..86a4defa 100644 --- a/install/overseerr-install.sh +++ b/install/overseerr-install.sh @@ -23,6 +23,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/photoprism-install.sh b/install/photoprism-install.sh index 4ff708fd..8a4e3da2 100644 --- a/install/photoprism-install.sh +++ b/install/photoprism-install.sh @@ -30,6 +30,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/scrypted-install.sh b/install/scrypted-install.sh index 89fa9d5b..348f0368 100644 --- a/install/scrypted-install.sh +++ b/install/scrypted-install.sh @@ -65,6 +65,7 @@ $STD apt-get -y install \ msg_ok "Installed GStreamer" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/shinobi-install.sh b/install/shinobi-install.sh index 357025b6..94fe7bc2 100644 --- a/install/shinobi-install.sh +++ b/install/shinobi-install.sh @@ -31,6 +31,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/uptimekuma-install.sh b/install/uptimekuma-install.sh index 44631596..47f9ca24 100644 --- a/install/uptimekuma-install.sh +++ b/install/uptimekuma-install.sh @@ -23,6 +23,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/wikijs-install.sh b/install/wikijs-install.sh index 7ad7e3f3..cc2697c4 100644 --- a/install/wikijs-install.sh +++ b/install/wikijs-install.sh @@ -23,6 +23,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" diff --git a/install/zigbee2mqtt-install.sh b/install/zigbee2mqtt-install.sh index 0c3ed43b..1e8b5089 100644 --- a/install/zigbee2mqtt-install.sh +++ b/install/zigbee2mqtt-install.sh @@ -26,6 +26,7 @@ $STD apt-get install -y gnupg msg_ok "Installed Dependencies" 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_18.x nodistro main" >/etc/apt/sources.list.d/nodesource.list msg_ok "Set up Node.js Repository" From 421ba29201836d8d5f1eb8fb4e7b574538219255 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 3 Sep 2023 11:29:50 -0400 Subject: [PATCH 4/4] Update dashy-install.sh revert https://github.com/tteck/Proxmox/pull/1670 --- install/dashy-install.sh | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/install/dashy-install.sh b/install/dashy-install.sh index e7de0462..f4819a83 100644 --- a/install/dashy-install.sh +++ b/install/dashy-install.sh @@ -42,7 +42,7 @@ export NODE_OPTIONS=--max-old-space-size=1000 $STD yarn build msg_ok "Installed Dashy" -msg_info "Creating Services" +msg_info "Creating Service" cat </etc/systemd/system/dashy.service [Unit] Description=dashy @@ -51,32 +51,11 @@ Description=dashy Type=simple WorkingDirectory=/dashy ExecStart=/usr/bin/yarn start -[Install] -WantedBy=multi-user.target -EOF - -cat </etc/systemd/system/dashy-rebuild.service -[Unit] -Description=Rebuild Dashy on Config Changes - -[Service] -Type=oneshot -ExecStart=/usr/bin/yarn --cwd=/dashy build -EOF - -cat </etc/systemd/system/dashy-rebuild.path -[Unit] -Description=Monitor Dashy Config for Changes - -[Path] -PathChanged=/dashy/public/conf.yml - [Install] WantedBy=multi-user.target EOF systemctl -q --now enable dashy -systemctl -q --now enable dashy-rebuild -msg_ok "Created Services" +msg_ok "Created Service" motd_ssh customize