From 3b714553a57c6ff378957d171fa9ea67fe266b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Rouits?= <brouits@free.fr>
Date: Wed, 27 May 2020 21:01:17 +0200
Subject: [PATCH 1/2] Confgure a systemd service for OASIS

---
 .install/scuttlebutt.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh
index fa7e5e2..13e3f1b 100755
--- a/.install/scuttlebutt.sh
+++ b/.install/scuttlebutt.sh
@@ -92,11 +92,24 @@ scuttlebutt() {
 }
 EOF
 
-    cat > ~/.zen/launch-oasis.sh <<EOF
-#!/bin/bash
-oasis --allow-host $nodename --host $nodename
+echo "CREATE SYSTEMD oasis SERVICE >>>>>>>>>>>>>>>>>>"
+cat > /tmp/oasis.service <<EOF
+[Unit]
+Description=OASIS Scuttlebutt Gateway
+After=network.target
+
+[Service]
+User=_USER_
+ExecStart=/usr/local/bin/oasis --host $nodename --allow-host $nodename
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
 EOF
 
+sudo cp -f /tmp/oasis.service /etc/systemd/system/
+sudo sed -i "s/_USER_/$USER/g" /etc/systemd/system/oasis.service
+
 	echo "
          _      __ __ _  
  _ _ .__|_o _  (_ (_ |_) 
@@ -112,13 +125,13 @@ __)|_| \ \/ |_| \ || || |_ ... SCUTTLEBUTT ... OK?
                            
 '
 	echo "Launching oasis"
-    oasis --allow-host $nodename --host $nodename &
+
+sudo systemctl daemon-reload || err "Restart OASIS"
+sudo systemctl enable oasis || err "Enable OASIS daemon"
+
     echo " http://$nodename:3000 "
     echo
-	echo "ADD ~/.zen/launch-oasis.sh TO YOUR '/etc/rc.local' !!! Or use patchwork. "
     sleep $((1 + RANDOM % 5))
-	echo "LAUNCHING OASIS NODE MANAGER http://$nodename:3000"
-
     echo "IF YOU ARE A PUB consider protect it behind password nginx redirect !!!"
 
     echo "3 seconds before ssb_INIT.sh..."
-- 
2.39.2


From 5aea82090ea95ab6926fb55d09727534ddad5308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Rouits?= <brouits@free.fr>
Date: Fri, 29 May 2020 12:31:46 +0200
Subject: [PATCH 2/2] Fix oasis setup

---
 .install/scuttlebutt.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh
index 13e3f1b..169a2dc 100755
--- a/.install/scuttlebutt.sh
+++ b/.install/scuttlebutt.sh
@@ -100,15 +100,16 @@ After=network.target
 
 [Service]
 User=_USER_
-ExecStart=/usr/local/bin/oasis --host $nodename --allow-host $nodename
+ExecStart=/usr/local/bin/oasis --host _NODENAME_ --allow-host _NODENAME_
 Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
 EOF
 
+sed -i "s/_USER_/$USER/g" /tmp/oasis.service
+sed -i "s/_NODENAME_/$nodename/g" /tmp/oasis.service
 sudo cp -f /tmp/oasis.service /etc/systemd/system/
-sudo sed -i "s/_USER_/$USER/g" /etc/systemd/system/oasis.service
 
 	echo "
          _      __ __ _  
@@ -126,8 +127,9 @@ __)|_| \ \/ |_| \ || || |_ ... SCUTTLEBUTT ... OK?
 '
 	echo "Launching oasis"
 
-sudo systemctl daemon-reload || err "Restart OASIS"
+sudo systemctl daemon-reload || err "Reload systemd"
 sudo systemctl enable oasis || err "Enable OASIS daemon"
+sudo systemctl start oasis || err "Start OASIS daemon"
 
     echo " http://$nodename:3000 "
     echo
-- 
2.39.2