File takahe-settings.patch of Package takahe
--- a/manage.py 2022-12-23 21:42:43.509747327 +0100
+++ b/manage.py 2022-12-23 21:42:50.405782552 +0100
@@ -15,7 +15,7 @@
def main():
"""Run administrative tasks."""
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "takahe.settings")
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "takahe.takahe.settings")
# Guard against running tests in arbitrary environments
env_name = os.environ.get("TAKAHE_ENVIRONMENT", "development")
--- a/takahe/asgi.py 2022-12-23 21:42:43.513747348 +0100
+++ b/takahe/asgi.py 2022-12-23 21:42:50.405782552 +0100
@@ -11,6 +11,6 @@
from django.core.asgi import get_asgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "takahe.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "takahe.takahe.settings")
application = get_asgi_application()
--- a/takahe/settings.py 2022-12-23 21:42:43.513747348 +0100
+++ b/takahe/settings.py 2022-12-23 21:46:32.390917106 +0100
@@ -14,7 +14,7 @@
from takahe import __version__
-BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = '/srv/takahe'
class CacheBackendUrl(AnyUrl):
@@ -59,7 +59,7 @@
#: The currently running environment, used for things such as sentry
#: error reporting.
- ENVIRONMENT: Environments = "development"
+ ENVIRONMENT: Environments = "production"
#: Should django run in debug mode?
DEBUG: bool = False
@@ -99,7 +99,7 @@
ERROR_EMAILS: list[EmailStr] | None = None
MEDIA_URL: str = "/media/"
- MEDIA_ROOT: str = str(BASE_DIR / "media")
+ MEDIA_ROOT: str = os.path.join(BASE_DIR, "media")
MEDIA_BACKEND: MediaBackendUrl | None = None
#: S3 ACL to apply to all media objects when MEDIA_BACKEND is set to S3. If using a CDN
@@ -149,7 +149,7 @@
class Config:
env_prefix = "TAKAHE_"
- env_file = str(BASE_DIR / TAKAHE_ENV_FILE)
+ env_file = '/etc/sysconfig/takahe'
env_file_encoding = "utf-8"
# Case sensitivity doesn't work on Windows, so might as well be
# consistent from the get-go.
@@ -181,16 +181,16 @@
"django.contrib.staticfiles",
"corsheaders",
"django_htmx",
- "core",
- "activities",
- "api",
- "mediaproxy",
- "stator",
- "users",
+ "takahe.core",
+ "takahe.activities",
+ "takahe.api",
+ "takahe.mediaproxy",
+ "takahe.stator",
+ "takahe.users",
]
MIDDLEWARE = [
- "core.middleware.SentryTaggingMiddleware",
+ "takahe.core.middleware.SentryTaggingMiddleware",
"django.middleware.security.SecurityMiddleware",
"corsheaders.middleware.CorsMiddleware",
"whitenoise.middleware.WhiteNoiseMiddleware",
@@ -201,10 +201,10 @@
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"django_htmx.middleware.HtmxMiddleware",
- "core.middleware.HeadersMiddleware",
- "core.middleware.ConfigLoadingMiddleware",
- "api.middleware.ApiTokenMiddleware",
- "users.middleware.IdentityMiddleware",
+ "takahe.core.middleware.HeadersMiddleware",
+ "takahe.core.middleware.ConfigLoadingMiddleware",
+ "takahe.api.middleware.ApiTokenMiddleware",
+ "takahe.users.middleware.IdentityMiddleware",
]
ROOT_URLCONF = "takahe.urls"
@@ -212,7 +212,7 @@
TEMPLATES = [
{
"BACKEND": "django.template.backends.django.DjangoTemplates",
- "DIRS": [BASE_DIR / "templates"],
+ "DIRS": "DIRS": [os.path.join(BASE_DIR, "templates")],
"APP_DIRS": True,
"OPTIONS": {
"context_processors": [
@@ -220,7 +220,7 @@
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
- "core.context.config_context",
+ "takahe.core.context.config_context",
],
},
},
@@ -283,7 +283,7 @@
"django.contrib.staticfiles.finders.AppDirectoriesFinder",
]
-STATICFILES_DIRS = [BASE_DIR / "static"]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
@@ -291,7 +291,7 @@
WHITENOISE_MAX_AGE = 3600
-STATIC_ROOT = BASE_DIR / "static-collected"
+STATIC_ROOT = os.path.join(BASE_DIR, "static-collected")
ALLOWED_HOSTS = SETUP.ALLOWED_HOSTS
@@ -363,14 +363,14 @@
parsed = urllib.parse.urlparse(SETUP.MEDIA_BACKEND)
query = urllib.parse.parse_qs(parsed.query)
if parsed.scheme == "gs":
- DEFAULT_FILE_STORAGE = "core.uploads.TakaheGoogleCloudStorage"
+ DEFAULT_FILE_STORAGE = "takahe.core.uploads.TakaheGoogleCloudStorage"
GS_BUCKET_NAME = parsed.path.lstrip("/")
GS_QUERYSTRING_AUTH = False
if parsed.hostname is not None:
port = parsed.port or 443
GS_CUSTOM_ENDPOINT = f"https://{parsed.hostname}:{port}"
elif parsed.scheme == "s3":
- DEFAULT_FILE_STORAGE = "core.uploads.TakaheS3Storage"
+ DEFAULT_FILE_STORAGE = "takahe.core.uploads.TakaheS3Storage"
AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/")
AWS_QUERYSTRING_AUTH = False
AWS_DEFAULT_ACL = SETUP.MEDIA_BACKEND_S3_ACL
--- a/takahe/wsgi.py 2022-12-23 21:42:43.513747348 +0100
+++ b/takahe/wsgi.py 2022-12-23 21:42:50.409782573 +0100
@@ -11,6 +11,6 @@
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "takahe.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "takahe.takahe.settings")
application = get_wsgi_application()