Skip to content

Commit

Permalink
feat/fix: rebased branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jadolg committed Jul 20, 2024
1 parent 41b6d05 commit fe17749
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 245 deletions.
4 changes: 0 additions & 4 deletions app/shadowmere/config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@

WSGI_APPLICATION = "config.wsgi.application"

DATABASES = {"default": env.db()}

AUTH_PASSWORD_VALIDATORS = [
{
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
Expand Down Expand Up @@ -174,8 +172,6 @@

STATIC_URL = "/static/"

STATIC_ROOT = "./static_files/"

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

HUEY = {
Expand Down
12 changes: 12 additions & 0 deletions app/shadowmere/config/settings/dev.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
from .base import * # noqa

RATELIMIT_ENABLE = False

DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": BASE_DIR / "db.sqlite3",
}
}

CSRF_TRUSTED_ORIGINS = [
"http://127.0.0.1:8000",
"http://localhost:8000",
]
15 changes: 15 additions & 0 deletions app/shadowmere/config/settings/prod.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,18 @@
traces_sample_rate=0.01,
send_default_pii=True,
)

DATABASES = {
"default": {
"ENGINE": "django_prometheus.db.backends.postgresql",
"NAME": "shadowmere",
"USER": "shadowmere",
"PASSWORD": env("POSTGRES_PASSWORD"),
"HOST": "db",
}
}

CSRF_TRUSTED_ORIGINS = [
"https://shadowmere.akiel.dev",
"https://shadowmere.xyz",
]
7 changes: 4 additions & 3 deletions app/shadowmere/config/urls.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
from django.contrib import admin
from django.urls import include, path
from rest_framework import routers

from apps.proxylist.views import (
Base64SubViewSet,
CountryCodeViewSet,
Expand All @@ -9,9 +13,6 @@
list_proxies,
qr_code,
)
from django.contrib import admin
from django.urls import include, path
from rest_framework import routers

router = routers.DefaultRouter()
router.register(r"proxies", ProxyViewSet)
Expand Down
Empty file removed shadowmere/celery.py
Empty file.
238 changes: 0 additions & 238 deletions shadowmere/settings/base.py

This file was deleted.

0 comments on commit fe17749

Please sign in to comment.