Kiritow
/
wg-ops
mirror of https://github.com/Kiritow/wg-ops
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix endpoint issue

master
Kirigaya Kazuto 2022-02-06 01:49:19 +00:00
parent f7d47d2c6d
commit e300730f12
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
generate.py
View File

@ -8,6 +8,7 @@ import base64
path_get_gateway = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), 'tools/get-gateway.py')
path_get_ip = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), 'tools/get-ip.py')
path_bin_dir = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), 'bin')
path_app_dir = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), 'app')
@ -434,8 +435,8 @@ class Parser:
if addr_host == "gateway":
tunnel_addr = ""
if not self.flag_container_must_host:
self.result_postup.append("PostUp=CT_GATEWAY=$({}); wg set {} peer {} endpoint $CT_GATEWAY:{}".format(
self.get_podman_cmd_with('/usr/bin/python3 {} {}'.format(path_get_gateway, self.get_container_network_name())),
self.result_postup.append("PostUp=CT_IP=$({}); wg set {} peer {} endpoint $CT_IP:{}".format(
self.get_podman_cmd_with('/usr/bin/python3 {} {} {}'.format(path_get_ip, self.get_container_network_name(), self.get_container_name())),
self.wg_name, current_pubkey, addr_port))
else:
self.result_postup.append("PostUp=wg set {} peer {} endpoint 127.0.0.1:{}".format(

16
tools/get-ip.py Normal file
View File

@ -0,0 +1,16 @@
import sys
import json
import subprocess
if __name__ == "__main__":
if len(sys.argv) < 3:
sys.stderr.write('python3 get-ip.py <network> <container>\n')
exit(1)
network_name = sys.argv[1]
container_name = sys.argv[2]
output = subprocess.check_output(["podman", "inspect", container_name])
j = json.loads(output)
print(j[0]["NetworkSettings"]["Networks"][network_name]["IPAddress"])