jeka/ansible-openwrt-hirkn
1
0
Fork 0
mirror of https://github.com/itdoginfo/ansible-openwrt-hirkn.git synced 2025-12-14 02:54:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

add wg_preshared_key variable and fix hashsize

Browse Source
This commit is contained in:
itdoginfo
2022-06-09 22:45:09 +07:00
parent 67f357cd91
commit f5ff3e3abc
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -58,6 +58,8 @@ rm -rf ansible-openwrt-hirkn README.md
Остальное можно менять, в зависимости от того как настроен wireguard сервер Остальное можно менять, в зависимости от того как настроен wireguard сервер
Если ваш wg сервер использует preshared_key, то раскомментируйте **wg_preshared_key** и задайте ключ
Запуск playbook Запуск playbook
``` ```
ansible-playbook playbooks/hirkn.yml ansible-playbook playbooks/hirkn.yml

34
playbooks/hirkn.yml
View File

@@ -12,6 +12,7 @@
wg_server_address: wg_server_ip/url wg_server_address: wg_server_ip/url
wg_private_key: privatekey-client wg_private_key: privatekey-client
wg_public_key: publickey-server wg_public_key: publickey-server
#wg_preshared_key: preshared-key
wg_listen_port: 51820 wg_listen_port: 51820
wg_client_port: 51820 wg_client_port: 51820
wg_client_address: 192.168.100.3/24 wg_client_address: 192.168.100.3/24
@@ -60,12 +61,6 @@
dest: "/etc/rc.d/S99hirkn" dest: "/etc/rc.d/S99hirkn"
state: link state: link
- name: create crontab file
file:
dest: "/etc/crontabs/root"
state: touch
mode: 0600
- name: check string in crontab - name: check string in crontab
shell: grep "hirkn" /etc/crontabs/root shell: grep "hirkn" /etc/crontabs/root
register: check_cron register: check_cron
@@ -123,7 +118,7 @@
addresses: addresses:
- "{{ wg_client_address }}" - "{{ wg_client_address }}"
- name: set wg client - name: set wg client without wg_preshared_key
uci: uci:
command: section command: section
config: network config: network
@@ -137,6 +132,24 @@
endpoint_host: "{{ wg_server_address }}" endpoint_host: "{{ wg_server_address }}"
allowed_ips: 0.0.0.0/0 allowed_ips: 0.0.0.0/0
endpoint_port: "{{ wg_client_port }}" endpoint_port: "{{ wg_client_port }}"
when: wg_preshared_key is undefined
- name: set wg client with wg_preshared_key
uci:
command: section
config: network
type: wireguard_wg0
find_by:
name: wg0_client
value:
public_key: "{{ wg_public_key }}"
preshared_key: "{{ wg_preshared_key }}"
route_allowed_ips: 0
persistent_keepalive: 25
endpoint_host: "{{ wg_server_address }}"
allowed_ips: 0.0.0.0/0
endpoint_port: "{{ wg_client_port }}"
when: wg_preshared_key is defined
- name: set rule mark0x1 - name: set rule mark0x1
uci: uci:
@@ -191,6 +204,7 @@
value: value:
dest: wg dest: wg
src: lan src: lan
family: ipv4
- name: add ipset for subnet - name: add ipset for subnet
uci: uci:
@@ -215,8 +229,8 @@
match: dst_net match: dst_net
storage: hash storage: hash
loadfile: /tmp/lst/ip.lst loadfile: /tmp/lst/ip.lst
hashsize: 1000000 hashsize: 9900000
maxelem: 1000000 maxelem: 9900000
- name: add mark rule vpn_subnet - name: add mark rule vpn_subnet
uci: uci:
@@ -232,6 +246,7 @@
ipset: vpn_subnets ipset: vpn_subnets
set_mark: "0x1" set_mark: "0x1"
target: MARK target: MARK
family: ipv4
- name: add mark rule vpn_ip - name: add mark rule vpn_ip
uci: uci:
@@ -247,6 +262,7 @@
ipset: vpn_ip ipset: vpn_ip
set_mark: "0x1" set_mark: "0x1"
target: MARK target: MARK
family: ipv4
- name: uci commit firewall - name: uci commit firewall
uci: uci: