opewrt,haproxy,nginx,ejabberd,....

4 files changed, 44 insertions, 8 deletions

diff --git a/terminaldweller.com/ejabberd/docker-compose.yaml b/terminaldweller.com/ejabberd/docker-compose.yaml
index 9b93896..4a6f2fe 100644
--- a/terminaldweller.com/ejabberd/docker-compose.yaml
+++ b/terminaldweller.com/ejabberd/docker-compose.yaml
@@ -8,10 +8,12 @@ services:
       - "80:80"
       - "5222:5222"
       - "127.0.0.1:5269:5269"
-      - "5280:5280"
+      - "127.0.0.1:5280:5280"
       - "5443:5443"
       - "127.0.0.1:1883:1883"
       - "127.0.0.1:5080:5080"
+      - "127.0.0.1:3478:3478/udp"
+      - "127.0.0.1:5349:5349"
     restart: unless-stopped
     volumes:
       - ./ejabberd.yml:/home/ejabberd/conf/ejabberd.yml
diff --git a/terminaldweller.com/haproxy/docker-compose.yaml b/terminaldweller.com/haproxy/docker-compose.yaml
index 571fa7c..f24d17c 100644
--- a/terminaldweller.com/haproxy/docker-compose.yaml
+++ b/terminaldweller.com/haproxy/docker-compose.yaml
@@ -1,16 +1,29 @@
-version: "3.4" 
+version: "3.4"
 services:
   haproxy:
     image: haproxy
     ports:
       - "80:80"
       - "443:443"
+      - "5222:5222"
+      - "5280:5280"
+      - "5443:5443"
+      - "143:143"
+      - "993:993"
+      - "110:110"
+      - "995:995"
+      - "25:25"
+      - "465:465"
+      - "587:587"
     volumes:
       - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
       - ./certs:/usr/local/etc/certs:ro
     networks:
-      - haproxynet
+      - proxynet
+      - certnet
     restart: unless-stopped
+    cap_drop:
+      - ALL
   certbot:
     image: certbot
     build:
@@ -19,7 +32,7 @@ services:
       - "127.0.0.1:9080:80"
       - "127.0.0.1:9443:443"
     networks:
-      - haproxynet
+      - certnet
     # restart: unless-stopped
     volumes:
       - ./letsencrypt:/etc/letsencrypt
@@ -29,15 +42,26 @@ services:
     entrypoint: ["/certbot-entrypoint.sh"]
     environment:
       - DOMAIN=chat.terminaldweller.com
-      - EMAIL=thabogre@gmail.com
+      - EMAIL=devi@mail.terminaldweller.com
   nginx:
     image: nginx
     ports:
       - "127.0.0.1:8080:80"
     networks:
-      - haproxynet
+      - certnet
     restart: unless-stopped
     volumes:
       - ./webroot:/usr/share/nginx/html
+  udpproxy:
+    image: nginx
+    ports:
+      - "127.0.0.1:3478:3478/udp"
+      - "127.0.0.1:5349:5349/udp"
+    networks:
+      - proxynet
+    restart: unless-stopped
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
 networks:
-  haproxynet:
+  proxynet:
+  certnet:
diff --git a/terminaldweller.com/haproxy/haproxy.cfg b/terminaldweller.com/haproxy/haproxy.cfg
index f406de4..6bec717 100644
--- a/terminaldweller.com/haproxy/haproxy.cfg
+++ b/terminaldweller.com/haproxy/haproxy.cfg
@@ -132,7 +132,6 @@ frontend mail-submission
   acl mail-host-s req.ssl_sni -i mail.terminaldweller.com
   use_backend mail-backend-submission if mail-host-s
 
-
 #Backends
 backend certbot-backend
   mode http
diff --git a/terminaldweller.com/haproxy/nginx.conf b/terminaldweller.com/haproxy/nginx.conf
new file mode 100644
index 0000000..6df1e2c
--- /dev/null
+++ b/terminaldweller.com/haproxy/nginx.conf
@@ -0,0 +1,11 @@
+stream {
+  server {
+    listen 3478 udp;
+    proxy_pass 130.185.121.80:3478;
+  }
+
+  server {
+    listen 5349 udp;
+    proxy_pass 130.185.121.80:5349;
+  }
+}