Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javuto merged 1 commit into from
Jan 24, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion deploy/config/logger.json
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions deploy/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading