From 7c4c4fd6208b26cb86ecf567fee3e6276c817555 Mon Sep 17 00:00:00 2001 From: Yigid BALABAN Date: Tue, 14 Oct 2025 21:26:58 +0300 Subject: [PATCH] tests now pass --- .env.development | 5 ++--- .env.example | 13 ++++++------- internal/deploy/manager.go | 7 ++++++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index fae3c3b..afbb96d 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,7 @@ -# Required: Admin bearer token for API access ADMIN_TOKEN=devadmintoken -# Docker host binding (used by docker-compose for port mapping) -HOST=0.0.0.0 +# Docker host binding (used by docker compose for port mapping) +HOST=127.0.0.1 PORT=8080 # Optional: Service configuration (defaults shown) diff --git a/.env.example b/.env.example index 8948f67..fed7e5f 100644 --- a/.env.example +++ b/.env.example @@ -1,14 +1,14 @@ -# Required: Admin bearer token for API access -ADMIN_TOKEN=your-secure-admin-token-here +# Docker Compose Variables (used for port mapping) +# Copy this file to .env for docker-compose to use -# Docker host binding (used by docker-compose for port mapping) # The Go service always binds to 0.0.0.0:8080 inside the container HOST=0.0.0.0 PORT=8080 - +# Required: Admin bearer token for API access +ADMIN_TOKEN=your-secure-admin-token-here # TODO: generate a secure token # Optional: Service configuration (defaults shown) -DEPLOY_ROOT=/var/www/docs -RELEASE_ROOT=/var/www/deploys +DEPLOY_ROOT=/var/www/tingz-docs +RELEASE_ROOT=/var/www/tingz-deploys DB_PATH=/data/deployer.db # Optional: Upload and retention settings @@ -24,4 +24,3 @@ DISABLE_FILE_DELETE_ON_USER_REMOVE=false # Optional: TLS configuration (if terminating TLS in the service) # TLS_CERT=/path/to/cert.pem # TLS_KEY=/path/to/key.pem - diff --git a/internal/deploy/manager.go b/internal/deploy/manager.go index 54a5a5d..b1c6986 100644 --- a/internal/deploy/manager.go +++ b/internal/deploy/manager.go @@ -74,8 +74,13 @@ func (m *Manager) Deploy(ctx context.Context, username, project string, r io.Rea return "", fmt.Errorf("failed to create deploy parent directory: %w", err) } + relPath, err := filepath.Rel(deployParentDir, releasePath) + if err != nil { + return "", fmt.Errorf("failed to calculate relative path: %w", err) + } + tmpLink := deployPath + ".tmp." + releaseID - if err := os.Symlink(releasePath, tmpLink); err != nil { + if err := os.Symlink(relPath, tmpLink); err != nil { return "", fmt.Errorf("failed to create temporary symlink: %w", err) }