From 6382f9a959e00ba16b51d1b6f9c6fe5b67d4b749 Mon Sep 17 00:00:00 2001
From: hael <laci@sse.hu>
Date: Thu, 15 Jun 2023 10:51:03 +0000
Subject: [PATCH] bitwarden install changes

---
 additional_install.sh |  5 ++++-
 install.sh            | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 additional_install.sh

diff --git a/additional_install.sh b/additional_install.sh
old mode 100644
new mode 100755
index e9eef71..e7ca736
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -10,8 +10,11 @@ fi;
 
 if [[ "$BITWARDEN" == "YES" ]]; then 
 	git clone ssh://$GIT_REPO/$ORGANIZATION/bitwarden.git /tmp/bitwarden
+
+	BITWARDEN_TOKEN=$(openssl rand -base64 48);
+
 	sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json
-	sed -i "s/USERNAME/$BITWARDEN_USERNAME/g" /tmp/bitwarden/bitwarden-secret.json
+	sed -i "s/ADMIN_TOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
 	cp -rv /tmp/bitwarden/bitwarden-secret.json /etc/user/secret/bitwarden-secret.json;
 fi;
 
diff --git a/install.sh b/install.sh
index 107d808..76ccb4e 100755
--- a/install.sh
+++ b/install.sh
@@ -310,6 +310,8 @@ ask_additionals() {
 				break;
 			fi;
 		done
+
+
 	fi
 
 }
@@ -527,11 +529,18 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN";
 		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME";
 		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_PASSWORD=$NEXTCLOUD_PASSWORD";
+
+		if [ ! -d "/etc/user/data/nextcloud" ]; then
+			$SUDO_CMD mkdir -p "/etc/user/data/nextcloud"
+			$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud"
+		fi;
 	fi
 	if [ "$BITWARDEN" != "" ]; then
 		VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
 		VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
-		VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_TOKEN=$BITWARDEN_TOKEN";
+	
+		echo "You can access your bitwarden admin page here: https://$BITWARDEN_DOMAIN/admin";
+		echo "You will find ADMIN TOKEN in this file: /etc/user/secret/bitwarden-secret.json";
 	fi
 
 	# Run installer tool