From 13e85b65e7b9a200e4f6f725f4b59525ce8c494e Mon Sep 17 00:00:00 2001
From: hael <laci@sse.hu>
Date: Thu, 15 Jun 2023 11:26:18 +0000
Subject: [PATCH] nexcloud json files were added

---
 additional_install.sh | 11 +++++++++++
 install.sh            | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/additional_install.sh b/additional_install.sh
index e7ca736..b3fd696 100755
--- a/additional_install.sh
+++ b/additional_install.sh
@@ -1,11 +1,22 @@
 #!/bin/bash
 
+if [ "$SERVICE_DIR" == "" ]; then
+	SERVICE_DIR="/etc/user/config/services";
+fi;
+
 if [[ "$NEXTCLOUD" == "YES" ]]; then 
 	git clone ssh://$GIT_REPO/$ORGANIZATION/nextcloud.git /tmp/nextcloud
 	sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" /tmp/nextcloud/nextcloud-secret.json
 	sed -i "s/USERNAME/$NEXTCLOUD_USERNAME/g" /tmp/nextcloud/nextcloud-secret.json
 	sed -i "s/USER_PASSWORD/$NEXTCLOUD_PASSWORD/g" /tmp/nextcloud/nextcloud-secret.json
 	cp -rv /tmp/nextcloud/nextcloud-secret.json /etc/user/secret/nextcloud-secret.json;
+	
+	sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" /tmp/nextcloud/domain-nextcloud.json
+	cp -rv /tmp/nextcloud/nextcloud.json $SERVICE_DIR/nextcloud-secret.json;
+	cp -rv /tmp/nextcloud/domain-nextcloud.json $SERVICE_DIR/nextcloud-secret.json;
+	cp -rv /tmp/nextcloud/firewall-nextcloud.json $SERVICE_DIR/nextcloud-secret.json;
+	cp -rv /tmp/nextcloud/firewall-nextcloud-server-dns.json $SERVICE_DIR/nextcloud-secret.json;
+	cp -rv /tmp/nextcloud/firewall-nextcloud-server-smtp.json $SERVICE_DIR/nextcloud-secret.json;
 fi;
 
 if [[ "$BITWARDEN" == "YES" ]]; then 
diff --git a/install.sh b/install.sh
index 76ccb4e..631829b 100755
--- a/install.sh
+++ b/install.sh
@@ -274,6 +274,19 @@ install_docker_deb() {
 
 ask_additionals() {
 
+	echo "Please add directory path of service files: (/etc/user/config/services/)";
+	read -r SERVICE_DIR;
+	if [ "$SERVICE_DIR" == "" ] ; then
+		SERVICE_DIR="/etc/user/config/services";
+	else
+		# while not an absolute path
+		while [ ${SERVICE_DIR:0:1} != "/" ]; do
+			echo "The path must be absolute, for example /etc/user/config/services/. Please type it again."
+			read -r SERVICE_DIR;
+		done
+
+	fi
+
 	echo "Do you want to install nextcloud? (Y/n)";
 	read -r ANSWER;
 	if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
@@ -546,6 +559,7 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 	# Run installer tool
 	$SUDO_CMD docker run \
 	--env ADDITIONALS=true \
+	--env SERVICE_DIR=$SERVICE_DIR\
 	$VAR_NEXTCLOUD \
 	$VAR_BITWARDEN \
 	--volume $HOME/.ssh/installer:/root/.ssh/id_rsa \