nigger/lixonet-ee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lixonet2-upgrade' into 'master'

Browse Source 
Swap 172.30 -> 172.31 to prep for lixonet 2 migration :)

See merge request lixonet/lixonet-ee!4
This commit is contained in:
sump pump 2020-05-21 05:26:18 +00:00
commit f7e9599e58
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bird/neighbors/daltx_nurd_lixo
View File

@ -1 +1 @@
neighbor 172.30.0.212 as 4206969212; neighbor 172.31.0.212 as 4206969212;

2
bird/neighbors/denco_mane_lixo
View File

@ -1 +1 @@
neighbor 172.30.0.8 as 4206969008; neighbor 172.31.0.8 as 4206969008;

2
bird/neighbors/glaz_nurd_lixo
View File

@ -1 +1 @@
neighbor 172.30.0.200 as 4206969200; neighbor 172.31.0.200 as 4206969200;

2
bird/neighbors/lkwco_mane_lixo
View File

@ -1 +1 @@
neighbor 172.30.0.16 as 4206969016; neighbor 172.31.0.16 as 4206969016;

2
bird/neighbors/phxaz_nurd_lixo
View File

@ -1 +1 @@
neighbor 172.30.0.208 as 4206969208; neighbor 172.31.0.208 as 4206969208;

2
bird/rpki/hosts/denco_mane_lixo
View File

@ -1 +1 @@
remote 172.30.0.8 port 8282; remote 172.31.0.8 port 8282;

4
tinc/lixonet/hosts/daltx_nurd_lixo
View File

@ -1,9 +1,9 @@
Address = daltx.needs.vodka Address = daltx.needs.vodka
Port = 9994 Port = 9993
Cipher = blowfish Cipher = blowfish
Digest = sha1 Digest = sha1
Subnet = 172.30.0.212/32 Subnet = 172.31.0.212/32
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA8p5Pyqe/jSht3wO2QYR/Oyxw+kZGBzeXlmESg+UM3XobOf5v60JE MIIBCgKCAQEA8p5Pyqe/jSht3wO2QYR/Oyxw+kZGBzeXlmESg+UM3XobOf5v60JE

4
tinc/lixonet/hosts/denco_mane_lixo
View File

@ -1,9 +1,9 @@
Address = tunnel.teamlixo.net Address = tunnel.teamlixo.net
Port = 9994 Port = 9993
Cipher = blowfish Cipher = blowfish
Digest = sha1 Digest = sha1
Subnet = 172.30.0.8/32 Subnet = 172.31.0.8/32
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAlo0meA9kqA/IgUxiXaAqEteSBo5g2EHwdZOGpdS0FMggQDg0DsG9 MIIBCgKCAQEAlo0meA9kqA/IgUxiXaAqEteSBo5g2EHwdZOGpdS0FMggQDg0DsG9

4
tinc/lixonet/hosts/glaz_nurd_lixo
View File

@ -3,11 +3,11 @@
# to 0.0.0.0 # to 0.0.0.0
Address = 0.0.0.0 Address = 0.0.0.0
Port = 9994 Port = 9993
Cipher = blowfish Cipher = blowfish
Digest = sha1 Digest = sha1
Subnet = 172.30.0.200/32 Subnet = 172.31.0.200/32
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAqMJesuX07HCLjDI+DuWCvZvWk9CoTLdjlYiDkHWkeyy6vkkHH+mP MIIBCgKCAQEAqMJesuX07HCLjDI+DuWCvZvWk9CoTLdjlYiDkHWkeyy6vkkHH+mP

4
tinc/lixonet/hosts/lkwco_mane_lixo
View File

@ -3,11 +3,11 @@
# to 0.0.0.0 # to 0.0.0.0
Address = 0.0.0.0 Address = 0.0.0.0
Port = 9994 Port = 9993
Cipher = blowfish Cipher = blowfish
Digest = sha1 Digest = sha1
Subnet = 172.30.0.16/32 Subnet = 172.31.0.16/32
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAo2NyYsNCAKl0xMlyMxKfK9oJ0MV1xkotQGKXAt22wB3G23M979nz MIIBCgKCAQEAo2NyYsNCAKl0xMlyMxKfK9oJ0MV1xkotQGKXAt22wB3G23M979nz

4
tinc/lixonet/hosts/phxaz_nurd_lixo
View File

@ -1,9 +1,9 @@
Address = paperbag.needs.vodka Address = paperbag.needs.vodka
Port = 9994 Port = 9993
Cipher = blowfish Cipher = blowfish
Digest = sha1 Digest = sha1
Subnet = 172.30.0.208/32 Subnet = 172.31.0.208/32
-----BEGIN RSA PUBLIC KEY----- -----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEApp+DSQCFowhht6YW3+uWynL3CH1NHvoZvWpI1Rb94z2sez32bMwD MIIBCgKCAQEApp+DSQCFowhht6YW3+uWynL3CH1NHvoZvWpI1Rb94z2sez32bMwD