Features: 1) Added TIME_ZONE environment variable to docker-compose.yml, Unix, and Windows environment file generation scripts for improved time zone configuration;
Fixes: 1) None; Extra: 1) Removed redundant `[tool.yapf]` section in `pyproject.toml` to clean up formatting; 2) Adjusted spacing for better readability in Windows script prompts;
This commit is contained in:
parent
f181b47484
commit
946a3e3de6
4 changed files with 37 additions and 33 deletions
|
|
@ -136,6 +136,7 @@ services:
|
|||
- .env
|
||||
environment:
|
||||
- BROKER_URL=${CELERY_BROKER_URL}
|
||||
- TZ=${TIME_ZONE}
|
||||
depends_on:
|
||||
redis:
|
||||
condition: service_healthy
|
||||
|
|
@ -161,6 +162,7 @@ services:
|
|||
- .env
|
||||
environment:
|
||||
- BROKER_URL=${CELERY_BROKER_URL}
|
||||
- TZ=${TIME_ZONE}
|
||||
depends_on:
|
||||
redis:
|
||||
condition: service_healthy
|
||||
|
|
@ -178,6 +180,9 @@ services:
|
|||
- .:/app
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- BROKER_URL=${CELERY_BROKER_URL}
|
||||
- TZ=${TIME_ZONE}
|
||||
depends_on:
|
||||
worker:
|
||||
condition: service_healthy
|
||||
|
|
|
|||
|
|
@ -118,7 +118,4 @@ per-file-ignores = { "__init__.py" = ["E402", "F401"] }
|
|||
|
||||
[tool.ruff.format]
|
||||
quote-style = "double"
|
||||
indent-style = "space"
|
||||
|
||||
[tool.yapf]
|
||||
based_on_style = "pep8"
|
||||
indent-style = "space"
|
||||
|
|
@ -38,6 +38,7 @@ FRONTEND_DOMAIN=$(prompt_default EVIBES_FRONTEND_DOMAIN evibes.com)
|
|||
BASE_DOMAIN=$(prompt_default EVIBES_BASE_DOMAIN evibes.com)
|
||||
SENTRY_DSN=$(prompt_default SENTRY_DSN "")
|
||||
DEBUG=$(prompt_default DEBUG 1)
|
||||
TIME_ZONE=$(prompt_default TIME_ZONE "Europe/London")
|
||||
|
||||
SECRET_KEY=$(prompt_autogen SECRET_KEY 32)
|
||||
JWT_SIGNING_KEY=$(prompt_autogen JWT_SIGNING_KEY 64)
|
||||
|
|
|
|||
|
|
@ -46,50 +46,51 @@ if (Test-Path '.env')
|
|||
Read-Host "Press Enter to continue or Ctrl+C to abort"
|
||||
}
|
||||
|
||||
$PROJECT_NAME = Prompt-Default 'EVIBES_PROJECT_NAME' 'eVibes'
|
||||
$PROJECT_NAME = Prompt-Default 'EVIBES_PROJECT_NAME' 'eVibes'
|
||||
$FRONTEND_DOMAIN = Prompt-Default 'EVIBES_FRONTEND_DOMAIN' 'evibes.com'
|
||||
$BASE_DOMAIN = Prompt-Default 'EVIBES_BASE_DOMAIN' 'evibes.com'
|
||||
$SENTRY_DSN = Prompt-Default 'SENTRY_DSN' ''
|
||||
$DEBUG = Prompt-Default 'DEBUG' '1'
|
||||
$BASE_DOMAIN = Prompt-Default 'EVIBES_BASE_DOMAIN' 'evibes.com'
|
||||
$SENTRY_DSN = Prompt-Default 'SENTRY_DSN' ''
|
||||
$DEBUG = Prompt-Default 'DEBUG' '1'
|
||||
$TIME_ZONE = Prompt-Default 'TIME_ZONE' 'Europe/London'
|
||||
|
||||
$SECRET_KEY = Prompt-AutoGen 'SECRET_KEY' 32
|
||||
$JWT_SIGNING_KEY = Prompt-AutoGen 'JWT_SIGNING_KEY' 64
|
||||
$SECRET_KEY = Prompt-AutoGen 'SECRET_KEY' 32
|
||||
$JWT_SIGNING_KEY = Prompt-AutoGen 'JWT_SIGNING_KEY' 64
|
||||
|
||||
$ALLOWED_HOSTS = Prompt-Default 'ALLOWED_HOSTS' 'evibes.com api.evibes.com b2b.evibes.com'
|
||||
$ALLOWED_HOSTS = Prompt-Default 'ALLOWED_HOSTS' 'evibes.com api.evibes.com b2b.evibes.com'
|
||||
$CSRF_TRUSTED_ORIGINS = Prompt-Default 'CSRF_TRUSTED_ORIGINS' 'https://evibes.com https://api.evibes.com https://www.evibes.com https://b2b.evibes.com'
|
||||
$CORS_ALLOWED_ORIGINS = Prompt-Default 'CORS_ALLOWED_ORIGINS' $CSRF_TRUSTED_ORIGINS
|
||||
|
||||
$POSTGRES_DB = Prompt-Default 'POSTGRES_DB' 'evibes'
|
||||
$POSTGRES_USER = Prompt-Default 'POSTGRES_USER' 'evibes_user'
|
||||
$POSTGRES_PASSWORD = Prompt-AutoGen 'POSTGRES_PASSWORD' 16
|
||||
$POSTGRES_DB = Prompt-Default 'POSTGRES_DB' 'evibes'
|
||||
$POSTGRES_USER = Prompt-Default 'POSTGRES_USER' 'evibes_user'
|
||||
$POSTGRES_PASSWORD = Prompt-AutoGen 'POSTGRES_PASSWORD' 16
|
||||
|
||||
$DBBACKUP_SFTP_HOST = Prompt-Default 'DBBACKUP_SFTP_HOST' 'Your SFTP backup host'
|
||||
$DBBACKUP_SFTP_USER = Prompt-Default 'DBBACKUP_SFTP_USER' 'The username to use to log in to that host'
|
||||
$DBBACKUP_SFTP_PASS = Prompt-Default 'DBBACKUP_SFTP_PASS' 'The password to use to log in to that host'
|
||||
$DBBACKUP_SFTP_HOST = Prompt-Default 'DBBACKUP_SFTP_HOST' 'Your SFTP backup host'
|
||||
$DBBACKUP_SFTP_USER = Prompt-Default 'DBBACKUP_SFTP_USER' 'The username to use to log in to that host'
|
||||
$DBBACKUP_SFTP_PASS = Prompt-Default 'DBBACKUP_SFTP_PASS' 'The password to use to log in to that host'
|
||||
|
||||
$ELASTIC_PASSWORD = Prompt-AutoGen 'ELASTIC_PASSWORD' 16
|
||||
$ELASTIC_PASSWORD = Prompt-AutoGen 'ELASTIC_PASSWORD' 16
|
||||
|
||||
$REDIS_PASSWORD = Prompt-AutoGen 'REDIS_PASSWORD' 16
|
||||
$REDIS_PASSWORD = Prompt-AutoGen 'REDIS_PASSWORD' 16
|
||||
|
||||
$PROMETHEUS_USER = Prompt-Default 'PROMETHEUS_USER' 'evibes'
|
||||
$PROMETHEUS_USER = Prompt-Default 'PROMETHEUS_USER' 'evibes'
|
||||
$PROMETHEUS_PASSWORD = Prompt-AutoGen 'PROMETHEUS_PASSWORD' 16
|
||||
|
||||
$EMAIL_BACKEND = Prompt-Default 'EMAIL_BACKEND' 'django.core.mail.backends.smtp.EmailBackend'
|
||||
$EMAIL_HOST = Prompt-Default 'EMAIL_HOST' 'smtp.whatever.evibes.com'
|
||||
$EMAIL_PORT = Prompt-Default 'EMAIL_PORT' '465'
|
||||
$EMAIL_USE_TLS = Prompt-Default 'EMAIL_USE_TLS' '0'
|
||||
$EMAIL_USE_SSL = Prompt-Default 'EMAIL_USE_SSL' '1'
|
||||
$EMAIL_HOST_USER = Prompt-Default 'EMAIL_HOST_USER' 'your-email-user@whatever.evibes.com'
|
||||
$EMAIL_FROM = Prompt-Default 'EMAIL_FROM' $EMAIL_HOST_USER
|
||||
$EMAIL_BACKEND = Prompt-Default 'EMAIL_BACKEND' 'django.core.mail.backends.smtp.EmailBackend'
|
||||
$EMAIL_HOST = Prompt-Default 'EMAIL_HOST' 'smtp.whatever.evibes.com'
|
||||
$EMAIL_PORT = Prompt-Default 'EMAIL_PORT' '465'
|
||||
$EMAIL_USE_TLS = Prompt-Default 'EMAIL_USE_TLS' '0'
|
||||
$EMAIL_USE_SSL = Prompt-Default 'EMAIL_USE_SSL' '1'
|
||||
$EMAIL_HOST_USER = Prompt-Default 'EMAIL_HOST_USER' 'your-email-user@whatever.evibes.com'
|
||||
$EMAIL_FROM = Prompt-Default 'EMAIL_FROM' $EMAIL_HOST_USER
|
||||
$EMAIL_HOST_PASSWORD = Prompt-Default 'EMAIL_HOST_PASSWORD' 'SUPERSECRETEMAILHOSTPASSWORD'
|
||||
|
||||
$COMPANY_NAME = Prompt-Default 'COMPANY_NAME' 'eVibes, Inc.'
|
||||
$COMPANY_PHONE_NUMBER = Prompt-Default 'COMPANY_PHONE_NUMBER' '+888888888888'
|
||||
$COMPANY_ADDRESS = Prompt-Default 'COMPANY_ADDRESS' 'The place that does not exist'
|
||||
$COMPANY_NAME = Prompt-Default 'COMPANY_NAME' 'eVibes, Inc.'
|
||||
$COMPANY_PHONE_NUMBER = Prompt-Default 'COMPANY_PHONE_NUMBER' '+888888888888'
|
||||
$COMPANY_ADDRESS = Prompt-Default 'COMPANY_ADDRESS' 'The place that does not exist'
|
||||
|
||||
$OPENAI_API_KEY = Prompt-Default 'OPENAI_API_KEY' 'Haha, really?'
|
||||
$ABSTRACT_API_KEY = Prompt-Default 'ABSTRACT_API_KEY' 'Haha, really? x2'
|
||||
$DEEPL_AUTH_KEY = Prompt-Default 'DEEPL_AUTH_KEY' 'Haha, really? x3'
|
||||
$OPENAI_API_KEY = Prompt-Default 'OPENAI_API_KEY' 'Haha, really?'
|
||||
$ABSTRACT_API_KEY = Prompt-Default 'ABSTRACT_API_KEY' 'Haha, really? x2'
|
||||
$DEEPL_AUTH_KEY = Prompt-Default 'DEEPL_AUTH_KEY' 'Haha, really? x3'
|
||||
|
||||
$lines = @(
|
||||
"EVIBES_PROJECT_NAME=""$PROJECT_NAME"""
|
||||
|
|
|
|||
Loading…
Reference in a new issue