From d391ee3d06d27cfe1f7550c3a2aba4bacd30d77d Mon Sep 17 00:00:00 2001 From: darkdrgn2k Date: Fri, 19 Jul 2019 19:35:51 -0400 Subject: [PATCH 1/5] Create ssb-ipv6-broadcast.service --- scripts/ssb/ssb-ipv6-broadcast.service | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 scripts/ssb/ssb-ipv6-broadcast.service diff --git a/scripts/ssb/ssb-ipv6-broadcast.service b/scripts/ssb/ssb-ipv6-broadcast.service new file mode 100644 index 000000000..7879fd755 --- /dev/null +++ b/scripts/ssb/ssb-ipv6-broadcast.service @@ -0,0 +1,14 @@ +[Unit] +Description=Scuttlebot (SSB) Service IPv6 Broadcast +Wants=network.target +After=ssb.service + +[Service] +Type=simple +ExecStart=/usr/bin/socat UDP6-LISTEN:8008,fork,su=nobody UDP4:127.0.0.1:8008 +ExecStop=/bin/kill -s QUIT $MAINPID +Restart=on-failure +RestartSec=10s + +[Install] +WantedBy=multi-user.target From c8db9c71c9cee119052e3e8682744b40bebdfa07 Mon Sep 17 00:00:00 2001 From: darkdrgn2k Date: Fri, 19 Jul 2019 19:37:02 -0400 Subject: [PATCH 2/5] Added ipv6 socat service --- scripts/ssb/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ssb/install b/scripts/ssb/install index 73f92521a..e7df93c41 100755 --- a/scripts/ssb/install +++ b/scripts/ssb/install @@ -6,7 +6,7 @@ set -e BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Install dependencies -sudo apt-get install -y socat python-dev libtool python-setuptools autoconf automake +sudo apt-get install -y socat python-dev libtool python-setuptools autoconf automake socat # Install node.js shared module # shellcheck source=../shared/node.js/install @@ -31,6 +31,8 @@ sudo systemctl start ssb.service sudo cp "$BASE_DIR/ssb-broadcast-service.sh" "/usr/local/bin/ssb-broadcast-service.sh" sudo cp "$BASE_DIR/ssb-broadcast.service" /etc/systemd/system/ssb-broadcast.service sudo sed -i "s|__USER__|${currentUser}|g" /etc/systemd/system/ssb-broadcast.service +sudo cp "$BASE_DIR/ssb-ipv6-broadcast.service" "/etc/systemd/system/ssb-ipv6-broadcast.service" sudo systemctl daemon-reload sudo systemctl enable ssb-broadcast.service +sudo systemctl enable ssb-ipv6-broadcast.service From 4ba09eeaae166ecf789482fb04f9322a4739c0e8 Mon Sep 17 00:00:00 2001 From: darkdrgn2k Date: Fri, 19 Jul 2019 20:28:22 -0400 Subject: [PATCH 3/5] Update ssb-ipv6-broadcast.service --- scripts/ssb/ssb-ipv6-broadcast.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ssb/ssb-ipv6-broadcast.service b/scripts/ssb/ssb-ipv6-broadcast.service index 7879fd755..bc02ab11f 100644 --- a/scripts/ssb/ssb-ipv6-broadcast.service +++ b/scripts/ssb/ssb-ipv6-broadcast.service @@ -4,8 +4,8 @@ Wants=network.target After=ssb.service [Service] -Type=simple -ExecStart=/usr/bin/socat UDP6-LISTEN:8008,fork,su=nobody UDP4:127.0.0.1:8008 +Type=forking +ExecStart=/usr/bin/socat UDP6-LISTEN:8008,reuseaddr,fork,su=nobody UDP4:127.0.0.1:8008 ExecStop=/bin/kill -s QUIT $MAINPID Restart=on-failure RestartSec=10s From 93e9d143797874fefd2bd67247d94552a0cb4462 Mon Sep 17 00:00:00 2001 From: darkdrgn2k Date: Fri, 19 Jul 2019 20:41:16 -0400 Subject: [PATCH 4/5] Update ssb-ipv6-broadcast.service --- scripts/ssb/ssb-ipv6-broadcast.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ssb/ssb-ipv6-broadcast.service b/scripts/ssb/ssb-ipv6-broadcast.service index bc02ab11f..82eaf853f 100644 --- a/scripts/ssb/ssb-ipv6-broadcast.service +++ b/scripts/ssb/ssb-ipv6-broadcast.service @@ -4,8 +4,8 @@ Wants=network.target After=ssb.service [Service] -Type=forking -ExecStart=/usr/bin/socat UDP6-LISTEN:8008,reuseaddr,fork,su=nobody UDP4:127.0.0.1:8008 +Type=simple +ExecStart=/usr/bin/socat UDP6-LISTEN:8008,reuseaddr,su=nobody UDP4:127.0.0.1:8008 ExecStop=/bin/kill -s QUIT $MAINPID Restart=on-failure RestartSec=10s From 2b320a603519ece68f82beadb7578fdd84fc2649 Mon Sep 17 00:00:00 2001 From: darkdrgn2k Date: Fri, 19 Jul 2019 20:59:03 -0400 Subject: [PATCH 5/5] Update ssb-ipv6-broadcast.service --- scripts/ssb/ssb-ipv6-broadcast.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ssb/ssb-ipv6-broadcast.service b/scripts/ssb/ssb-ipv6-broadcast.service index 82eaf853f..9a37ce437 100644 --- a/scripts/ssb/ssb-ipv6-broadcast.service +++ b/scripts/ssb/ssb-ipv6-broadcast.service @@ -5,7 +5,7 @@ After=ssb.service [Service] Type=simple -ExecStart=/usr/bin/socat UDP6-LISTEN:8008,reuseaddr,su=nobody UDP4:127.0.0.1:8008 +ExecStart=/usr/bin/socat -T 4 UDP6-LISTEN:8008,reuseaddr,fork,su=nobody UDP4:127.0.0.1:8008 ExecStop=/bin/kill -s QUIT $MAINPID Restart=on-failure RestartSec=10s