unstash

.gitignore

@@ -3,7 +3,10 @@
 *.db
 *.macaroon
 node_modules
+<<<<<<< Updated upstream
 nostr-wallet-connect
+=======
+>>>>>>> Stashed changes
 albyhub
 nwc.db
 docker-images/

NOTES.md

@@ -53,7 +53,11 @@ docker run \
 -v data:/data \
 -p 21284:21284 \
 --name timeintocrypto \
+<<<<<<< Updated upstream
 -it horologger/albyhub:v0.4.2
+=======
+-it horologger/albyhub:v0.4.2 
+>>>>>>> Stashed changes
 ```
 
 On Ragnar
@@ -69,13 +73,21 @@ docker run \
 -e LND_ADDRESS=$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT \
 -e LND_CERT_FILE="/lnd/tls.cert" \
 -e LND_MACAROON_FILE="/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon" \
+<<<<<<< Updated upstream
 -e WORK_DIR="/data/albyhub" \
+=======
+-e DATABASE_URI="/data/albyhub.db" \
+>>>>>>> Stashed changes
 -e COOKIE_SECRET="666" \
 -v /home/alunde/albyhub/data:/data \
 -v /t4/lnd:/lnd:ro \
 -p 8080:8080 \
 --name nwc \
+<<<<<<< Updated upstream
 -it horologger/albyhub:v0.4.2
+=======
+-it horologger/albyhub:v0.4.2 
+>>>>>>> Stashed changes
 ```
 Subsequent runs
 ```sh
@@ -84,26 +96,42 @@ docker run \
 -e LND_ADDRESS=ragnar:10009 \
 -e LND_CERT_FILE="/lnd/tls.cert" \
 -e LND_MACAROON_FILE="/lnd/data/chain/bitcoin/bitcoin/admin.macaroon" \
+<<<<<<< Updated upstream
 -e WORK_DIR="/data/albyhub" \
+=======
+-e DATABASE_URI="/data/albyhub.db" \
+>>>>>>> Stashed changes
 -e COOKIE_SECRET="666" \
 -v /data:/data \
 -v /lnd-data:/lnd:ro \
 -p 8080:8080 \
 --name nwc \
+<<<<<<< Updated upstream
 -it horologger/albyhub:v0.4.2
+=======
+-it horologger/albyhub:v0.4.2 
+>>>>>>> Stashed changes
 
 docker run \
 -e LN_BACKEND_TYPE="LND" \
 -e LND_ADDRESS=ragnar:10009 \
 -e LND_CERT_FILE="/lnd/tls.cert" \
 -e LND_MACAROON_FILE="/lnd/data/chain/bitcoin/mainnet/admin.macaroon" \
+<<<<<<< Updated upstream
 -e WORK_DIR="/data/albyhub" \
+=======
+-e DATABASE_URI="/data/albyhub.db" \
+>>>>>>> Stashed changes
 -e COOKIE_SECRET="666" \
 -v data:/data \
 -v lnd-data:/lnd:ro \
 -p 8080:8080 \
 --name nwc \
+<<<<<<< Updated upstream
 -it horologger/albyhub:v0.4.2
+=======
+-it horologger/albyhub:v0.4.2 
+>>>>>>> Stashed changes
 
 ```
 Inspect

gitconfig

@@ -6,7 +6,7 @@
 	ignorecase = true
 	precomposeunicode = true
 [remote "origin"]
-	url = git@horologger-github:horologger/nostr-wallet-connect-startos.git
+	url = git@horologger-github:horologger/albyhub-startos.git
 	fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "main"]
 	remote = origin

manifest.yaml

@@ -4,8 +4,13 @@ version: 0.6.2
 release-notes: Alby Hub initial release
 license: Apache-2.0
 wrapper-repo: "https://github.com/horologger/albyhub-startos"
+<<<<<<< Updated upstream
 upstream-repo: "https://github.com/getAlby/hub"
 support-site: "https://github.com/getAlby/hub/issues"
+=======
+upstream-repo: "https://github.com/getAlby/albyhub-next"
+support-site: "https://github.com/getAlby/albyhub-next/issues"
+>>>>>>> Stashed changes
 marketing-site: "https://getalby.com/"
 build: ["make"]
 description: