Nicolas Meienberger 3 năm trước cách đây
mục cha
commit
e5bd794778
5 tập tin đã thay đổi với 47 bổ sung2 xóa
  1. 7 0
      .gitignore
  2. 0 0
      app-data/wg-easy/.gitkeep
  3. 23 0
      apps/wg-easy/docker-compose.yml
  4. 14 1
      docker-compose.yml
  5. 3 1
      scripts/configure.sh

+ 7 - 0
.gitignore

@@ -0,0 +1,7 @@
+.env
+nginx/*
+letsencrypt/*
+
+# Commit empty directories
+!nignx/.gitkeep
+!letsencrypt/.gitkeep

+ 0 - 0
app-data/wg-easy/.gitkeep


+ 23 - 0
apps/wg-easy/docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3.7'
+services:
+  wg-easy:
+      container_name: wg-easy
+      image: 'weejewel/wg-easy'
+      restart: unless-stopped
+      volumes:
+        - ${PWD}/wg-easy:/etc/wireguard
+      environment:
+        WG_HOST: 'wireguard.meienberger.dev'
+        PASSWORD: 'moneyprintergobrrr'
+      cap_add:
+        - NET_ADMIN
+        - SYS_MODULE
+      sysctls:
+        - net.ipv4.conf.all.src_valid_mark=1
+        - net.ipv4.ip_forward=1
+      ports:
+        - '51820:51820/udp'
+        - '51821:51821/tcp'
+      networks:
+        default:
+            ipv4_address: $APP_WG_EASY_IP

+ 14 - 1
docker-compose.yml

@@ -2,12 +2,25 @@ version: '3.7'
 
 services:
   nginx-proxy:
+    container_name: nginx-proxy
     image: 'jc21/nginx-proxy-manager:latest'
     restart: unless-stopped
+    # user: "1000:1000"
     ports:
       - '80:80'
       - '81:81'
       - '443:443'
     volumes:
       - ${PWD}/nginx:/data
-      - ${PWD}/letsencrypt:/etc/letsencrypt
+      - ${PWD}/letsencrypt:/etc/letsencrypt
+    networks:
+      default:
+          ipv4_address: $NGINX_PROXY_IP
+
+networks:
+    default:
+      name: tipi_main_network
+      ipam:
+          driver: default
+          config:
+              - subnet: "$NETWORK_IP/24"

+ 3 - 1
scripts/configure.sh

@@ -3,4 +3,6 @@ if [[ $UID != 0 ]]; then
     echo "Please re-run this script as"
     echo "  sudo ./scripts/start"
     exit 1
-fi
+fi
+
+# run docker-compose