Răsfoiți Sursa

Proxy was added

Denis V. Dedkov 1 lună în urmă
părinte
comite
c3678db541
4 a modificat fișierele cu 87 adăugiri și 24 ștergeri
  1. 36 23
      angie.conf
  2. 3 1
      docker-compose.yml
  3. 28 0
      http.conf
  4. 20 0
      stream.conf

+ 36 - 23
angie.conf

@@ -1,27 +1,40 @@
-resolver 8.8.8.8 ipv6=off; # требуется для директивы 'acme_client'
-acme_client dended https://acme-v02.api.letsencrypt.org/directory;
+user  angie;
+worker_processes  auto;
+worker_rlimit_nofile 65536;
 
-server {
-      listen 80;
-      return 301 https://$host$request_uri;
+error_log  /var/log/angie/error.log notice;
+pid        /run/angie/angie.pid;
+
+events {
+    worker_connections  65536;
+}
+
+http {
+    include       /etc/angie/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    log_format extended '$remote_addr - $remote_user [$time_local] "$request" '
+                        '$status $body_bytes_sent "$http_referer" rt="$request_time" '
+                        '"$http_user_agent" "$http_x_forwarded_for" '
+                        'h="$host" sn="$server_name" ru="$request_uri" u="$uri" '
+                        'ucs="$upstream_cache_status" ua="$upstream_addr" us="$upstream_status" '
+                        'uct="$upstream_connect_time" urt="$upstream_response_time"';
+
+    access_log  /var/log/angie/access.log  main;
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+    gzip  on;
+
+    include /etc/angie/http.d/*.conf;
 }
 
-server {
-      server_name n8n.dended.ru;
-      acme dended;
-
-      location / {
-        proxy_pass http://n8n:5678;
-	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;
-      }
-
-      listen 443 ssl;
-      ssl_certificate $acme_cert_dended;
-      ssl_certificate_key $acme_cert_key_dended;
+stream {
+    include /etc/angie/stream.d/*.conf;
 }

+ 3 - 1
docker-compose.yml

@@ -21,7 +21,9 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - ./angie.conf:/etc/angie/http.d/default.conf:ro
+      - ./angie.conf:/etc/angie/angie.conf:ro
+      - ./http.conf:/etc/angie/http.d/default.conf:ro
+      - ./stream.conf:/etc/angie/stream.d/default.conf:ro
       - ./acme:/var/lib/angie/acme
     networks:
       - n8n_network

+ 28 - 0
http.conf

@@ -0,0 +1,28 @@
+resolver 8.8.8.8 ipv6=off; # требуется для директивы 'acme_client'
+acme_client dended https://acme-v02.api.letsencrypt.org/directory;
+
+server {
+      listen 80;
+      return 301 https://$host$request_uri;
+}
+
+server {
+      server_name n8n.dended.ru;
+      acme dended;
+
+      location / {
+        proxy_pass http://n8n:5678;
+	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;
+      }
+
+      listen 8443 ssl;
+      ssl_certificate $acme_cert_dended;
+      ssl_certificate_key $acme_cert_key_dended;
+}
+

+ 20 - 0
stream.conf

@@ -0,0 +1,20 @@
+map $ssl_preread_server_name $upstream {
+    dended.ddns.net ocserv_backend;
+    n8n.dended.ru n8n_backend;
+    default n8n_backend;
+}
+
+upstream ocserv_backend {
+    server 172.17.0.1:4443;
+}
+
+upstream n8n_backend {
+    server 127.0.0.1:8443;
+}
+
+server {
+    listen 443;
+    ssl_preread on;
+    proxy_pass $upstream;
+}
+