From 0c00fd7449e98e71833ae1983de772732c76714e Mon Sep 17 00:00:00 2001
From: Sam Heinz <54530346+asylumexp@users.noreply.github.com>
Date: Fri, 14 Jun 2024 13:17:35 +1000
Subject: [PATCH] Remove password, Update header, update URL

(cherry picked from commit 2b61838c318c6d39e15ff6502be62b32a7b0e7c7)
---
 ct/jdownloader2.sh              | 12 ++++++------
 install/jdownloader2-install.sh |  9 +--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ct/jdownloader2.sh b/ct/jdownloader2.sh
index 22d5cdbe..dc381ac8 100644
--- a/ct/jdownloader2.sh
+++ b/ct/jdownloader2.sh
@@ -8,11 +8,11 @@ source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/b
 function header_info {
 clear
 cat <<"EOF"
-    ___         _      ___
-   /   |  _____(_)___ |__ \
-  / /| | / ___/ / __ `/_/ /
- / ___ |/ /  / / /_/ / __/
-/_/  |_/_/  /_/\__,_/____/
+       ______                      __                __         ___ 
+      / / __ \____ _      ______  / /___  ____ _____/ /__  ____|__ \
+ __  / / / / / __ \ | /| / / __ \/ / __ \/ __ `/ __  / _ \/ ___/_/ /
+/ /_/ / /_/ / /_/ / |/ |/ / / / / / /_/ / /_/ / /_/ /  __/ /  / __/ 
+\____/_____/\____/|__/|__/_/ /_/_/\____/\__,_/\__,_/\___/_/  /____/ 
 EOF
 }
 header_info
@@ -67,4 +67,4 @@ description
 
 msg_ok "Completed Successfully!\n"
 echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:6880${CL}"
+         ${BL}http://${IP}:6080${CL}/vnc.html"
diff --git a/install/jdownloader2-install.sh b/install/jdownloader2-install.sh
index 2d169ace..1eed1410 100644
--- a/install/jdownloader2-install.sh
+++ b/install/jdownloader2-install.sh
@@ -35,13 +35,6 @@ cd /app
 wget -q http://installer.jdownloader.org/JDownloader.jar
 msg_ok "Installed JDownloader2"
 
-msg_info "Setting up VNC Server"
-mkdir /root/.vnc
-secret=$(openssl rand -base64 8)
-echo "$secret" >>/app/passwd
-echo $secret | vncpasswd -f
-msg_ok "Setup VNC Server"
-
 msg_info "Creating Service"
 mkdir /output
 cat <<EOF >/etc/systemd/system/xvfb.service
@@ -62,7 +55,7 @@ After=xvfb.service
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/x0vncserver -display :1 -PasswordFile=/root/.vnc/passwd
+ExecStart=/usr/bin/x0vncserver -display :1 -SecurityTypes none
 Environment="DISPLAY=:1"
 Environment="HOME=/root"
 Restart=on-failure