Commit 086d7d99 authored by nanahira's avatar nanahira

test ocserv

parent 616c903e
#!/bin/bash #!/bin/bash
dev="$TUNDEV" localPeerAddress={{conn.localPeerAddress}} remotePeerAddress={{conn.remotePeerAddress}} link6Address={{conn.link6Address}} remoteNextMark={{conn.remoteNextMark}} inbound={{conn.inbound}} outbound={{conn.outbound}} mtu={{conn.mtu|int - 66}} {{ansible_user_dir}}/nextgen-network/scripts/predown.sh dev="$TUNDEV" localPeerAddress={{conn.localPeerAddress}} remotePeerAddress={{conn.remotePeerAddress}} link6Address={{conn.link6Address}} remoteNextMark={{conn.remoteNextMark}} inbound={{conn.inbound}} outbound={{conn.outbound}} mtu={{conn.mtu|int - 58}} {{ansible_user_dir}}/nextgen-network/scripts/predown.sh
...@@ -299,12 +299,14 @@ class InventoryBuilder { ...@@ -299,12 +299,14 @@ class InventoryBuilder {
local.ocpasswdLines.push(await generateOcpasswdLine(name, this.vars.ocservPassword)); local.ocpasswdLines.push(await generateOcpasswdLine(name, this.vars.ocservPassword));
} }
const mtu = Math.min(localGateway ? localGateway.mtu : 1500, remoteGateway ? remoteGateway.mtu : 1500);
if (ocType === 'client') { if (ocType === 'client') {
local.dockerServices.services[`openconnect-${name}`] = { local.dockerServices.services[`openconnect-${name}`] = {
restart: 'always', restart: 'always',
image: 'git-registry.mycard.moe/railgun/openconnect', image: 'git-registry.mycard.moe/railgun/openconnect',
network_mode: 'host', network_mode: 'host',
command: ['bash', '-c', `echo '${this.vars.ocservPassword}' | openconnect --user=${name} --passwd-on-stdin --passtos --interface=${name} ${remoteOcservPort}`], command: ['bash', '-c', `echo '${this.vars.ocservPassword}' | openconnect --user=${name} --passwd-on-stdin --passtos --interface=${name} --mtu=${mtu - 58} ${remoteOcservPort}`],
cap_add: ['NET_ADMIN'], cap_add: ['NET_ADMIN'],
devices: ['/dev/net/tun:/dev/net/tun'], devices: ['/dev/net/tun:/dev/net/tun'],
volumes: [ volumes: [
...@@ -314,7 +316,6 @@ class InventoryBuilder { ...@@ -314,7 +316,6 @@ class InventoryBuilder {
}; };
} }
const mtu = Math.min(localGateway ? localGateway.mtu : 1500, remoteGateway ? remoteGateway.mtu : 1500);
//console.log(local.name, name, mtu); //console.log(local.name, name, mtu);
if (outbound) { if (outbound) {
......
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