v0.9.5: bubble for Android 0.7.8 — the relay is just a relay server: its address is a setting, and deploy-relay.sh reads scripts/relay.env
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Deploy bubble-relay to jai (see ~/Documents/shared-resources/jai.html#run).
|
||||
# jai is production: this only ever touches ~/Documents/bubble-server and its
|
||||
# own screen session, and installs nothing.
|
||||
#
|
||||
# scripts/deploy-jai.sh copy the code and (re)start the service
|
||||
# scripts/deploy-jai.sh --stop stop it
|
||||
# scripts/deploy-jai.sh --token print the bearer token, for Settings → Rabbit relay on the desktop
|
||||
#
|
||||
# What runs is server/run.sh, also started by jai's ~/startup.sh (re-run by its
|
||||
# watchdog every 5 minutes), so it comes back after a crash or a reboot.
|
||||
set -euo pipefail
|
||||
HOST=${JAI_HOST:-jai-ext}
|
||||
DIR=/home/jai/Documents/bubble-server
|
||||
NAME=bubble-relay
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
case "${1:-}" in
|
||||
--token) ssh "$HOST" "cat $DIR/data/token"; echo; exit 0 ;;
|
||||
--stop) ssh "$HOST" "screen -S $NAME -X quit || true"; echo "stopped"; exit 0 ;;
|
||||
esac
|
||||
|
||||
ssh "$HOST" "mkdir -p $DIR/app $DIR/data ~/service-logs && chmod 700 $DIR $DIR/data"
|
||||
rsync -a server/bubble_relay.py server/run.sh "$HOST:$DIR/app/"
|
||||
ssh "$HOST" bash -s <<REMOTE
|
||||
set -e
|
||||
screen -S $NAME -X quit 2>/dev/null || true
|
||||
sleep 1
|
||||
screen -dmS $NAME bash -c 'bash $DIR/app/run.sh 2>&1 | tee ~/service-logs/$NAME.log'
|
||||
sleep 2
|
||||
for pid in \$(pgrep -f bubble_relay.py); do echo 1000 > /proc/\$pid/oom_score_adj; done
|
||||
curl -s -m 5 http://100.69.139.40:8080/health; echo
|
||||
REMOTE
|
||||
Executable
+36
@@ -0,0 +1,36 @@
|
||||
#!/bin/bash
|
||||
# Deploy the relay server (server/bubble_relay.py) over ssh. Where it goes
|
||||
# comes from scripts/relay.env (not in git; see scripts/relay.env.example).
|
||||
# This only touches $RELAY_DIR and its own screen session, and installs nothing.
|
||||
#
|
||||
# scripts/deploy-relay.sh copy the code and (re)start it
|
||||
# scripts/deploy-relay.sh --stop stop it
|
||||
# scripts/deploy-relay.sh --token print the bearer token, for Settings → Relay server on the desktop
|
||||
#
|
||||
# What runs is server/run.sh; have the server start that at boot too, e.g.
|
||||
# screen -dmS bubble-relay bash -c 'bash $RELAY_DIR/app/run.sh'
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
[ -f scripts/relay.env ] || { echo "No scripts/relay.env: copy scripts/relay.env.example and fill it in." >&2; exit 1; }
|
||||
. scripts/relay.env
|
||||
: "${RELAY_SSH:?}" "${RELAY_DIR:?}" "${RELAY_BIND:?}"
|
||||
PORT=${RELAY_PORT:-8080}
|
||||
NAME=bubble-relay
|
||||
|
||||
case "${1:-}" in
|
||||
--token) ssh "$RELAY_SSH" "cat $RELAY_DIR/data/token"; echo; exit 0 ;;
|
||||
--stop) ssh "$RELAY_SSH" "screen -S $NAME -X quit || true"; echo "stopped"; exit 0 ;;
|
||||
esac
|
||||
|
||||
ssh "$RELAY_SSH" "mkdir -p $RELAY_DIR/app $RELAY_DIR/data ~/service-logs && chmod 700 $RELAY_DIR $RELAY_DIR/data"
|
||||
rsync -a server/bubble_relay.py server/run.sh "$RELAY_SSH:$RELAY_DIR/app/"
|
||||
printf 'RELAY_BIND=%q\nRELAY_PORT=%q\n' "$RELAY_BIND" "$PORT" | ssh "$RELAY_SSH" "cat > $RELAY_DIR/app/relay.env"
|
||||
ssh "$RELAY_SSH" bash -s <<REMOTE
|
||||
set -e
|
||||
screen -S $NAME -X quit 2>/dev/null || true
|
||||
sleep 1
|
||||
screen -dmS $NAME bash -c 'bash $RELAY_DIR/app/run.sh 2>&1 | tee ~/service-logs/$NAME.log'
|
||||
sleep 2
|
||||
for pid in \$(pgrep -f bubble_relay.py); do echo 1000 > /proc/\$pid/oom_score_adj; done
|
||||
curl -s -m 5 http://$RELAY_BIND:$PORT/health; echo
|
||||
REMOTE
|
||||
@@ -0,0 +1,5 @@
|
||||
# Copy to scripts/relay.env (git ignores it) for scripts/deploy-relay.sh.
|
||||
RELAY_SSH=myserver # ssh host (an alias from ~/.ssh/config is fine)
|
||||
RELAY_DIR=/home/me/bubble-server # on the server: app/ and data/ (token, mailbox) go here
|
||||
RELAY_BIND=100.101.102.103 # the server's tailscale address; the desktop's Settings → Relay server uses http://<this>:<port>
|
||||
RELAY_PORT=8080
|
||||
Reference in New Issue
Block a user