diff --git a/README.md b/README.md index b8acc0d..adb73d7 100644 --- a/README.md +++ b/README.md @@ -1706,7 +1706,7 @@ nginx -t && sudo systemctl reload nginx - Скачаем готовый nftables.conf с github, укажем путь для замены нашего nftables: > !dos2unix и curl на HQ-RTR уже скачаны! -***curl -o /etc/nftables.conf https://raw.githubusercontent.com/4bobus/laba/refs/heads/main/files/hq-rtr/nftables.conf*** +***curl -o /etc/nftables.conf https://raw.githubusercontent.com/shiraorie/demo2026-1/main/files/hq-rtr/nftables.conf*** ***dos2unix /etc/nftables.conf*** @@ -1731,7 +1731,7 @@ nginx -t && sudo systemctl reload nginx ***apt install curl -y*** -***curl -o /etc/nftables.conf https://raw.githubusercontent.com/4bobus/laba/refs/heads/main/files/br-rtr/nftables.conf*** +***curl -o /etc/nftables.conf https://raw.githubusercontent.com/shiraorie/demo2026-1/main/files/br-rtr/nftables.conf*** ***dos2unix /etc/nftables.conf*** @@ -2083,7 +2083,7 @@ apt install rsyslog 3. Настроить DNS на HQ-SRV:

- +

- Теперь интерфейс будет доступен по адресу: @@ -2194,7 +2194,7 @@ apt install rsyslog - Скачиваем его с github в необходимую директори: > !dos2unix и curl на BR-SRV уже скачаны! -***curl -o /etc/ansible/inventory.yml https://raw.githubusercontent.com/4bobus/laba/refs/heads/main/files/inventory.yml*** +***curl -o /etc/ansible/inventory.yml https://raw.githubusercontent.com/shiraorie/dewmo2026-1/main/files/inventory.yml*** ***dos2unix /etc/ansible/inventory.yml*** @@ -2247,7 +2247,7 @@ apt install rsyslog - Скачаем файл с github в нужную директорию: > !dos2unix и curl на BR-SRV уже скачаны! -***curl -o /etc/ansible/backup.yml https://raw.githubusercontent.com/4bobus/laba/refs/heads/main/files/backup.yml*** +***curl -o /etc/ansible/backup.yml https://raw.githubusercontent.com/shiraorie/demo2026-1/main/files/backup.yml*** ***dos2unix /etc/ansible/backup.yml*** diff --git a/files/br-rtr/nftables.conf b/files/br-rtr/nftables.conf index 5590baf..16d42c5 100755 --- a/files/br-rtr/nftables.conf +++ b/files/br-rtr/nftables.conf @@ -35,8 +35,8 @@ table inet filter { table inet nat { chain prerouting { type nat hook prerouting priority filter; policy accept - ip daddr 172.16.50.2 tcp dport 3015 dnat ip to 192.168.200.2:3015 - ip daddr 172.16.50.2 tcp dport 80 dnat ip to 192.168.200.2:8080 + ip daddr 172.16.2.2 tcp dport 2026 dnat ip to 192.168.200.2:2026 + ip daddr 172.16.2.2 tcp dport 8080 dnat ip to 192.168.200.2:8080 } chain postrouting { type nat hook postrouting priority srcnat diff --git a/files/hq-rtr/nftables.conf b/files/hq-rtr/nftables.conf index 5ad36ee..42e7355 100755 --- a/files/hq-rtr/nftables.conf +++ b/files/hq-rtr/nftables.conf @@ -35,8 +35,8 @@ table inet filter { table inet nat { chain prerouting { type nat hook prerouting priority filter; policy accept - ip daddr 172.16.40.2 tcp dport 3015 dnat ip to 192.168.100.2:3015 - ip daddr 172.16.40.2 tcp dport 80 dnat ip to 192.168.100.2:80 + ip daddr 172.16.1.2 tcp dport 2026 dnat ip to 192.168.100.2:2026 + ip daddr 172.16.1.2 tcp dport 8080 dnat ip to 192.168.100.2:80 } chain postrouting { type nat hook postrouting priority srcnat diff --git a/images/module3/dnsmasq new.png b/images/module3/dnsmasq new.png new file mode 100644 index 0000000..d535a0b Binary files /dev/null and b/images/module3/dnsmasq new.png differ