Commit c957bf67 authored by nanahira's avatar nanahira

fix tun

parent 27df73db
Pipeline #15669 canceled with stages
...@@ -584,9 +584,8 @@ class InventoryBuilder { ...@@ -584,9 +584,8 @@ class InventoryBuilder {
if (protocol === 'tun') { if (protocol === 'tun') {
const containerName = `tun-${name}`; const containerName = `tun-${name}`;
const dev = `mc-${name}`;
const tunMtu = mtu - 24; const tunMtu = mtu - 24;
const envs = `dev=${dev} localPeerAddress=${localPeerAddress} remotePeerAddress=${remotePeerAddress} localPeerAddress6=${localPeerAddress} remotePeerAddress6=${remotePeerAddress6} remoteNextMark=${remoteNextMark} inbound=${inbound ? 'True' : 'False'} outbound=${inbound ? 'True' : 'False'} mtu=${tunMtu}`; const envs = `dev=${name} localPeerAddress=${localPeerAddress} remotePeerAddress=${remotePeerAddress} localPeerAddress6=${localPeerAddress} remotePeerAddress6=${remotePeerAddress6} remoteNextMark=${remoteNextMark} inbound=${inbound ? 'True' : 'False'} outbound=${inbound ? 'True' : 'False'} mtu=${tunMtu}`;
local.dockerServices.services[containerName] = { local.dockerServices.services[containerName] = {
restart: 'always', restart: 'always',
image: `git-registry.mycard.moe/railgun/tun${this.getDockerImageTag(local)}`, image: `git-registry.mycard.moe/railgun/tun${this.getDockerImageTag(local)}`,
...@@ -602,10 +601,10 @@ class InventoryBuilder { ...@@ -602,10 +601,10 @@ class InventoryBuilder {
PROTO: params.p || 144, PROTO: params.p || 144,
LOCAL_SECRET: local.wgPrivateKey, LOCAL_SECRET: local.wgPrivateKey,
REMOTE_SECRET: remote.wgPrivateKey, REMOTE_SECRET: remote.wgPrivateKey,
DEV: dev, DEV: name,
ENDPOINT: remoteAddress, ENDPOINT: remoteAddress,
MARK: localGatewayMark || 0, MARK: localGatewayMark || 0,
UP_SCRIPT: `ip address add ${local.address} dev ${dev}; ip link set dev ${dev} mtu ${tunMtu}; ip link set ${dev} up; env ${envs} $HOME/nextgen-network/scripts/postup.sh &> /dev/stdout`, UP_SCRIPT: `ip address add ${local.address} dev ${name}; ip link set dev ${name} mtu ${tunMtu}; ip link set ${name} up; env ${envs} $HOME/nextgen-network/scripts/postup.sh &> /dev/stdout`,
DOWN_SCRIPT: `env ${envs} $HOME/nextgen-network/scripts/predown.sh &> /dev/stdout` DOWN_SCRIPT: `env ${envs} $HOME/nextgen-network/scripts/predown.sh &> /dev/stdout`
}, },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment