Merge branch 'main-upstream'

install/linkwarden-install.sh

@@ -76,6 +76,7 @@ RELEASE=$(curl -s https://api.github.com/repos/linkwarden/linkwarden/releases/la
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 $STD yarn
 $STD npx playwright install-deps
+$STD yarn playwright install
 IP=$(hostname -I | awk '{print $1}')
 SECRET_KEY="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)"
 env_path="/opt/linkwarden/.env"

install/lldap-install.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2024 tteck
+# Author: tteck (tteckster)
+# Co-Author: remz1337
+# 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 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 "Installing lldap"
+source /etc/os-release
+os=$ID
+if [ "$os" == "ubuntu" ]; then
+  DISTRO="xUbuntu"
+else
+  DISTRO="${os^}"
+fi
+echo "deb http://download.opensuse.org/repositories/home:/Masgalor:/LLDAP/${DISTRO}_${VERSION_ID}/ /" >/etc/apt/sources.list.d/home:Masgalor:LLDAP.list
+curl -fsSL https://download.opensuse.org/repositories/home:Masgalor:LLDAP/${DISTRO}_${VERSION_ID}/Release.key | gpg --dearmor >/etc/apt/trusted.gpg.d/home_Masgalor_LLDAP.gpg
+$STD apt update
+$STD apt install -y lldap
+systemctl enable -q --now lldap
+msg_ok "Installed lldap"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+$STD apt-get -y autoremove
+$STD apt-get -y autoclean
+msg_ok "Cleaned"

install/octoprint-install.sh

@@ -39,6 +39,7 @@ msg_info "Creating user octoprint"
 useradd -m -s /bin/bash -p $(openssl passwd -1 octoprint) octoprint
 usermod -aG sudo,tty,dialout octoprint
 chown -R octoprint:octoprint /opt
+echo "octoprint ALL=NOPASSWD: $(command -v systemctl) restart octoprint, $(command -v reboot), $(command -v poweroff)" > /etc/sudoers.d/octoprint
 msg_ok "Created user octoprint"
 
 msg_info "Installing OctoPrint"

install/wastebin-install.sh

@@ -15,33 +15,23 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y --no-install-recommends \
-  build-essential \
-  unzip \
-  curl \
-  sudo \
-  git \
-  make \
-  mc \
-  wget \
-  ca-certificates \
-  openssh-server
+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 wget
+$STD apt-get install -y ca-certificates
+$STD apt-get install -y openssh-server
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Rust (Patience)" 
-$STD bash <(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs) -y
-source ~/.cargo/env
-msg_ok "Installed Rust" 
-
-msg_info "Installing Wastebin (Patience)"
+msg_info "Installing Wastebin"
 RELEASE=$(curl -s https://api.github.com/repos/matze/wastebin/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-wget -q "https://github.com/matze/wastebin/archive/refs/tags/${RELEASE}.zip"
-unzip -q ${RELEASE}.zip
-mv wastebin-${RELEASE} /opt/wastebin
-rm -R ${RELEASE}.zip 
-cd /opt/wastebin
-cargo build -q --release
+wget -q https://github.com/matze/wastebin/releases/download/${RELEASE}/wastebin_${RELEASE}_x86_64-unknown-linux-musl.tar.zst
+tar -xf wastebin_${RELEASE}_x86_64-unknown-linux-musl.tar.zst
+rm -rf wastebin_${RELEASE}_x86_64-unknown-linux-musl.tar.zst
+mkdir -p /opt/wastebin
+mv wastebin /opt/wastebin/
+chmod +x /opt/wastebin/wastebin
 msg_ok "Installed Wastebin"
 
 msg_info "Creating Service"
@@ -51,9 +41,8 @@ Description=Start Wastebin Service
 After=network.target
 
 [Service]
-User=root
 WorkingDirectory=/opt/wastebin
-ExecStart=/root/.cargo/bin/cargo run --release --quiet
+ExecStart=/opt/wastebin/wastebin
 
 [Install]
 WantedBy=multi-user.target