mirror of
https://github.com/itdoginfo/ansible-openwrt-hirkn.git
synced 2025-12-19 13:34:27 +05:00
Compare commits
5 Commits
86d26c1d25
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2806a26a07 | ||
|
|
0cfe54a8e2 | ||
|
|
dfab862088 | ||
|
|
02f5e5e5c8 | ||
|
|
f6a6864080 |
@@ -205,7 +205,7 @@ cat << 'EOF' > /etc/sing-box/config.json
|
||||
"type": "tun",
|
||||
"interface_name": "tun0",
|
||||
"domain_strategy": "ipv4_only",
|
||||
"inet4_address": "172.16.250.1/30",
|
||||
"address": ["172.16.250.1/30"],
|
||||
"auto_route": false,
|
||||
"strict_route": false,
|
||||
"sniff": true
|
||||
@@ -327,10 +327,9 @@ dnsmasqfull() {
|
||||
}
|
||||
|
||||
dnsmasqconfdir() {
|
||||
openwrt_release=$(cat /etc/openwrt_release | grep -Eo [0-9]{2}[.][0-9]{2}[.][0-9]* | cut -d '.' -f 1 | tail -n 1)
|
||||
if [ $openwrt_release -ge 24 ]; then
|
||||
if [ $VERSION_ID -ge 24 ]; then
|
||||
if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then
|
||||
printf "\033[32;1mconfdir alreadt set\033[0m\n"
|
||||
printf "\033[32;1mconfdir already set\033[0m\n"
|
||||
else
|
||||
printf "\033[32;1mSetting confdir\033[0m\n"
|
||||
uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d'
|
||||
@@ -973,8 +972,8 @@ printf "\033[34;1mVersion: $OPENWRT_RELEASE\033[0m\n"
|
||||
|
||||
VERSION_ID=$(echo $VERSION | awk -F. '{print $1}')
|
||||
|
||||
if [ "$VERSION_ID" -ne 23 ]; then
|
||||
printf "\033[31;1mScript only support OpenWrt 23.05\033[0m\n"
|
||||
if [ "$VERSION_ID" -ne 23 ] && [ "$VERSION_ID" -ne 24 ]; then
|
||||
printf "\033[31;1mScript only support OpenWrt 23.05 and 24.10\033[0m\n"
|
||||
echo "For OpenWrt 21.02 and 22.03 you can:"
|
||||
echo "1) Use ansible https://github.com/itdoginfo/domain-routing-openwrt"
|
||||
echo "2) Configure manually. Old manual: https://itdog.info/tochechnaya-marshrutizaciya-na-routere-s-openwrt-wireguard-i-dnscrypt/"
|
||||
|
||||
@@ -78,7 +78,9 @@
|
||||
key: dhcp.@dnsmasq[0]
|
||||
value:
|
||||
confdir: "/tmp/dnsmasq.d"
|
||||
when: dnsmasq_confdir.stdout != "/tmp/dnsmasq.d" and openwrt_major_release >= 24
|
||||
when: ansible_distribution_major_version >= 24
|
||||
notify:
|
||||
- Restart dnsmasq
|
||||
|
||||
# Getdomains script configure
|
||||
|
||||
@@ -672,6 +674,13 @@
|
||||
notify:
|
||||
- Restart firewall
|
||||
|
||||
- name: uci commit dhcp
|
||||
uci:
|
||||
command: commit
|
||||
config: dhcp
|
||||
notify:
|
||||
- Restart dnsmasq
|
||||
|
||||
- name: uci commit network
|
||||
uci:
|
||||
command: commit
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"type": "tun",
|
||||
"interface_name": "tun0",
|
||||
"domain_strategy": "ipv4_only",
|
||||
"inet4_address": "172.16.250.1/30",
|
||||
"address": ["172.16.250.1/30"],
|
||||
"auto_route": false,
|
||||
"strict_route": false,
|
||||
"sniff": true
|
||||
|
||||
Reference in New Issue
Block a user