diff --git a/server/Caddyfile b/server/Caddyfile index dd440e18..381f0ac4 100644 --- a/server/Caddyfile +++ b/server/Caddyfile @@ -3,5 +3,5 @@ ice.plezy.app { } bugs.plezy.app { - reverse_proxy glitchtip:8000 + reverse_proxy bugs:9000 } diff --git a/server/deploy.sh b/server/deploy.sh deleted file mode 100755 index 4e184e59..00000000 --- a/server/deploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -REMOTE="root@212.132.75.249" -SSH_KEY="$HOME/.ssh/id_edde" -REMOTE_DIR="/opt/plezy-relay" -SSH="ssh -i $SSH_KEY $REMOTE" - -cd "$SCRIPT_DIR" - -echo "Syncing files to $REMOTE:$REMOTE_DIR..." -rsync -avz --exclude='plezy-relay' --exclude='plezy-server-linux-amd64' \ - -e "ssh -i $SSH_KEY" \ - . "$REMOTE:$REMOTE_DIR/" - -echo "Deploying..." -$SSH "cd $REMOTE_DIR && docker compose up -d --build" - -echo "Done." diff --git a/server/docker-compose.yml b/server/docker-compose.yml index 3baf58a7..3ee65a07 100644 --- a/server/docker-compose.yml +++ b/server/docker-compose.yml @@ -18,41 +18,20 @@ services: - caddy_data:/data - caddy_config:/config - glitchtip-db: - image: postgres:16-alpine + bugs: + image: ghcr.io/edde746/bugs:latest restart: unless-stopped - environment: - POSTGRES_DB: glitchtip - POSTGRES_USER: ${GLITCHTIP_POSTGRES_USER} - POSTGRES_PASSWORD: ${GLITCHTIP_POSTGRES_PASSWORD} volumes: - - glitchtip_data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${GLITCHTIP_POSTGRES_USER}"] - interval: 5s - timeout: 5s - retries: 5 - - glitchtip: - image: glitchtip/glitchtip - restart: unless-stopped - depends_on: - glitchtip-db: - condition: service_healthy + - bugs_data:/data environment: - DATABASE_URL: postgres://${GLITCHTIP_POSTGRES_USER}:${GLITCHTIP_POSTGRES_PASSWORD}@glitchtip-db/glitchtip - SECRET_KEY: ${GLITCHTIP_SECRET_KEY} - GLITCHTIP_DOMAIN: https://bugs.plezy.app - DEFAULT_FROM_EMAIL: noreply@plezy.app - GLITCHTIP_MAX_EVENT_LIFE_DAYS: 90 - SERVER_ROLE: all_in_one - ENABLE_USER_REGISTRATION: "false" - VALKEY_URL: "" + BUGS_AUTH__ADMIN_TOKEN: ${BUGS_AUTH__ADMIN_TOKEN} + BUGS_PUBLIC_URL: https://bugs.plezy.app + BUGS_RETENTION_DAYS: 90 expose: - - "8000" + - "9000" volumes: logs: caddy_data: caddy_config: - glitchtip_data: + bugs_data: