Merge pull request #582 from jmpsec/make-deploy-linux

Deploy dev with `provision.sh` using `Makefile` and fix for logger

Author: javuto

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:

deploy/config/logger.json

@@ -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"