From 553f0adfaf507fe8f1d608a1878d5d82d5d8a9d9 Mon Sep 17 00:00:00 2001
From: Javier Marcos <1271349+javuto@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:16:21 +0100
Subject: [PATCH] Deploy dev with provision using Makefile

---
 Makefile                  | 4 ++++
 deploy/config/logger.json | 1 -
 deploy/provision.sh       | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 deploy/config/logger.json

diff --git a/Makefile b/Makefile
index 2f6dd4f1..e82e3310 100644
--- a/Makefile
+++ b/Makefile
@@ -237,6 +237,10 @@ docker_dev_rebuild_admin:
 docker_dev_rebuild_api:
 	docker-compose -f docker-compose-dev.yml up --force-recreate --no-deps -d --build $(API_NAME)
 
+# Deploy osctrl in a single server using the provision.sh script
+provision_dev:
+	./deploy/provision.sh -m prod -s /home/$(DEV_USER)/osctrl -t self -p all --nginx --postgres -E -R --tls-hostname "$(DEV_IP)" --admin-hostname "$(DEV_IP)" --api-hostname "$(DEV_IP)" -X admin
+
 # Auto-format and simplify the code
 GOFMT_ARGS = -l -w -s
 gofmt-tls:
diff --git a/deploy/config/logger.json b/deploy/config/logger.json
deleted file mode 100644
index 0967ef42..00000000
--- a/deploy/config/logger.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/deploy/provision.sh b/deploy/provision.sh
index 9320c445..02a51827 100755
--- a/deploy/provision.sh
+++ b/deploy/provision.sh
@@ -144,7 +144,8 @@ API_CONF="$API_COMPONENT.json"
 DB_CONF="db.json"
 CACHE_CONF="redis.json"
 JWT_CONF="jwt.json"
-LOGGER_CONF="logger.json"
+LOGGER_CONF_ADMIN="logger_admin.json"
+LOGGER_CONF_TLS="logger_tls.json"
 SERVICE_TEMPLATE="service.json"
 DB_TEMPLATE="db.json"
 CACHE_TEMPLATE="redis.json"
@@ -672,7 +673,8 @@ else
   configuration_cache "$SOURCE_PATH/deploy/config/$CACHE_TEMPLATE" "$DEST_PATH/config/$CACHE_CONF" "$_CACHE_HOST" "$_CACHE_PORT" "$_CACHE_PASS" "sudo"
 
   # Prepare DB logger configuration for services
-  sudo cp "$DEST_PATH/config/$DB_CONF" "$DEST_PATH/config/$LOGGER_CONF"
+  sudo cp "$DEST_PATH/config/$DB_CONF" "$DEST_PATH/config/$LOGGER_CONF_ADMIN"
+  sudo cp "$DEST_PATH/config/$DB_CONF" "$DEST_PATH/config/$LOGGER_CONF_TLS"
 
   # JWT configuration
   cat "$SOURCE_PATH/deploy/config/$JWT_TEMPLATE" | sed "s|_JWT_SECRET|$_JWT_SECRET|g" | sudo tee "$DEST_PATH/config/$JWT_CONF"