From 502fd1b701dee0d574b9da102b07bc04c25c56b0 Mon Sep 17 00:00:00 2001
From: ctmbl <mabileau.clement@gmail.com>
Date: Sat, 27 Apr 2024 01:26:16 +0200
Subject: [PATCH] Add nginx config and docker updates for dev.iscsc.fr

---
 .gitignore         |  2 +-
 docker-compose.yml |  3 ++-
 nginx.conf         | 30 +++++++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ab7933..9d8dc55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ certbot/*
 
 # hugo build
 src/public
-build/blog/*
+build/*
 
 # python
 **/__pycache__
diff --git a/docker-compose.yml b/docker-compose.yml
index 85235eb..461f4b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,8 @@ services:
       - ./certbot/www:/var/www/certbot/:ro
       - ./certbot/conf/:/etc/nginx/ssl/:ro
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./build/blog:/blog:rw
+      - ./build/blog:/blog/prod:rw
+      - ./build/dev:/blog/dev:rw
 
   certbot:
     image: certbot/certbot:latest
diff --git a/nginx.conf b/nginx.conf
index d298048..14e2494 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -17,7 +17,7 @@ http {
         listen 80;
         listen [::]:80;
 
-        server_name www.iscsc.fr iscsc.fr;
+        server_name dev.iscsc.fr www.iscsc.fr iscsc.fr;
 
         location /.well-known/acme-challenge/ {
             root /var/www/certbot;
@@ -28,17 +28,41 @@ http {
         }
     }
 
+    server {
+        listen 443 ssl;
+        listen [::]:443 ssl;
+	http2 on;
+
+        server_name dev.iscsc.fr;
+
+        ssl_certificate /etc/nginx/ssl/live/dev.iscsc.fr/fullchain.pem;
+        ssl_certificate_key /etc/nginx/ssl/live/dev.iscsc.fr/privkey.pem;
+
+        root /blog/dev; #Absolute path to where your hugo site is
+        index index.html; # Hugo generates HTML
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+
+        # redirect server error pages to the static page /50x.html
+        error_page 500 502 503 504 /50x.html;
+        location = /50x.html {
+            root /usr/share/nginx/html;
+        }
+    }
+
 
     server {
         listen 443 default_server ssl http2;
         listen [::]:443 ssl http2;
 
-        server_name www.iscsc.fr iscsc.fr;
+        server_name iscsc.fr;
 
         ssl_certificate /etc/nginx/ssl/live/iscsc.fr/fullchain.pem;
         ssl_certificate_key /etc/nginx/ssl/live/iscsc.fr/privkey.pem;
 
-        root /blog; #Absolute path to where your hugo site is
+        root /blog/prod; #Absolute path to where your hugo site is
         index index.html; # Hugo generates HTML
 
         location / {