Add umbreld scaffolding and implement migration assistant

docker-compose.yml

@@ -53,13 +53,11 @@ services:
                         - ${PWD}/tor/data:/var/lib/tor/
                         - /var/run/docker.sock:/var/run/docker.sock
                         - ${DOCKER_BINARY:-/usr/bin/docker}:/usr/bin/docker
-                        - jwt-public-key:/jwt-public-key
-                        - jwt-private-key:/jwt-private-key
                 environment:
                     PORT: "3006"
                     USER_PASSWORD_FILE: "/db/user.json"
-                    JWT_PUBLIC_KEY_FILE: "/jwt-public-key/jwt.pem"
-                    JWT_PRIVATE_KEY_FILE: "/jwt-private-key/jwt.key"
+                    JWT_PUBLIC_KEY_FILE: "/db/jwt.pem"
+                    JWT_PRIVATE_KEY_FILE: "/db/jwt.key"
                     JWT_EXPIRATION: "3600"
                     DOCKER_COMPOSE_DIRECTORY: $PWD
                     UMBREL_SEED_FILE: "/db/umbrel-seed/seed"
@@ -119,7 +117,3 @@ networks:
           driver: default
           config:
               - subnet: "$NETWORK_IP/16"
-
-volumes:
-    jwt-public-key:
-    jwt-private-key:

package.json

@@ -0,0 +1 @@
+{}

scripts/start

@@ -124,6 +124,13 @@ echo "Starting decoy backup trigger..."
 echo
 ./scripts/backup/decoy-trigger &>> "${UMBREL_LOGS}/backup-decoy-trigger.log" &
 
+if [[ "${@}" != *"--no-start-server"* ]]; then
+ echo "Starting umbreld..."
+  echo
+  pkill --full 'caxa.*umbreld' || true
+  ./bin/umbreld --data-directory "${UMBREL_ROOT}" &>> "${UMBREL_LOGS}/umbreld.log" &
+fi
+
 compose_files=()
 
 if [[ "${REMOTE_TOR_ACCESS}" == "true" ]]; then

scripts/stop

@@ -39,6 +39,10 @@ ps -Af \
   | awk '{print $2}' \
   | xargs sudo kill 2> /dev/null || true
 
+if [[ "${@}" != *"--no-stop-server"* ]]; then
+ pkill --full 'caxa.*umbreld' || true
+fi
+
 echo "Stopping installed apps..."
 echo
 "${UMBREL_ROOT}/scripts/app" stop installed