diff options
| author | Andrew Godwin | 2022-11-22 17:06:32 -0700 |
|---|---|---|
| committer | Andrew Godwin | 2022-11-22 11:59:34 -0700 |
| commit | 05ed5989e3436108f9a7bd443b0f79b7ee407f26 (patch) | |
| tree | 0c59502ae81a45e13f0c1bf1f3f50a09fb43b162 | |
| parent | b7c7c66013557e093a838a84b9b0e7cbaf05e12a (diff) | |
| download | takahe-05ed5989e3436108f9a7bd443b0f79b7ee407f26.tar.gz takahe-05ed5989e3436108f9a7bd443b0f79b7ee407f26.tar.bz2 takahe-05ed5989e3436108f9a7bd443b0f79b7ee407f26.zip | |
Better way to initialise things on setup.
| -rw-r--r-- | takahe/settings/base.py | 2 | ||||
| -rw-r--r-- | takahe/settings/production.py | 2 | ||||
| -rw-r--r-- | takahe/settings/testing.py | 2 | ||||
| -rw-r--r-- | users/apps.py | 18 |
4 files changed, 14 insertions, 10 deletions
diff --git a/takahe/settings/base.py b/takahe/settings/base.py index 660ec9f..0ab3035 100644 --- a/takahe/settings/base.py +++ b/takahe/settings/base.py @@ -118,5 +118,3 @@ AUTO_ADMIN_EMAIL: Optional[str] = None STATOR_TOKEN: Optional[str] = None SENTRY_ENABLED = False - -IN_TESTS = False diff --git a/takahe/settings/production.py b/takahe/settings/production.py index b23093f..b1034ef 100644 --- a/takahe/settings/production.py +++ b/takahe/settings/production.py @@ -10,6 +10,8 @@ DEBUG = bool(os.environ.get("TAKAHE__SECURITY_HAZARD__DEBUG", False)) # TODO: Allow better setting of allowed_hosts, if we need to ALLOWED_HOSTS = ["*"] +CONN_MAX_AGE = 60 + ### User-configurable options, pulled from the environment ### # Secret key diff --git a/takahe/settings/testing.py b/takahe/settings/testing.py index c0af28b..39fda96 100644 --- a/takahe/settings/testing.py +++ b/takahe/settings/testing.py @@ -3,6 +3,4 @@ from .base import * # noqa # Fixed secret key SECRET_KEY = "testing_secret" -IN_TESTS = True - MAIN_DOMAIN = "example.com" diff --git a/users/apps.py b/users/apps.py index 86a8eb3..67183ad 100644 --- a/users/apps.py +++ b/users/apps.py @@ -1,14 +1,20 @@ from django.apps import AppConfig -from django.conf import settings +from django.db.models.signals import post_migrate class UsersConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" name = "users" - def ready(self) -> None: - if not settings.IN_TESTS: - # Generate the server actor keypair if needed - from users.models import SystemActor + def data_init(self, **kwargs): + """ + Runs after migrations or flushes to insert anything we need for first + boot (or post upgrade). + """ + # Generate the server actor keypair if needed + from users.models import SystemActor + + SystemActor.generate_keys_if_needed() - SystemActor.generate_keys_if_needed() + def ready(self) -> None: + post_migrate.connect(self.data_init, sender=self) |