modified

production/nginx/docker-compose.yml

@@ -9,23 +9,28 @@ services:
     hostname: nginx
     container_name: nginx
     restart: always
-#    entrypoint:
-#      - /bin/bash
-#      - /etc/nginx/entrypoint.sh
+    entrypoint:
+      - /bin/bash
+      - /etc/nginx/entrypoint.sh
     volumes:
       - ./nginx:/etc/nginx
       - /opt/docker/secure/fullchain.pem:/etc/nginx/hatthieves.crt:ro
       - /opt/docker/secure/privkey.pem:/etc/nginx/hatthieves.key:ro
       - /root/letsencrypt/hatthieves.com/fullchain.pem:/etc/nginx/hatthieves.com.crt:ro
       - /root/letsencrypt/hatthieves.com/privkey.pem:/etc/nginx/hatthieves.com.key:ro
-      - ./nginx/nginx.conf:/usr/local/nginx/conf/nginx.conf
+      - /root/letsencrypt/hatthieves.co/fullchain.pem:/etc/nginx/hatthieves.co.crt:ro
+      - /root/letsencrypt/hatthieves.co/privkey.pem:/etc/nginx/hatthieves.co.key:ro
+      - ./nginx/nginx.conf:/usr/local/nginx/conf/nginx.conf:ro
       - ./logs:/usr/local/nginx/logs
+      - ./html:/usr/local/nginx/html:ro
     ports:
       - "80:80"
 #      - "2001:ba0:1800:80e0::1:80:80"
       - "443:443"
 #      - "2001:ba0:1800:80e0::1:443:443"
       - "443:443/udp"
+      - "1936:1936"
+      - "1936:1936/udp"
 #      - "2001:ba0:1800:80e0::1:443:443/udp"
 #    cap_add:
 #      - NET_BIND_SERVICE
@@ -39,7 +44,6 @@ services:
       mynet:
         ipv4_address: 172.10.0.101
         ipv6_address: 2001:db8:2::101
-      gollum:
       haraka:
       gitea:
       pad:
@@ -48,19 +52,14 @@ services:
       registry:
       pleroma:
       ipfs:
-      doom:
       nextcloud:
       magicworld:
       peertube:
       g:
-      pleroma-test:
       icecast2:
-      gnusocial:
       jitsi:
-      tpmw:
       wordpress:
       familyark:
-      crossposter:
       kamailio:
       privatebin:
       glances:
@@ -71,14 +70,16 @@ services:
       nms:
       dvwa:
       bbb:
-      traefik:
       elk:
       codimd:
-      netdata:
       youtube:
       mumbleweb:
       p2p:
       webdav:
+      igunublue:
+      salva:
+      doom:
+      wtorrent:
 
 networks:
   mynet:
@@ -89,10 +90,6 @@ networks:
       - subnet: 172.10.0.0/24
       - subnet: 2001:db8:2::/64
 
-  gollum:
-    external:
-      name: gollum_mynet
-
   haraka:
     external:
       name: harakawildduck_mynet
@@ -125,10 +122,6 @@ networks:
     external:
       name: ipfs_mynet
 
-  doom:
-    external:
-      name: web_mynet
-
   nextcloud:
     external:
       name: nextcloud_mynet
@@ -145,26 +138,14 @@ networks:
     external:
       name: g_mynet
 
-  pleroma-test:
-    external:
-      name: pleromatest_mynet
-
   icecast2:
     external:
       name: icecast2_mynet
 
-  gnusocial:
-    external:
-      name: gnusocial_mynet
-
   jitsi:
     external:
       name: jitsimeet_mynet
 
-  tpmw:
-    external:
-      name: magicworldphoenix_mynet
-
   wordpress:
     external:
       name: wordpress_mynet
@@ -173,10 +154,6 @@ networks:
     external:
       name: familyark_mynet
 
-  crossposter:
-    external:
-      name: crossposter_mynet
-
   kamailio:
     external:
       name: kamailio_mynet
@@ -217,10 +194,6 @@ networks:
     external:
       name: bigbluebutton_mynet
 
-  traefik:
-    external:
-      name: traefik_mynet
-
   elk:
     external:
       name: elk_mynet
@@ -229,10 +202,6 @@ networks:
     external:
       name: codimd_mynet
 
-  netdata:
-    external:
-      name: netdata_mynet
-
   youtube:
     external:
       name: youtube_mynet
@@ -248,3 +217,19 @@ networks:
   webdav:
     external:
       name: webdav_mynet
+
+  igunublue:
+    external:
+      name: igunublue_mynet
+
+  salva:
+    external:
+      name: salva_mynet
+
+  doom:
+    external:
+      name: web_mynet
+
+  wtorrent:
+    external:
+      name: wtorrent_mynet