[hotfix][nodes] only use ASn in interface name
- it is only 15 chars by default (change requires kernel recompile) - thanks to @famfo for have a long mntner name
This commit is contained in:
parent
ad9caf6798
commit
be4ce4c5d8
5 changed files with 11 additions and 11 deletions
|
@ -137,17 +137,17 @@ class PeeringManager:
|
|||
if mode == "add":
|
||||
wg_conf = self.__generate_wg_conf(peering)
|
||||
bgp_conf = self.__generate_bird_conf(peering)
|
||||
with open(f"{self.__config['wg-configs']}/dn42_{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}.conf", "w") as wg_file:
|
||||
with open(f"{self.__config['wg-configs']}/dn42_{peering['ASN']}.conf", "w") as wg_file:
|
||||
wg_file.write(wg_conf)
|
||||
|
||||
wg_enable = subprocess.run(self.__config["wg-commands"]["enable"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
wg_enable = subprocess.run(self.__config["wg-commands"]["enable"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(wg_enable)
|
||||
wg_up = subprocess.run(self.__config["wg-commands"]["up"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
wg_up = subprocess.run(self.__config["wg-commands"]["up"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(wg_up)
|
||||
time.sleep(5)
|
||||
with open(f"{self.__config['bird-peers']}/dn42_{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}.conf", "w") as bgp_file:
|
||||
bgp_file.write(bgp_conf)
|
||||
bgp_reload = subprocess.run(self.__config["bird-reload"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
bgp_reload = subprocess.run(self.__config["bird-reload"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(bgp_reload)
|
||||
|
||||
return 200
|
||||
|
@ -157,25 +157,25 @@ class PeeringManager:
|
|||
with open(f"{self.__config['wg-configs']}/dn42_{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}.conf", "w") as wg_file:
|
||||
wg_file.write(wg_conf)
|
||||
|
||||
wg_down = subprocess.run(self.__config["wg-commands"]["down"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
wg_down = subprocess.run(self.__config["wg-commands"]["down"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(wg_down)
|
||||
wg_up = subprocess.run(self.__config["wg-commands"]["up"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
wg_up = subprocess.run(self.__config["wg-commands"]["up"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(wg_up)
|
||||
time.sleep(5)
|
||||
with open(f"{self.__config['bird-peers']}/dn42_{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}.conf", "w") as bgp_file:
|
||||
bgp_file.write(bgp_conf)
|
||||
bgp_reload = subprocess.run(self.__config["bird-reload"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
bgp_reload = subprocess.run(self.__config["bird-reload"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(bgp_reload)
|
||||
|
||||
return 200
|
||||
elif mode == "delete":
|
||||
os.remove(f"{self.__config['bird-peers']}/dn42_{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}.conf")
|
||||
bgp_reload = subprocess.run(self.__config["bird-reload"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
bgp_reload = subprocess.run(self.__config["bird-reload"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(bgp_reload)
|
||||
time.sleep(5)
|
||||
wg_down = subprocess.run(self.__config["wg-commands"]["down"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
wg_down = subprocess.run(self.__config["wg-commands"]["down"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(wg_down)
|
||||
wg_disable = subprocess.run(self.__config["wg-commands"]["disable"].replace("{PEERING}",f"{peering['MNT'][:-4].lower()}_{peering['ASN'][-4:]}").split(" "))
|
||||
wg_disable = subprocess.run(self.__config["wg-commands"]["disable"].replace("{PEERING}",peering['ASN'][-6:] if len(peering["asn"]) >=6 else peering["ASN"]).split(" "))
|
||||
print(wg_disable)
|
||||
|
||||
return 200
|
||||
|
|
0
nodes/start.sh
Normal file → Executable file
0
nodes/start.sh
Normal file → Executable file
|
@ -1,7 +1,7 @@
|
|||
{% if peering["bgp_mp"] %}
|
||||
protocol bgp dn42_{{peering["MNT"][:-4].lower()}}_{{peering["ASN"][-4:]}} from dnpeers {
|
||||
neighbor {{peering["ipv6ll"]}} as {{peering["ASN"]}};
|
||||
interface "dn42_{{peering['MNT'][:-4].lower()}}_{{peering['ASN'][-4:]}}";
|
||||
interface {% if len(peering['ASN'] >=6 %}"dn42_{{peering['ASN'][-6:]}}"{% else %}"dn42_{{peering['asn']}}"{% endif %};
|
||||
passive off;
|
||||
|
||||
ipv4 {
|
||||
|
|
0
nodes/wg-services.sh
Normal file → Executable file
0
nodes/wg-services.sh
Normal file → Executable file
0
web/start.sh
Normal file → Executable file
0
web/start.sh
Normal file → Executable file
Loading…
Add table
Reference in a new issue