Update Channels

NOXCIS · Nov 13, 2023 · 13cd7ae · 13cd7ae
1 parent 6a03378
commit 13cd7ae
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 16 deletions.
diff --git a/Channels/requirements.txt b/Channels/requirements.txt
@@ -8,12 +8,12 @@ coverage
 dnspython
 email-validator
 eventlet==0.33.3
-Flask==2.3.2
+Flask==2.3.3
 Flask-Bcrypt
 Flask-Login
 flask-marshmallow
 Flask-SocketIO
-Flask-SQLAlchemy
+Flask-SQLAlchemy==3.1.1
 Flask-WTF
 greenlet
 idna
@@ -29,7 +29,7 @@ mypy-extensions
 packaging
 Pillow
 pluggy
-psycopg2
+psycopg2==2.9.9
 pycparser
 pyparsing
 pytest
@@ -43,6 +43,6 @@ typed-ast
 typing-extensions
 urllib3
 wcwidth
-Werkzeug==2.3.6
+Werkzeug==3.0.1
 wheel
 WTForms
diff --git a/Global-Configs/Docker-Compose/adguard-custom-docker-compose.yml b/Global-Configs/Docker-Compose/adguard-custom-docker-compose.yml
@@ -70,6 +70,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.4
+    dns: 10.2.0.100
 
 
   db:
@@ -83,6 +84,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.5
+    dns: 10.2.0.100
 
 volumes:
     postgres_data:
diff --git a/Global-Configs/Docker-Compose/adguard-docker-compose.yml b/Global-Configs/Docker-Compose/adguard-docker-compose.yml
@@ -7,6 +7,8 @@ networks:
       config:
         - subnet: 10.2.0.0/24
 
+
+
 services:
   unbound:
     image: "klutchell/unbound:latest"
@@ -67,8 +69,8 @@ services:
   channels:
     depends_on: [db, wg_dashboard]
     container_name: channels_messenger
-    #build: ./Channels
-    image: noxcis/channels:marlin
+    build: ./Channels
+    #image: noxcis/channels:marlin
     restart: unless-stopped
     command: python run.py
     environment:
@@ -83,6 +85,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.4
+    dns: 10.2.0.100
 
 
   db:
@@ -98,6 +101,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.5
+    dns: 10.2.0.100
 
 volumes:
     postgres_data:
diff --git a/Global-Configs/Docker-Compose/pihole-custom-docker-compose.yml b/Global-Configs/Docker-Compose/pihole-custom-docker-compose.yml
@@ -77,7 +77,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.4
-
+    dns: 10.2.0.100
 
   db:
     container_name: channels_db
@@ -90,6 +90,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.5
+    dns: 10.2.0.100
 
 volumes:
     postgres_data:
diff --git a/Global-Configs/Docker-Compose/pihole-docker-compose.yml b/Global-Configs/Docker-Compose/pihole-docker-compose.yml
@@ -92,7 +92,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.4
-
+    dns: 10.2.0.100
 
   db:
     container_name: channels_db
@@ -107,6 +107,6 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.5
-
+    dns: 10.2.0.100
 volumes:
     postgres_data:
diff --git a/adguard/opt-adguard-conf/AdGuardHome.yaml b/adguard/opt-adguard-conf/AdGuardHome.yaml
@@ -5,8 +5,8 @@ http:
   address: 0.0.0.0:80
   session_ttl: 720h
 users:
-  - name: whimsical_kooky_381
-    password: $2y$05$v1ayLbQkarj.xw8BTf9pgOLewJFBZVLkGiT3hyAet3KMHezOm/YCq
+  - name: zany_quirky_107
+    password: $2y$05$Z8EcnrKoEfRtFbYPPkPInetcZyeugsGpCPOnrnJLzmxu1MNnxOeUi
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""

diff --git a/dev-docker-compose.yml b/dev-docker-compose.yml
@@ -7,6 +7,14 @@ networks:
       driver: default
       config:
         - subnet: 10.2.0.0/24
+      driver_opts:
+        com.docker.network.bridge.name: private_network_bridge
+        com.docker.network.bridge.enable_icc: "true"
+        com.docker.network.bridge.enable_ip_masquerade: "true"
+        com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
 
 services:
   unbound:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,8 @@ networks:
       config:
         - subnet: 10.2.0.0/24
 
+
+
 services:
   unbound:
     image: "klutchell/unbound:latest"
@@ -21,8 +23,8 @@ services:
 
   wg_dashboard:
     depends_on: [unbound, adguard]
-    build: ./WG-Dash
-    #image: noxcis/wg-dashboard:orca
+    #build: ./WG-Dash
+    image: noxcis/wg-dashboard:marlin
     container_name: wg_dashboard
     cap_add:
       - NET_ADMIN
@@ -67,8 +69,8 @@ services:
   channels:
     depends_on: [db, wg_dashboard]
     container_name: channels_messenger
-    #build: ./Channels
-    image: noxcis/channels:orca
+    build: ./Channels
+    #image: noxcis/channels:marlin
     restart: unless-stopped
     command: python run.py
     environment:
@@ -83,6 +85,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.4
+    dns: 10.2.0.100
 
 
   db:
@@ -98,6 +101,7 @@ services:
     networks:
       private_network:
         ipv4_address: 10.2.0.5
+    dns: 10.2.0.100
 
 volumes:
     postgres_data:
diff --git a/install.sh b/install.sh
@@ -227,7 +227,7 @@ export TIMER_VALUE=0
         local yml_file="docker-compose.yml"
         local port_mappings="770-777:770-777/udp"
         export PORT_MAPPINGS="$port_mappings"
-
+        docker compose down --volumes --remove-orphans
         # Check if the 'docker' command is available
 
         REQUIRED_PACKAGES=(