:Merge branch 'master' of http://192.168.1.77:3000/ded/dended-angie

README.md

@@ -5,5 +5,5 @@
 Clone repository, then run docker image:
 
 ```
-docker run --restart unless-stopped --name angie -v $(pwd)/dended-angie:/etc/angie/http.d:ro -v $(pwd)/acme:/var/lib/angie/acme -v /etc/nginx/auth.basic:/etc/angie/auth.basic:ro -p 80:80 -p 443:443 -d docker.angie.software/angie:minimal
+docker run --restart unless-stopped --name angie -v $(pwd)/dended-angie/angie.conf:/etc/angie/angie.conf:ro -v $(pwd)/dended-angie/http.d:/etc/angie/http.d:ro -v $(pwd)/dended-angie/stream.d:/etc/angie/stream.d:ro -v $(pwd)/acme:/var/lib/angie/acme -v $(pwd)/auth.basic:/etc/angie/auth.basic:ro -v /var/www/html:/var/www/html -p 80:80 -p 443:443 docker.angie.software/angie:minimal
 ```

angie.conf

@@ -0,0 +1,42 @@
+user  angie;
+worker_processes  auto;
+worker_rlimit_nofile 65536;
+
+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;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    gzip  on;
+
+    include /etc/angie/http.d/*.conf;
+}
+
+stream {
+    include /etc/angie/stream.d/*.conf;
+}
+

docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.8'
+
+services:
+  angie:
+    image: docker.angie.software/angie:minimal
+    container_name: angie
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./angie.conf:/etc/angie/angie.conf:ro
+      - ./http.d:/etc/angie/http.d:ro
+      - ./stream.d:/etc/angie/stream.d:ro
+      - ./acme:/var/lib/angie/acme
+      - ./auth.basic:/etc/angie/auth.basic:ro
+      - /var/www/html:/var/www/html

http.d/mail.dended.ru.conf

@@ -0,0 +1,13 @@
+server {
+      server_name webmail.dended.ru;
+      acme dended;
+
+      location / {
+               proxy_pass http://192.168.1.94:8001;
+      }
+
+      listen 443 ssl;
+      ssl_certificate $acme_cert_dended;
+      ssl_certificate_key $acme_cert_key_dended;
+}
+

stream.d/xmmp.dended.ru.conf

@@ -0,0 +1,19 @@
+    stream {
+        upstream ejabberd_c2s {
+            server 192.168.1.94:5222; # Or ejabberd's IP and port
+        }
+
+        server {
+            listen 5222; # Client-to-server port
+            proxy_pass ejabberd_c2s;
+            proxy_protocol on; # If ejabberd is configured to use Proxy Protocol
+        }
+
+        server {
+            listen 5223 ssl; # Client-to-server TLS port
+            proxy_pass ejabberd_c2s;
+            ssl_certificate $acme_cert_dended;
+            ssl_certificate_key $acme_cert_key_dended;
+            proxy_protocol on; # If ejabberd is configured to use Proxy Protocol
+        }
+    }