mirror of
https://github.com/itdoginfo/ansible-openwrt-hirkn.git
synced 2025-12-13 10:34:29 +05:00
Compare commits
5 Commits
ae3b6976f7
...
0.1.9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dfab862088 | ||
|
|
02f5e5e5c8 | ||
|
|
f6a6864080 | ||
|
|
86b9c1c075 | ||
|
|
7b1f1631b3 |
@@ -323,18 +323,21 @@ dnsmasqfull() {
|
||||
opkg remove dnsmasq && opkg install dnsmasq-full --cache /tmp/
|
||||
|
||||
[ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp
|
||||
fi
|
||||
fi
|
||||
}
|
||||
s
|
||||
dnsmasqconfdir() {
|
||||
if [ $VERSION_ID -ge 24 ]; then
|
||||
if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then
|
||||
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'
|
||||
uci commit dhcp
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
dnsmasqconfdir() {
|
||||
if uci get dhcp.@dnsmasq[0].confdir | grep -q /tmp/dnsmasq.d; then
|
||||
printf "\033[32;1mconfdir alreadt set\033[0m\n"
|
||||
else
|
||||
printf "\033[32;1mSetting confdir\033[0m\n"
|
||||
uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d'
|
||||
uci commit dhcp
|
||||
fi
|
||||
}
|
||||
remove_forwarding() {
|
||||
if [ ! -z "$forward_id" ]; then
|
||||
while uci -q delete firewall.@forwarding[$forward_id]; do :; done
|
||||
@@ -969,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/"
|
||||
|
||||
@@ -11,6 +11,10 @@
|
||||
register: dnsmasq_confdir
|
||||
ignore_errors: true
|
||||
|
||||
- name: Get openwrt major release
|
||||
shell: cat /etc/openwrt_release | grep -Eo [0-9]{2}[.][0-9]{2}[.][0-9]* | cut -d '.' -f 1 | tail -n 1
|
||||
register: openwrt_major_release
|
||||
|
||||
- name: debug
|
||||
debug:
|
||||
var: ansible_distribution_major_version
|
||||
@@ -74,7 +78,9 @@
|
||||
key: dhcp.@dnsmasq[0]
|
||||
value:
|
||||
confdir: "/tmp/dnsmasq.d"
|
||||
when: dnsmasq_confdir.stdout != "/tmp/dnsmasq.d"
|
||||
when: ansible_distribution_major_version >= 24
|
||||
notify:
|
||||
- Restart dnsmasq
|
||||
|
||||
# Getdomains script configure
|
||||
|
||||
@@ -668,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
|
||||
|
||||
Reference in New Issue
Block a user