From 98f844c5de1d7cc69b41c89fdfcb0a2001215461 Mon Sep 17 00:00:00 2001 From: qo-op Date: Mon, 23 Mar 2020 20:38:06 +0100 Subject: [PATCH 1/3] ssb --- .install/scuttlebutt.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index f139108..dd1412b 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -37,10 +37,10 @@ scuttlebutt() { # Create config (TODO: adapt if public Pub or Local Node) nodename=$(cat /etc/hostname) - extension=$($(echo $nodename | cut -d '.' -f 2)) + extension=$(echo $nodename | cut -d '.' -f 2) if [[ $extension == "" ]]; then - nodename=$(echo $nodename).home + nodename=$nodename.home # LOCAL cat > ~/.ssb/config < Date: Mon, 23 Mar 2020 20:52:51 +0100 Subject: [PATCH 2/3] ssb install fix --- .install/scuttlebutt.sh | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index dd1412b..e954782 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -1,16 +1,11 @@ #!/bin/bash scuttlebutt() { - echo -e "${c_yellow}Onboarding SCUTTLEBUTT...$c_" where_is_ssb_installed=$(which ssb-server) - - # Install npm_modules in ~/.zen/fatlayer_install - mkdir -p ~/.zen/fatlayer_install BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" if [[ ! $where_is_ssb_installed ]]; then - cd ~/.zen/fatlayer_install # Install dependencies sudo apt-get install -y socat python3-dev libtool python3-setuptools autoconf automake @@ -19,7 +14,8 @@ scuttlebutt() { source ~/.bashrc nvm install --lts - # Install sbot-server + # Install ssb-server and config in ~/.ssb_astroport + [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport && cd ~/.ssb_astroport npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query npm install -g ssb-server fi @@ -29,11 +25,10 @@ scuttlebutt() { [[ $ssbSERVER == "" ]] && echo "Check your ssb-server install... Cannot find it !!" && exit 1 # BACKUP OLD SSB - [[ -d ~/.ssb ]] && mv ~/.ssb ~/.ssb.$USER # BACKUP OLD SSB + [[ -d ~/.ssb ]] && [[ ! -d ~/.ssb.$USER ]] && mv ~/.ssb ~/.ssb.$USER # BACKUP OLD SSB - # MAKE A LINK ~/.ssb.astroport to ~/.ssb - mkdir ~/.ssb.astroport - ln -s ~/.ssb.astroport ~/.ssb + # MAKE A LINK ~/.ssb_astroport to ~/.ssb + [[ -L ~/.ssb ]] && rm ~/.ssb && ln -s ~/.ssb_astroport ~/.ssb # Create config (TODO: adapt if public Pub or Local Node) nodename=$(cat /etc/hostname) @@ -83,20 +78,21 @@ EOF # Store current user as sudo will change it currentUser=$USER - + [[ -f /etc/systemd/system/ssb.service ]] && rm -f /etc/systemd/system/ssb.service # Copy SYSTEMD service to correct location - cp "$BASE_DIR/ssb.service" /tmp/ssb.service + sudo cp "$BASE_DIR/ssb.service" /tmp/ssb.service # Copy repplace __USER__ place holder to current user - sed -i "s|__USER__|${currentUser}|g" /tmp/ssb.service - sed -i "s|__SSBSERVER__|${ssbSERVER}|g" /tmp/ssb.service + sudo sed -i "s|__USER__|${currentUser}|g" /tmp/ssb.service + sudo sed -i "s|__SSBSERVER__|ssb-server|g" /tmp/ssb.service - echo -e "${c_yellow}Installing ssb.service...$c_" sudo mv /tmp/ssb.service /etc/systemd/system/ssb.service # Reload, Enable and start SSB Service sudo systemctl daemon-reload sudo systemctl enable ssb.service - sudo systemctl start ssb.service + sudo systemctl restart ssb.service + + sudo systemctl status ssb.service } From 6ad4defdda574d3941105f8d472adf19ddae4333 Mon Sep 17 00:00:00 2001 From: qo-op Date: Mon, 23 Mar 2020 21:38:52 +0100 Subject: [PATCH 3/3] still buggy --- .install/scuttlebutt.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index e954782..404308c 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -15,20 +15,26 @@ scuttlebutt() { nvm install --lts # Install ssb-server and config in ~/.ssb_astroport - [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport && cd ~/.ssb_astroport + [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport + cd ~/.ssb_astroport npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query npm install -g ssb-server fi - - # test Install + + # TEST ssb-server Install ssbSERVER=$(which ssb-server) [[ $ssbSERVER == "" ]] && echo "Check your ssb-server install... Cannot find it !!" && exit 1 - - # BACKUP OLD SSB - [[ -d ~/.ssb ]] && [[ ! -d ~/.ssb.$USER ]] && mv ~/.ssb ~/.ssb.$USER # BACKUP OLD SSB + + # If exists backup ~/.ssb to ~/.ssb_$USER SSB (one time only !) + [[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER + # CREATE ~/.ssb_astroport + [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport && cd ~/.ssb_astroport + # if exists, keep ~/.ssb_$USER/secret* + [[ ! -f ~/.ssb_astroport/secret ]] && [[ -f ~/.ssb_$USER/secret ]] && cp -f ~/.ssb_$USER/secret* ~/.ssb_astroport/ - # MAKE A LINK ~/.ssb_astroport to ~/.ssb - [[ -L ~/.ssb ]] && rm ~/.ssb && ln -s ~/.ssb_astroport ~/.ssb + # Symlink ~/.ssb -> ~/.ssb_astroport + [[ -L ~/.ssb ]] && rm ~/.ssb + [[ -d ~/.ssb_astroport ]] && ln -s ~/.ssb_astroport ~/.ssb # Create config (TODO: adapt if public Pub or Local Node) nodename=$(cat /etc/hostname) @@ -78,12 +84,12 @@ EOF # Store current user as sudo will change it currentUser=$USER - [[ -f /etc/systemd/system/ssb.service ]] && rm -f /etc/systemd/system/ssb.service + [[ -f /etc/systemd/system/ssb.service ]] && sudo rm -f /etc/systemd/system/ssb.service # Copy SYSTEMD service to correct location - sudo cp "$BASE_DIR/ssb.service" /tmp/ssb.service + cp "$BASE_DIR/ssb.service" /tmp/ssb.service # Copy repplace __USER__ place holder to current user - sudo sed -i "s|__USER__|${currentUser}|g" /tmp/ssb.service - sudo sed -i "s|__SSBSERVER__|ssb-server|g" /tmp/ssb.service + sed -i "s|__USER__|${currentUser}|g" /tmp/ssb.service + sed -i "s|__SSBSERVER__|ssb-server|g" /tmp/ssb.service sudo mv /tmp/ssb.service /etc/systemd/system/ssb.service