From 13c370049ce73dcebc7b5c7c8dbd2ef52467f237 Mon Sep 17 00:00:00 2001
From: himeshr <himeshl@samanvayfoundation.org>
Date: Wed, 11 Dec 2024 12:28:36 +0530
Subject: [PATCH] avniproject/avni-webapp#1337 | Rename server hostnames

---
 Makefile                |  6 +++---
 makefiles/prerelease.mk |  2 +-
 makefiles/staging.mk    | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c4501216e..14bc2d0ab 100644
--- a/Makefile
+++ b/Makefile
@@ -164,11 +164,11 @@ start_server_wo_gradle:
 
 # LIVE
 log_live:
-	tail -f /var/log/openchs/openchs.log
+	tail -f /var/log/avni_server/chs.log
 # /LIVE
 
 tail-local-log:
-	tail -f -n1000 /var/log/openchs/openchs.log
+	tail -f -n1000 /var/log/avni_server/chs.log
 
 debug_server_live: build_server
 	OPENCHS_MODE=live OPENCHS_CLIENT_ID=$(STAGING_APP_CLIENT_ID) OPENCHS_USER_POOL=$(STAGING_USER_POOL_ID) java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar avni-server-api/build/libs/avni-server-0.0.1-SNAPSHOT.jar
@@ -199,4 +199,4 @@ exec-sql: ## Usage: make exec-sql sqlfile=</path/to/sql>
 
 # remote
 tail-prod:
-	ssh avni-server-prod "tail -f /var/log/openchs/openchs.log"
+	ssh avni-prod "tail -f /var/log/avni_server/chs.log"
diff --git a/makefiles/prerelease.mk b/makefiles/prerelease.mk
index 089a0f30a..a5e7f33a1 100644
--- a/makefiles/prerelease.mk
+++ b/makefiles/prerelease.mk
@@ -9,7 +9,7 @@ open-cognito-prerelease:
 	open https://ap-south-1.console.aws.amazon.com/cognito/v2/idp/user-pools/ap-south-1_vfNvMvMk9/users?region=ap-south-1
 
 start_server_prerelease: build_server
-	-mkdir -p /tmp/openchs && sudo ln -s /tmp/openchs /var/log/openchs
+	-mkdir -p /tmp/openchs && sudo ln -s /tmp/openchs /var/log/avni_server
 
 	AVNI_IDP_TYPE=cognito \
 	OPENCHS_CLIENT_ID=$(OPENCHS_CLIENT_ID) \
diff --git a/makefiles/staging.mk b/makefiles/staging.mk
index 5cfd0b4f6..07b5b6aa3 100644
--- a/makefiles/staging.mk
+++ b/makefiles/staging.mk
@@ -1,12 +1,12 @@
 # I have setup the environment variables in my bash_profile so that I can just run it whenever I want in live mode. You could do that too (Vivek).
 tunnel_staging_db:
-	ssh avni-server-staging -L 6015:stagingdb.openchs.org:5432
+	ssh avni-staging -L 6015:stagingdb.openchs.org:5432
 
 tunnel_staging_server_for_debug:
-	ssh avni-server-staging -L 5005:127.0.0.1:5005
+	ssh avni-staging -L 5005:127.0.0.1:5005
 
 start_server_staging: build_server
-	-mkdir -p /tmp/openchs && sudo ln -s /tmp/openchs /var/log/openchs
+	-mkdir -p /tmp/openchs && sudo ln -s /tmp/openchs /var/log/avni_server
 
 	AVNI_IDP_TYPE=cognito \
 	OPENCHS_CLIENT_ID=$(OPENCHS_STAGING_APP_CLIENT_ID) \
@@ -19,7 +19,7 @@ start_server_staging: build_server
     	java -jar avni-server-api/build/libs/avni-server-0.0.1-SNAPSHOT.jar
 
 debug_server_staging: build_server
-	-mkdir -p /tmp/openchs && sudo ln -s /tmp/openchs /var/log/openchs
+	-mkdir -p /tmp/openchs && sudo ln -s /tmp/openchs /var/log/avni_server
 	OPENCHS_DATABASE_URL=jdbc:postgresql://localhost:5433/openchs?currentSchema=public \
 	AVNI_IDP_TYPE=cognito \
 	OPENCHS_CLIENT_ID=$(OPENCHS_STAGING_APP_CLIENT_ID) \
@@ -31,7 +31,7 @@ debug_server_staging: build_server
 		java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar avni-server-api/build/libs/avni-server-0.0.1-SNAPSHOT.jar
 
 tail-staging-log:
-	ssh avni-server-staging "tail -f -n1000 /var/log/openchs/openchs.log"
+	ssh avni-staging "tail -f -n1000 /var/log/avni_server/chs.log"
 
 open-user-media-staging:
 ifndef orgMedia