Подготовлен переход dev на host nginx и убраны лишние переменные из workflow

Author: Toksi86

.github/workflows/dev-ci.yml

@@ -33,17 +33,20 @@ jobs:
               echo "DATABASE_HOST=${{ secrets.DEV_DATABASE_HOST }}" >> .env &&
               echo "DATABASE_PORT=${{ secrets.DEV_DATABASE_PORT }}" >> .env &&
               
-              echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
-              echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
-              echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
-              echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
+
               echo "SELECTEL_ACCOUNT_ID=${{ secrets.SELECTEL_ACCOUNT_ID }}" >> .env &&
               echo "SELECTEL_CONTAINER_NAME=${{ secrets.SELECTEL_CONTAINER_NAME }}" >> .env &&
               echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
               echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
               
-              echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
-
+              echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
               echo "UNISENDER_GO_API_KEY=${{ secrets.UNISENDER_GO_API_KEY }}" >> .env &&
               
-              docker compose -f docker-compose.dev-ci.yml up -d --build --force-recreate
+              docker compose -f docker-compose.dev-ci.yml up -d --build --force-recreate --remove-orphans &&
+
+              install -d /etc/nginx/procollab/includes &&
+              install -m 644 deploy/nginx/host/includes/proxy_app.inc /etc/nginx/procollab/includes/proxy_app.inc &&
+              install -m 644 deploy/nginx/host/dev/dev.procollab.ru /etc/nginx/sites-available/dev.procollab.ru &&
+              ln -sfn /etc/nginx/sites-available/dev.procollab.ru /etc/nginx/sites-enabled/dev.procollab.ru &&
+              nginx -t &&
+              systemctl reload nginx

.github/workflows/release-ci.yml

@@ -115,15 +115,10 @@ jobs:
               echo "DATABASE_PORT=${{ secrets.DATABASE_PORT }}" >> .env &&
               
               echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
-              echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
-              echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
-              echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
               echo "SELECTEL_ACCOUNT_ID=${{ secrets.SELECTEL_ACCOUNT_ID }}" >> .env &&
               echo "SELECTEL_CONTAINER_NAME=${{ secrets.SELECTEL_CONTAINER_NAME }}" >> .env &&
               echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
               echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
-              
-              echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
 
               echo "UNISENDER_GO_API_KEY=${{ secrets.UNISENDER_GO_API_KEY }}" >> .env &&
               

deploy/nginx/host/dev/dev.procollab.ru

@@ -0,0 +1,26 @@
+server {
+    listen 80;
+    server_name dev.procollab.ru;
+
+    location ^~ /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+        default_type "text/plain";
+        try_files $uri =404;
+    }
+
+    location / {
+        return 301 https://$host$request_uri;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name dev.procollab.ru;
+
+    ssl_certificate     /etc/letsencrypt/live/dev.procollab.ru-0001/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/dev.procollab.ru-0001/privkey.pem;
+
+    location / {
+        include /etc/nginx/procollab/includes/proxy_app.inc;
+    }
+}

deploy/nginx/host/includes/proxy_app.inc

@@ -0,0 +1,15 @@
+proxy_pass http://127.0.0.1:8000;
+
+proxy_http_version 1.1;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection "upgrade";
+
+proxy_set_header Host $host;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
+
+proxy_read_timeout 600s;
+proxy_send_timeout 600s;
+proxy_connect_timeout 60s;
+proxy_buffering off;

docker-compose.dev-ci.yml

@@ -16,51 +16,6 @@ services:
     ports:
       - "127.0.0.1:8000:8000" 
 
-  grafana:
-    image: grafana/grafana:latest
-    restart: unless-stopped
-    expose:
-      - 3000
-    volumes:
-      - grafana-data:/var/lib/grafana
-      - grafana-configs:/etc/grafana
-    environment:
-      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana
-      - GF_SERVER_SERVE_FROM_SUB_PATH=true
-
-  prometheus:
-    image: prom/prometheus:v2.36.0
-    restart: unless-stopped
-    expose:
-      - 9090
-    volumes:
-      - prom-data:/prometheus
-      - ./prometheus:/etc/prometheus
-
-  #nginx:
-  #  restart: unless-stopped
-  #  build: ./nginx
-  #  depends_on:
-  #    - web
-  #  ports:
-  #    - 8000:80
-
-  loki:
-    image: grafana/loki:2.9.0
-    restart: unless-stopped
-    ports:
-      - "3100:3100"
-    command: -config.file=/etc/loki/local-config.yaml
-
-  promtail:
-    image: grafana/promtail:2.9.0
-    restart: unless-stopped
-    volumes:
-      - /var/log:/var/log
-      - ./promtail:/etc/promtail
-      - ./log:/procollab/log
-    command: -config.file=/etc/promtail/config.yml
-
   redis:
     image: redis:latest
     restart: unless-stopped
@@ -85,12 +40,5 @@ services:
       - web
     volumes:
       - .:/procollab
-
 volumes:
-  grafana-data:
-  grafana-configs:
-  prom-data:
-  prom-configs:
-  log:
-  promtail:
   redis-data: