Amélioration de la configuration à deux domaines

Author: fabienheureux

.gitignore

@@ -35,3 +35,4 @@ media
 
 _build
 .obsidian
+*.pem

Makefile

@@ -22,6 +22,10 @@ check:
 update-requirements:
 	$(PYTHON) -m pip install --no-deps -r requirements.txt -r dev-requirements.txt
 
+.PHONY: init-certs
+init-certs:
+	mkcert assistant.dev lvao.dev
+	mv *.pem ./nginx/certs
 
 .PHONY: init-venv
 init-venv:
@@ -61,6 +65,7 @@ run-airflow:
 .PHONY: run-django
 run-django:
 	rm -rf .parcel-cache
+	docker compose --profile lvao --profile proxy up -d
 	honcho start -f Procfile.dev
 
 run-all:

core/settings.py

@@ -35,7 +35,7 @@
 STIMULUS_DEBUG = decouple.config("STIMULUS_DEBUG", default=False, cast=bool)
 POSTHOG_DEBUG = decouple.config("POSTHOG_DEBUG", default=False, cast=bool)
 ALLOWED_HOSTS = decouple.config(
-    "ALLOWED_HOSTS", default="127.0.0.1,localhost", cast=str
+    "ALLOWED_HOSTS", default="lvao.dev,assistant.dev,127.0.0.1,localhost", cast=str
 ).split(",")
 
 # Application definition
@@ -382,7 +382,7 @@ def context_processors():
     "MATOMO_ID": decouple.config("ASSISTANT_MATOMO_ID", default=82, cast=int),
     "HOSTS": decouple.config(
         "ASSISTANT_HOSTS",
-        default="127.0.0.1:8000,0.0.0.0:8000,localhost:8000",
+        default="127.0.0.1:8000,0.0.0.0:8000,localhost:8000,assistant.deb",
         cast=str,
     ).split(","),
     "BASE_URL": decouple.config("ASSISTANT_BASE_URL", default="http://localhost:8000"),

docker-compose.yml

@@ -44,9 +44,9 @@ services:
       - 80:80
       - 443:443
     volumes:
-        - ./nginx/servers.conf:/etc/nginx/servers.conf
-        - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx/certs:/etc/nginx/ssl
+      - ./nginx/servers.conf:/etc/nginx/servers.conf
+      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx/certs:/etc/nginx/ssl
     profiles: [proxy]
   airflow-db:
     image: postgres:15

jinja2/tests/iframe.html

@@ -50,10 +50,10 @@ <h2>ASSISTANT</h2>
 
         {% if "noreferrer" in request.GET %}
         <h3>Avec referrerpolicy="noreferrer"</h3>
-        <script src="http://localhost:8000/iframe.js" data-debug-referrer></script>
+        <script src="https://assistant.dev/iframe.js" data-debug-referrer></script>
         {% else %}
         <h3>Par défaut</h3>
-        <script src="http://localhost:8001/iframe.js" data-testid='assistant'></script>
+        <script src="https://assistant.dev/iframe.js" data-testid='assistant'></script>
         {% endif %}
 
         <div>

nginx/certs/.gitkeep

@@ -7,11 +7,11 @@ map $http_cookie $no_cache {
 
 
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen [::]:443 ssl;
     server_name lvao.dev;
-    ssl_certificate /etc/nginx/ssl/_wildcard.lvao.dev.pem;
-    ssl_certificate_key /etc/nginx/ssl/_wildcard.lvao.dev-key.pem;
+    ssl_certificate /etc/nginx/ssl/assistant.dev+1.pem;
+    ssl_certificate_key /etc/nginx/ssl/assistant.dev+1-key.pem;
 
     location / {
         proxy_pass http://host.docker.internal:8000;
@@ -34,8 +34,8 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
     server_name assistant.dev;
-    ssl_certificate /etc/nginx/ssl/assistant.dev.pem;
-    ssl_certificate_key /etc/nginx/ssl/assistant.dev-key.pem;
+    ssl_certificate /etc/nginx/ssl/assistant.dev+1.pem;
+    ssl_certificate_key /etc/nginx/ssl/assistant.dev+1-key.pem;
 
     location / {
         proxy_pass http://host.docker.internal:8000;

nginx/servers.conf

@@ -14,7 +14,7 @@ def __call__(self, request):
     def _set_logged_in_cookie(self, request, response):
         """Set or update the 'logged-in' header based on authentication."""
         cookie_name = "logged_in"
-        if request.user.is_authenticated:
+        if hasattr(request, "user") and request.user.is_authenticated:
             response.set_cookie(cookie_name, "1")
         elif request.COOKIES.get(cookie_name):
             response.delete_cookie(cookie_name)