diff --git a/templates/compose/hoppscotch.yaml b/templates/compose/hoppscotch.yaml index abdc1aa12..536a3a215 100644 --- a/templates/compose/hoppscotch.yaml +++ b/templates/compose/hoppscotch.yaml @@ -12,46 +12,14 @@ services: - SERVICE_URL_HOPPSCOTCH_80 - VITE_ALLOWED_AUTH_PROVIDERS=${VITE_ALLOWED_AUTH_PROVIDERS:-GOOGLE,GITHUB,MICROSOFT,EMAIL} - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@hoppscotch-db:5432/${POSTGRES_DB} - - JWT_SECRET=${SERVICE_PASSWORD_JWT} - - TOKEN_SALT_COMPLEXITY=${TOKEN_SALT_COMPLEXITY:-10} - - MAGIC_LINK_TOKEN_VALIDITY=${MAGIC_LINK_TOKEN_VALIDITY:-3} - - REFRESH_TOKEN_VALIDITY=${REFRESH_TOKEN_VALIDITY:-604800000} - - ACCESS_TOKEN_VALIDITY=${ACCESS_TOKEN_VALIDITY:-86400000} - - SESSION_SECRET=${SERVICE_PASSWORD_SECRET} - - ALLOW_SECURE_COOKIES=${ALLOW_SECURE_COOKIES:-true} - - DATA_ENCRYPTION_KEY=${DATA_ENCRYPTION_KEY:-mustbeexactry32characterlikethat} - - REDIRECT_URL=${SERVICE_URL_HOPPSCOTCH} + - DATA_ENCRYPTION_KEY=${SERVICE_BASE64_DATAENCRYPTIONKEY} - WHITELISTED_ORIGINS=${SERVICE_URL_HOPPSCOTCH}/backend,${SERVICE_URL_HOPPSCOTCH},${SERVICE_URL_HOPPSCOTCH}/admin - - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID:-*****} - - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET:-*****} - - GOOGLE_CALLBACK_URL=${SERVICE_URL_HOPPSCOTCH}/backend/v1/auth/google/callback - - GOOGLE_SCOPE=email,profile - - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID:-*****} - - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-*****} - - GITHUB_CALLBACK_URL=${SERVICE_URL_HOPPSCOTCH}/backend/v1/auth/github/callback - - GITHUB_SCOPE=user:email - - MICROSOFT_CLIENT_ID=${MICROSOFT_CLIENT_ID:-*****} - - MICROSOFT_CLIENT_SECRET=${MICROSOFT_CLIENT_SECRET:-*****} - - MICROSOFT_CALLBACK_URL=${SERVICE_URL_HOPPSCOTCH}/backend/v1/auth/microsoft/callback - - MICROSOFT_SCOPE=user.read - - MICROSOFT_TENANT=common - - MAILER_SMTP_ENABLE=${MAILER_SMTP_ENABLE:-false} - MAILER_USE_CUSTOM_CONFIGS=${MAILER_USE_CUSTOM_CONFIGS:-true} - - MAILER_ADDRESS_FROM=${MAILER_ADDRESS_FROM:-user@example.com} - - MAILER_SMTP_URL=${MAILER_SMTP_URL:-smtps_url} - - MAILER_SMTP_HOST=${MAILER_SMTP_HOST:-smtp.example.com} - - MAILER_SMTP_PORT=${MAILER_SMTP_PORT:-465} - - MAILER_SMTP_SECURE=${MAILER_SMTP_SECURE:-true} - - MAILER_SMTP_USER=${MAILER_SMTP_USER:-user@example.com} - - MAILER_SMTP_PASSWORD=${MAILER_SMTP_PASSWORD:-mailpass} - - MAILER_TLS_REJECT_UNAUTHORIZED=${MAILER_TLS_REJECT_UNAUTHORIZED:-false} - - RATE_LIMIT_TTL=${RATE_LIMIT_TTL:-60} - - RATE_LIMIT_MAX=${RATE_LIMIT_MAX:-100} - VITE_BASE_URL=${SERVICE_URL_HOPPSCOTCH} - VITE_SHORTCODE_BASE_URL=${SERVICE_URL_HOPPSCOTCH} - VITE_ADMIN_URL=${SERVICE_URL_HOPPSCOTCH}/admin - VITE_BACKEND_GQL_URL=${SERVICE_URL_HOPPSCOTCH}/backend/graphql - - VITE_BACKEND_WS_URL=wss://${SERVICE_URL_HOPPSCOTCH}/backend/graphql + - VITE_BACKEND_WS_URL=wss://${SERVICE_FQDN_HOPPSCOTCH}/backend/graphql - VITE_BACKEND_API_URL=${SERVICE_URL_HOPPSCOTCH}/backend/v1 - VITE_APP_TOS_LINK=https://docs.hoppscotch.io/support/terms - VITE_APP_PRIVACY_POLICY_LINK=https://docs.hoppscotch.io/support/privacy