From a2689401ed97ad6c31eb9cfe4078c882f2c792b5 Mon Sep 17 00:00:00 2001
From: leo <426742@gmail.com>
Date: Tue, 6 Aug 2024 21:45:19 +0500
Subject: [PATCH] changes

---
 install.sh      |  9 ++++++---
 remote.sh       | 10 +++++++---
 secrets-push.sh | 10 +++++++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index d6efba6..a6d0c42 100644
--- a/install.sh
+++ b/install.sh
@@ -5,13 +5,16 @@ if [ "$(id -u)" != "0" ]; then
     exit 0
 fi
 
-if [ -z "$1" ]; then
-  echo "Please provide SERVER_HOST as argument"
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+  echo "Please provide SERVER_HOST SERVER_ORIGIN_PASSWORD GITEA_API_ADD_SSH_KEY as arguments"
   exit 1
 fi
 
-REMOTE_USER="root"
 SERVER_HOST=$1
+SERVER_ORIGIN_PASSWORD=$2
+GITEA_API_ADD_SSH_KEY=$3
+
+REMOTE_USER="root"
 SECRETS_PATH=/data/secrets/$SERVER_HOST/$SERVER_HOST.env
 
 trap 'echo -e "\033[31minstall.sh: Something went wrong\033[0m"; exit 1' ERR
diff --git a/remote.sh b/remote.sh
index 0b2d121..78eb1dd 100644
--- a/remote.sh
+++ b/remote.sh
@@ -5,18 +5,22 @@ if [ "$(id -u)" != "0" ]; then
     exit 0
 fi
 
-if [ -z "$1" ]; then
-  echo "Please provide SERVER_HOST as argument"
+if [ -z "$1" ] || [ -z "$2" ]; then
+  echo "Please provide SERVER_HOST & SERVER_PASSWORD as arguments"
   exit 1
 fi
 
 SSH_PORT=22
 REMOTE_USER="root"
 SERVER_HOST=$1
+SERVER_PASSWORD=$2
 SECRETS_DIR=/data/secrets
 SECRETS_ENV=$SECRETS_DIR/$SERVER_HOST/$SERVER_HOST.env
 
+DEV_ENV=$SECRETS_DIR/dev.env
+
 source $SECRETS_ENV
+source $DEV_ENV
 
 SECRETS_SAFE=$SECRETS_DIR/safe
 SECRETS_PATH=$SECRETS_SAFE/$SERVER_HOST.tar.gz
@@ -59,7 +63,7 @@ echo "Run secrets-decrypt script for decrypt secrets archive on target host..."
 ssh -p $SSH_PORT $REMOTE_USER@$SERVER_HOST "bash /tmp/secrets-decrypt.sh $SAFE_PASSWORD $SECRETS_PATH $SECRETS_DIR/$SERVER_HOST"
 
 echo "Run install script on target host..."
-ssh -p $SSH_PORT $REMOTE_USER@$SERVER_HOST "bash /tmp/install.sh $SERVER_HOST"
+ssh -p $SSH_PORT $REMOTE_USER@$SERVER_HOST "bash /tmp/install.sh $SERVER_HOST $SERVER_ORIGIN_PASSWORD $GITEA_API_ADD_SSH_KEY"
 
 trap - ERR
 echo "Remote install complete"
\ No newline at end of file
diff --git a/secrets-push.sh b/secrets-push.sh
index fb57c36..1106912 100644
--- a/secrets-push.sh
+++ b/secrets-push.sh
@@ -18,15 +18,23 @@ ARCHIVE_FILE="$SAFE_DIR/$SERVER_HOST.tar.gz"
 REMOTE_USER="root"
 SECRETS_PATH=/data/secrets/$SERVER_HOST/$SERVER_HOST.env
 
-source $SECRETS_PATH
+
 
 trap 'echo -e "\033[31mSomething went wrong\033[0m"; exit 1' ERR
 set -e
 
 export DEBIAN_FRONTEND=noninteractive
 
+source $SECRETS_PATH
+
+
+echo "Encrypt secrets..."
 bash secrets-encrypt.sh $SERVER_HOST
+
+echo "Create SAFE_DIR on ORIGIN server..."
 ssh $REMOTE_USER@$SERVER_ORIGIN_DOMAIN "mkdir -p $SAFE_DIR"
+
+echo "Save archive on ORIGIN server safe..."
 scp $ARCHIVE_FILE $REMOTE_USER@$SERVER_ORIGIN_DOMAIN:$SAFE_DIR
 
 trap - ERR