diff --git a/.gitignore b/.gitignore deleted file mode 100755 index 15e3fd4..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -appdata/ -*.db diff --git a/.env b/admin/.env similarity index 100% rename from .env rename to admin/.env diff --git a/compose.yml b/admin/compose.yml similarity index 54% rename from compose.yml rename to admin/compose.yml index d6cee88..4ee31ac 100755 --- a/compose.yml +++ b/admin/compose.yml @@ -1,18 +1,6 @@ version: '3' services: - adguardhome: - container_name: adguardhome - image: adguard/adguardhome - ports: - - 53:53/tcp - - 53:53/udp - - 3030:3000/tcp - restart: unless-stopped - volumes: - - ./conf:/opt/adguardhome/conf - - ./work:/opt/adguardhome/work - dockge: container_name: dockge image: louislam/dockge:1 @@ -54,33 +42,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /etc/localtime:/etc/localtime:ro - wg-easy: - container_name: wg-easy - image: weejewel/wg-easy - environment: - - WG_HOST=${WG_HOST} - - PASSWORD=${WG_PASSWORD} - - WG_DEFAULT_DNS=10.8.0.1 - - WG_PORT=51830 - - WG_PERSISTENT_KEEPALIVE=25 - - WG_DEFAULT_ADDRESS=10.10.0.x - - WG_MTU=1420 - - WG_ALLOWED_IPS=10.10.0.0/24 - cap_add: - - NET_ADMIN - - SYS_MODULE - sysctls: - - net.ipv4.ip_forward=1 - - net.ipv4.conf.all.src_valid_mark=1 - networks: - - reverse-proxy - ports: - - 51840:51820/udp - - 51841:51821 - restart: always - volumes: - - ${DOCKER_CONFIGS}/wg-easy:/etc/wireguard - networks: reverse-proxy: name: reverse-proxy diff --git a/wireguard/.env b/wireguard/.env new file mode 100755 index 0000000..7ae74a7 --- /dev/null +++ b/wireguard/.env @@ -0,0 +1,16 @@ +#GLOBAL SETTINGS +COMPOSE_HTTP_TIMEOUT=120 +COMPOSE_IGNORE_ORPHANS=1 +DOCKER_CONFIGS=. +DOCKERGID=999 +DOCKERHOSTNAME=WireguardServer +DOCKERLOGGING_MAXFILE=10 +DOCKERLOGGING_MAXSIZE=200k +PGID=1000 +PUID=1000 +UMASK=000 +TZ=America/Chicago + +#WIREGUARD +WG_HOST=akanealw.com +WG_PASSWORD=zai9phioyachooF3Raengo2ooHaN7r diff --git a/wireguard/compose.yml b/wireguard/compose.yml new file mode 100755 index 0000000..f4c44d5 --- /dev/null +++ b/wireguard/compose.yml @@ -0,0 +1,46 @@ +version: '3' + +services: + adguardhome: + container_name: adguardhome + image: adguard/adguardhome + ports: + - 53:53/tcp + - 53:53/udp + - 3030:3000/tcp + restart: unless-stopped + volumes: + - ./conf:/opt/adguardhome/conf + - ./work:/opt/adguardhome/work + + wg-easy: + container_name: wg-easy + image: weejewel/wg-easy + environment: + - WG_HOST=${WG_HOST} + - PASSWORD=${WG_PASSWORD} + - WG_DEFAULT_DNS=10.8.0.1 + - WG_PORT=51830 + - WG_PERSISTENT_KEEPALIVE=25 + - WG_DEFAULT_ADDRESS=10.10.0.x + - WG_MTU=1420 + - WG_ALLOWED_IPS=10.10.0.0/24 + cap_add: + - NET_ADMIN + - SYS_MODULE + sysctls: + - net.ipv4.ip_forward=1 + - net.ipv4.conf.all.src_valid_mark=1 + networks: + - reverse-proxy + ports: + - 51840:51820/udp + - 51841:51821 + restart: always + volumes: + - ${DOCKER_CONFIGS}/wg-easy:/etc/wireguard + +networks: + reverse-proxy: + name: reverse-proxy + external: true