From 744d3bd379479ecbd1ed35b22c5f5a41bc3dd3ad Mon Sep 17 00:00:00 2001 From: Adrien Pavao Date: Mon, 7 Nov 2022 14:12:05 +0100 Subject: [PATCH] Remove .env_production_sample --- .env_production_sample | 140 ----------------------------------------- .env_sample | 29 +++++++-- 2 files changed, 24 insertions(+), 145 deletions(-) delete mode 100644 .env_production_sample diff --git a/.env_production_sample b/.env_production_sample deleted file mode 100644 index b53ecbfac..000000000 --- a/.env_production_sample +++ /dev/null @@ -1,140 +0,0 @@ -# ---------------------------------------------------------------------------- -# Submission processing -# ---------------------------------------------------------------------------- -SUBMISSION_TEMP_DIR=/tmp/codalab - - -# ---------------------------------------------------------------------------- -# Storage -# ---------------------------------------------------------------------------- - -# Uncomment to use AWS -DEFAULT_FILE_STORAGE=storages.backends.s3boto3.S3Boto3Storage -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_STORAGE_BUCKET_NAME=public -AWS_STORAGE_PRIVATE_BUCKET_NAME=private -AWS_S3_CALLING_FORMAT=boto.s3.connection.OrdinaryCallingFormat -AWS_S3_HOST=s3.amazonaws.com -AWS_QUERYSTRING_AUTH=False -S3DIRECT_REGION=us-west-2 -# ^^Set the S3DIRECT_REGION to the AWS region of your storage buckets - -# Uncomment to use Minio -#DEFAULT_FILE_STORAGE=storages.backends.s3boto3.S3Boto3Storage -#AWS_ACCESS_KEY_ID= -#AWS_SECRET_ACCESS_KEY= -#AWS_STORAGE_BUCKET_NAME=public -#AWS_STORAGE_PRIVATE_BUCKET_NAME=private -#AWS_S3_CALLING_FORMAT=boto.s3.connection.OrdinaryCallingFormat -#AWS_S3_HOST=minio.yoursite.org -#AWS_QUERYSTRING_AUTH=False -#S3DIRECT_REGION=us-east-1 -#S3_USE_SIGV4=True - -# Uncomment to use Azure -#DEFAULT_FILE_STORAGE=codalab.azure_storage.AzureStorage -#AZURE_ACCOUNT_NAME= -#AZURE_ACCOUNT_KEY= -#AZURE_CONTAINER=public -# Only set these if bundle storage key is different from normal account keys -# BUNDLE_AZURE_ACCOUNT_NAME= -# BUNDLE_AZURE_ACCOUNT_KEY= -BUNDLE_AZURE_CONTAINER=bundles - -# ---------------------------------------------------------------------------- -# Database -# ---------------------------------------------------------------------------- - -# Used engine (mysql, postgresql, sqlite3, memory) -DB_ENGINE=postgresql - -# Connection parameters -DB_HOST=postgres -DB_PORT=5432 -DB_NAME=codalab_website -DB_USER=root -DB_PASSWORD=password - -# Path where DB files will be mapped -DB_DATA_PATH=./var/data/postgres - - -# ---------------------------------------------------------------------------- -# Caching -# ---------------------------------------------------------------------------- -MEMCACHED_PORT=11211 - - -# ---------------------------------------------------------------------------- -# RabbitMQ and management -# ---------------------------------------------------------------------------- -BROKER_URL=pyamqp://guest:guest@rabbit:5671// -BROKER_USE_SSL=True -RABBITMQ_DEFAULT_USER=guest -RABBITMQ_DEFAULT_PASS=guest -RABBITMQ_HOST=rabbit -RABBITMQ_PORT=5671 -RABBITMQ_MANAGEMENT_PORT=15672 -FLOWER_BASIC_AUTH=root:password -FLOWER_PORT=5555 - - -# ========================================================================= -# Email -# ========================================================================= -EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend -EMAIL_HOST=smtp.sendgrid.net -EMAIL_HOST_USER= -EMAIL_HOST_PASSWORD= -EMAIL_PORT=587 -EMAIL_USE_TLS=True -DEFAULT_FROM_EMAIL=CodaLab -SERVER_EMAIL=noreply@codalab.org - - -# ---------------------------------------------------------------------------- -# Django/nginx -# ---------------------------------------------------------------------------- -DJANGO_SECRET_KEY=change-me-to-a-secret -DJANGO_PORT=8000 -# Make sure debug is off on production -#DEBUG= -# These admins will be emailed when there are errors -ADMINS=Name,you@example.com;OtherName,other@example.com - -NGINX_PORT=80 -SSL_PORT=443 - -# Put SSL certificates in ./certs/ and they are mapped to /app/certs in the container -SSL_CERTIFICATE=/app/certs/certificate.crt -SSL_CERTIFICATE_KEY=/app/certs/certificate.pem -# Allowed hosts separated by space -SSL_ALLOWED_HOSTS=yourhost.com - - -# Set this to your actual domain, like example.com -CODALAB_SITE_DOMAIN=localhost - -# How many site workers (submission result processors)? -WEB_CONCURRENCY=16 - -# Google Analytics code (leave empty to disable Google's user tracking) -GOOGLE_ANALYTICS= - - -# ---------------------------------------------------------------------------- -# ChaHub -# ---------------------------------------------------------------------------- -# Be sure to include trailing slash on URL -#CHAHUB_API_URL=https://chahub.org/api/v1/ -#CHAHUB_API_KEY=some-secret-key -#SOCIAL_AUTH_CHAHUB_BASE_URL=https://chahub.org - - -# ---------------------------------------------------------------------------- -# Logging -# ---------------------------------------------------------------------------- -# Make sure LOGGING_DIR doesn't end with a slash -LOGGING_DIR=./var/logs -DJANGO_LOG_LEVEL=info diff --git a/.env_sample b/.env_sample index 0457accc0..8c377ec53 100644 --- a/.env_sample +++ b/.env_sample @@ -103,24 +103,43 @@ FLOWER_PORT=5555 # ---------------------------------------------------------------------------- DJANGO_SECRET_KEY=change-me-to-a-secret DJANGO_PORT=8000 -DEBUG=True NGINX_PORT=80 - SSL_PORT=443 -#SSL_CERTIFICATE= -#SSL_CERTIFICATE_KEY= -# Allowed hosts separated by space + +# Make sure debug is off on production +DEBUG=True +# These admins will be emailed when there are errors +#ADMINS=Name,you@example.com;OtherName,other@example.com + +# Put SSL certificates in ./certs/ and they are mapped to /app/certs in the container +#SSL_CERTIFICATE=/app/certs/certificate.crt +#SSL_CERTIFICATE_KEY=/app/certs/certificate.pem +# Allowed hosts separated by space (e.g. example.com) SSL_ALLOWED_HOSTS= # Set this to your actual domain, like example.com CODALAB_SITE_DOMAIN=localhost # How many site workers (submission result processors)? +# A higher value, e.g. 16, is advised for a production environment WEB_CONCURRENCY=2 # Google Analytics code (leave empty to disable Google's user tracking) GOOGLE_ANALYTICS= +# ========================================================================= +# Email +# ========================================================================= +# This section can be left commented for a testing environment +#EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend +#EMAIL_HOST=smtp.sendgrid.net +#EMAIL_HOST_USER= +#EMAIL_HOST_PASSWORD= +#EMAIL_PORT=587 +#EMAIL_USE_TLS=True +#DEFAULT_FROM_EMAIL=CodaLab +#SERVER_EMAIL=noreply@codalab.org + # ---------------------------------------------------------------------------- # Logging # ----------------------------------------------------------------------------