From e27678432ce16f52090ac18d68012f4192f8af8a Mon Sep 17 00:00:00 2001 From: mercury Date: Mon, 13 Feb 2023 01:09:23 +0400 Subject: [PATCH] script to open port 53 on the host and redirect to adguardHome --- docker-compose53.yml | 161 +++++++++++++++++++++++++++++++++++ readme | 6 +- scripts/dns_close_53_port.sh | 6 ++ scripts/dns_open_53_port.sh | 10 +++ 4 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 docker-compose53.yml create mode 100644 scripts/dns_close_53_port.sh create mode 100644 scripts/dns_open_53_port.sh diff --git a/docker-compose53.yml b/docker-compose53.yml new file mode 100644 index 0000000..5e284ce --- /dev/null +++ b/docker-compose53.yml @@ -0,0 +1,161 @@ +version: "3.7" + +networks: + default: + ipam: + config: + - subnet: 10.10.0.0/24 +volumes: + adguard: + +services: + ng: + build: + context: dockerfile + dockerfile: doh.dockerfile + volumes: + - ./config/.profile:/root/.bashrc:ro + - ./config/nginx.conf:/etc/nginx/nginx.conf + - ./scripts/start_ng.sh:/start_ng.sh + - ./certs/:/certs/ + - ./ssh/:/ssh/ + - ./logs/:/logs/ + ports: + - 80:80 + - 443:443 + - 53:53/tcp + - 53:53/udp + hostname: nginx + depends_on: + - unit + - ad + - ss + environment: + TZ: ${TZ} + stop_grace_period: 1s + command: ["/bin/sh", "/start_ng.sh"] + networks: + default: + ipv4_address: 10.10.0.2 + unit: + build: + dockerfile: dockerfile/php.dockerfile + args: + IP: ${IP} + volumes: + - ./config/.profile:/root/.bashrc:ro + - ./config/php.ini:/usr/local/etc/php/php.ini + - ./config/clients.json:/config/clients.json + - ./config/pac.json:/config/pac.json + - ./config/unit.json:/config/unit.json + - ./config/AdGuardHome.yaml:/config/AdGuardHome.yaml + - ./config/nginx.conf:/config/nginx.conf + - ./config/nginx_default.conf:/config/nginx_default.conf + - ./config/ssserver.json:/config/ssserver.json + - ./config/sslocal.json:/config/sslocal.json + - ./certs/:/certs/ + - type: volume + target: /config/adguard + source: adguard + - ./ssh/:/ssh/ + - ./app:/app + - ./logs/:/logs/ + - ./scripts/start_unit.sh:/start_unit.sh + environment: + TZ: ${TZ} + ADDRESS: ${WGADDRESS} + PORT_WG: ${WGPORT} + hostname: unit + restart: unless-stopped + stop_grace_period: 1s + command: ["/bin/sh", "/start_unit.sh"] + working_dir: /app + networks: + default: + ipv4_address: 10.10.0.7 + proxy: + build: + dockerfile: dockerfile/shadowsocks.dockerfile + volumes: + - ./config/.profile:/root/.bashrc:ro + - ./config/sslocal.json:/config.json + - ./ssh:/ssh + - ./scripts/start_proxy.sh:/start_proxy.sh + hostname: proxy + depends_on: + - unit + networks: + default: + ipv4_address: 10.10.0.3 + environment: + TZ: ${TZ} + stop_grace_period: 1s + command: ["/bin/sh", "/start_proxy.sh"] + wg: + build: + dockerfile: dockerfile/wireguard.dockerfile + volumes: + - ./config/.profile:/root/.bashrc:ro + - ./config/wg0.conf:/etc/wireguard/wg0.conf + - ./scripts/start_wg.sh:/start_wg.sh + - ./scripts/reset_wg.sh:/reset_wg.sh + - ./ssh:/ssh + hostname: wireguard + depends_on: + - unit + ports: + - ${WGPORT}:${WGPORT}/udp + environment: + TZ: ${TZ} + PORT_WG: ${WGPORT} + ADDRESS: ${WGADDRESS} + cap_add: + - NET_ADMIN + stop_grace_period: 1s + command: ["/bin/sh", "/start_wg.sh"] + networks: + default: + ipv4_address: 10.10.0.4 + ad: + build: + dockerfile: dockerfile/adguard.dockerfile + volumes: + - ./config/.profile:/root/.bashrc:ro + - type: volume + target: /opt/adguardhome + source: adguard + - ./ssh:/ssh + - ./logs/:/logs/ + - ./scripts/start_ad.sh:/start_ad.sh + hostname: adguard + depends_on: + - unit + environment: + TZ: ${TZ} + stop_grace_period: 1s + networks: + default: + ipv4_address: 10.10.0.5 + command: ["/bin/sh", "/start_ad.sh"] + ss: + build: + dockerfile: dockerfile/shadowsocks.dockerfile + volumes: + - ./config/.profile:/root/.bashrc:ro + - ./config/ssserver.json:/config.json + - ./ssh:/ssh + - ./scripts/start_ss.sh:/start_ss.sh + hostname: shadowsocks + depends_on: + - unit + ports: + - 8388:8388/udp + - 8388:8388/tcp + environment: + TZ: ${TZ} + stop_grace_period: 1s + command: ["/bin/sh", "/start_ss.sh"] + networks: + default: + ipv4_address: 10.10.0.6 + diff --git a/readme b/readme index 2866f69..a7fcf72 100644 --- a/readme +++ b/readme @@ -4,8 +4,12 @@ telegram bot to control - adguard home - PAC dynamic url --- -environment: ubuntu 18.04 +environment: ubuntu 18.04/20.04 install: wget -O- https://raw.githubusercontent.com/mercurykd/vpnbot/master/scripts/init.sh | sh -s YOUR_TELEGRAM_BOT_KEY + +open 53 port for adguardhome: + +bash scripts/dns_open_53_port.sh diff --git a/scripts/dns_close_53_port.sh b/scripts/dns_close_53_port.sh new file mode 100644 index 0000000..2aa6065 --- /dev/null +++ b/scripts/dns_close_53_port.sh @@ -0,0 +1,6 @@ +make d +rm /etc/systemd/resolved.conf.d/adguardhome.conf +mv /etc/resolv.conf.backup /etc/resolv.conf +systemctl reload-or-restart systemd-resolved +cat docker-compose-init.yml > docker-compose.yml +make u diff --git a/scripts/dns_open_53_port.sh b/scripts/dns_open_53_port.sh new file mode 100644 index 0000000..1604dd0 --- /dev/null +++ b/scripts/dns_open_53_port.sh @@ -0,0 +1,10 @@ +mkdir /etc/systemd/resolved.conf.d +echo "[Resolve] +DNS=127.0.0.1 +DNSStubListener=no" > /etc/systemd/resolved.conf.d/adguardhome.conf +mv /etc/resolv.conf /etc/resolv.conf.backup +ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf +systemctl reload-or-restart systemd-resolved +cat docker-compose.yml > docker-compose-init.yml +cat docker-compose53.yml > docker-compose.yml +make d u