diff --git a/Dockerfile b/Dockerfile index 72cf8f8..59512a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,4 +54,5 @@ RUN set -ex \ && mv /usr/local/share/man/man8/jool_siit.8 /usr/share/man/man8/ COPY run.sh /root/run.sh +COPY configfile /root/jool.conf COPY netsocket.json /root/netsocket.json diff --git a/configfile b/configfile new file mode 100644 index 0000000..40d9e90 --- /dev/null +++ b/configfile @@ -0,0 +1,56 @@ +{ + "comment": "Freifunk Magdeburg NAT64", + "instance": "default", + "framework": "netfilter", + + "global": { + "pool6": "64:ff9b::/96", + "manually-enabled": true, + + "zeroize-traffic-class": false, + "override-tos": false, + "tos": 0, + "mtu-plateaus": [1280, 1006, 508, 296, 68], + "maximum-simultaneous-opens": 16, + "source-icmpv6-errors-better": true, + "handle-rst-during-fin-rcv": false, + "f-args": 8, + + "logging-bib": false, + "logging-session": false, + + "address-dependent-filtering": true, + "drop-icmpv6-info": false, + "drop-externally-initiated-tcp": false, + + "udp-timeout": "5:00", + "tcp-est-timeout": "4:00:00", + "tcp-trans-timeout": "4:00", + "icmp-timeout": "1:00", + + "ss-enabled": false, + "ss-flush-asap": true, + "ss-flush-deadline": 2000, + "ss-capacity": 512, + "ss-max-payload": 1452 + }, + + "pool4": [ + { + "mark": 66, + "protocol": "TCP", + "prefix": "10.11.12.2", + "port range": "1024-65535" + }, { + "mark": 66, + "protocol": "UDP", + "prefix": "10.11.12.2", + "port range": "1024-65535" + }, { + "mark": 66, + "protocol": "ICMP", + "prefix": "10.11.12.2", + "port range": "61001-65535" + } + ] +} diff --git a/docker-compose.yaml b/docker-compose.yaml index e5192ef..4905b4b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ version: "3.0" services: jool: - image: jasperben/jool-docker + image: jool-docker network_mode: "host" privileged: true cap_add: diff --git a/run.sh b/run.sh index f591243..ce4bd0c 100755 --- a/run.sh +++ b/run.sh @@ -1,10 +1,4 @@ #!/bin/sh -for ip in $V4IP -do - jool -4 $i --mark $MARK_DEC -done - -jool --pool6 $V6IP -jool --enable - -exec joold /root/netsocket.json +jool file handle /root/jool.conf +echo sleeping +sleep 3600