feat: Datanar with docker (it`s experiment 3.0)

Gray-Advantage · Jul 19, 2024 · 27647d5 · 27647d5
1 parent 1f7384a
commit 27647d5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/.env.example b/.env.example
@@ -24,6 +24,7 @@ DATANAR_REDIS_PORT=6379
 DATANAR_REDIS_DB=0
 
 DATANAR_CERTBOT_DEBUG=1
+DATANAR_CERTBOT_STAGING=0
 DATANAR_CERTBOT_EMAIL=exampleac@yandex.ru
 
 DJANGO_LOG_FILE_PATH=/path/to/log/file

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,13 +30,14 @@ services:
     environment:
       DEBUG: ${DATANAR_CERTBOT_DEBUG}
       CERTBOT_EMAIL: ${DATANAR_CERTBOT_EMAIL}
-      STAGING: ${DATANAR_CERTBOT_DEBUG}
+      STAGING: ${DATANAR_CERTBOT_STAGING}
     restart: always
     ports:
       - "80:80"
       - "443:443"
     volumes:
       - ./nginx-confs/datanar_prod.conf:/etc/nginx/user_conf.d/gray-advantage.conf
+      - ./nginx-confs/robots.txt:/datanar/static/robots.txt
       - django_media_volume:/datanar/media
       - django_static_volume:/datanar/static
       - nginx_certificates_volume:/etc/letsencrypt

diff --git a/nginx-confs/datanar_prod.conf b/nginx-confs/datanar_prod.conf
@@ -3,6 +3,21 @@ server {
     listen [::]:80 default_server reuseport;
     server_name _ gray-advantage.ru www.gray-advantage.ru;
 
+    location / {
+        return 301 https://$http_host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl default_server reuseport;
+    listen [::]:443 ssl default_server reuseport;
+    server_name gray-advantage.ru www.gray-advantage.ru;
+
+    ssl_certificate /etc/letsencrypt/live/gray-advantage.ru/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/gray-advantage.ru/privkey.pem;
+    ssl_trusted_certificate /etc/letsencrypt/live/gray-advantage.ru/chain.pem;
+    ssl_dhparam /etc/letsencrypt/dhparams/dhparam.pem;
+
     location / {
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -30,18 +45,4 @@ server {
     location /media/ {
         root /datanar;
     }
-}
-
-server {
-    listen 443 ssl default_server reuseport;
-    listen [::]:443 ssl default_server reuseport;
-    server_name gray-advantage.ru www.gray-advantage.ru;
-
-    ssl_certificate /etc/letsencrypt/live/gray-advantage.ru/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/gray-advantage.ru/privkey.pem;
-    ssl_trusted_certificate /etc/letsencrypt/live/gray-advantage.ru/chain.pem;
-    ssl_dhparam /etc/letsencrypt/dhparams/dhparam.pem;
-
-    return 200 'Let\'s Encrypt certificate successfully installed!';
-    add_header Content-Type text/plain;
 }