Merge branch 'multi-instance' into features/docker-apub

Author: azmeuk

Makefile

@@ -44,7 +44,6 @@ createDB:
 	find . -path "*/migrations/*.pyc" -exec rm --force "{}" +
 	make updatedb
 	make migrate
-	python3 manage.py loaddata initial_data
 
 # Mise à jour des fichiers de langue
 lang:

pod/main/apps.py

@@ -7,6 +7,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.management import call_command
 
 import json
 
@@ -15,17 +16,16 @@
 PORT = os.getenv("POD_PORT", 8000)
 
 
-def init_site(sender, **kwargs):
+def load_data(sender, **kwargs):
     from django.contrib.sites.models import Site
 
+    call_command("loaddata", "initial_data.json")
+
     domain = f"{INSTANCE}.localhost:{PORT}"
-    Site.objects.update_or_create(
-        id=settings.SITE_ID,
-        defaults={
-            "domain": domain,
-            "name": domain,
-        }
-    )
+    site, _ = Site.objects.update_or_create(id=settings.SITE_ID)
+    site.domain = domain
+    site.name = domain
+    site.save()
 
 
 def create_missing_pages(sender, **kwargs) -> None:
@@ -178,4 +178,4 @@ def ready(self):
         post_migrate.connect(create_missing_conf, sender=self)
         post_migrate.connect(create_missing_pages, sender=self)
         post_migrate.connect(create_first_block, sender=self)
-        post_migrate.connect(init_site, sender=self)
+        post_migrate.connect(load_data, sender=self)

pod/main/fixtures/initial_data.json

@@ -1,12 +1,4 @@
 [
-  {
-    "model": "sites.site",
-    "pk": 1,
-    "fields": {
-      "domain": "pod.localhost:8000",
-      "name": "pod.localhost:8000"
-    }
-  },
   {
     "pk": 1,
     "model": "main.configuration",