Merge branch 'master' into mineport

docker-compose.yml

@@ -8,11 +8,13 @@ services:
     ports:
       - "80:80"
       - "443:443"
+      - "5222:5222"
+      - "5223:5223"
       - "25566:25566"
     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
+      - ../acme:/var/lib/angie/acme
+      - ../auth.basic:/etc/angie/auth.basic:ro
       - /var/www/html:/var/www/html

http.d/mail.dended.ru.conf

@@ -1,13 +0,0 @@
-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/minecraft.dended.ru.conf

@@ -0,0 +1,10 @@
+
+        upstream amogoose {
+            server 192.168.1.64:25566; 
+        }
+
+        server {
+	    server_name minecraft.dended.ru;
+            listen 25566;
+            proxy_pass amogoose;
+        }

stream.d/xmmp.dended.ru.conf

@@ -1,19 +1,15 @@
-    stream {
-        upstream ejabberd_c2s {
-            server 192.168.1.94:5222; # Or ejabberd's IP and port
-        }
+    upstream ejabberd_c2s { server 192.168.1.94:5222; }
+    upstream ejabberd_s2s { server 192.168.1.94:5269; }
 
-        server {
-            listen 5222; # Client-to-server port
-            proxy_pass ejabberd_c2s;
-            proxy_protocol on; # If ejabberd is configured to use Proxy Protocol
-        }
+    server {
+        listen 5222;
+        proxy_pass ejabberd_c2s;
+        proxy_protocol on;
+        proxy_timeout 1h;
+    }
 
-        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
-        }
+    server {
+        listen 5269;
+        proxy_pass ejabberd_s2s;
+        proxy_timeout 1h;
     }