From c0da3453c03471c8fd04394929eb997e93efd88b Mon Sep 17 00:00:00 2001 From: Alexander Kyimpopkin <39439486+alxkp@users.noreply.github.com> Date: Sun, 17 Sep 2023 10:52:52 -0400 Subject: [PATCH] Created fly configuration --- backend/.dockerignore | 3 +++ backend/fly.toml | 28 ++++++++++++++++++++++++++++ backend/redis/fly.toml | 18 ++++++++++++++++++ backend/setup.cfg | 3 ++- frontend/fly.toml | 20 ++++++++++++++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 backend/fly.toml create mode 100644 backend/redis/fly.toml create mode 100644 frontend/fly.toml diff --git a/backend/.dockerignore b/backend/.dockerignore index 1e201bdcf..09536d114 100644 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -14,3 +14,6 @@ LICENSE .coverage **/__pycache__/ tests/ + +# Fly config +fly.toml diff --git a/backend/fly.toml b/backend/fly.toml new file mode 100644 index 000000000..ca01f5dfe --- /dev/null +++ b/backend/fly.toml @@ -0,0 +1,28 @@ +# fly.toml app configuration file generated for clubs-backend on 2023-09-01T14:48:55-04:00 +# +# See https://fly.io/docs/reference/configuration/ for information about how to use this file. +# + +app = "clubs-backend" +primary_region = "ewr" +# console_command = "/code/manage.py shell" + +# [build] + # image = "pennlabs/penn-clubs-backend:latest" + +# [deploy] + # strategy = "bluegreen" + # release_command = "python manage.py migrate" + +[env] + # PORT = "80" + REDIS_HOST = "redis-clubs.internal" + # DOMAINS = "clubs-backend.internal,penn-clubs-frontend.internal,penn-clubs-frontend.fly.dev" + DOMAINS = "*" + +[http_service] + internal_port = 80 + force_https = false + auto_stop_machines = false + auto_start_machines = true + min_machines_running = 1 diff --git a/backend/redis/fly.toml b/backend/redis/fly.toml new file mode 100644 index 000000000..cdcd987f7 --- /dev/null +++ b/backend/redis/fly.toml @@ -0,0 +1,18 @@ +# fly.toml app configuration file generated for redis-clubs on 2023-09-14T21:50:56-04:00 +# +# See https://fly.io/docs/reference/configuration/ for information about how to use this file. +# + +app = "redis-clubs" +primary_region = "ewr" + +[build] + image = "redis:7.2.1" + +[[mounts]] + source = "redis_clubs" + destination = "/data" + +[metrics] + port = 9091 + path = "/metrics" diff --git a/backend/setup.cfg b/backend/setup.cfg index 6db8439c7..8cc2f1a66 100644 --- a/backend/setup.cfg +++ b/backend/setup.cfg @@ -18,7 +18,8 @@ omit = */tests/*, */migrations/*, */settings/*, */wsgi.py, */apps.py, */.venv/*, source = . [uwsgi] -http-socket = :80 +http-socket = [::]:80 +# https-socket = [::]:443 chdir = /app/ module = pennclubs.wsgi:application master = true diff --git a/frontend/fly.toml b/frontend/fly.toml new file mode 100644 index 000000000..91582e998 --- /dev/null +++ b/frontend/fly.toml @@ -0,0 +1,20 @@ +# fly.toml app configuration file generated for penn-clubs-frontend on 2023-09-01T14:14:37-04:00 +# +# See https://fly.io/docs/reference/configuration/ for information about how to use this file. +# + +app = "penn-clubs-frontend" +primary_region = "ewr" + +# [build] +# image = "pennlabs/penn-clubs-frontend:latest" + +[env] + DOMAIN = "clubs-backend.internal" + +[http_service] + internal_port = 3000 + force_https = true + auto_stop_machines = false + auto_start_machines = true + min_machines_running = 1