From a836df5d594b291ceba695a356399325069b7c5b Mon Sep 17 00:00:00 2001
From: "Justin (shocknet)" <capitalist_dog@tuta.io>
Date: Wed, 8 May 2024 16:42:31 -0400
Subject: [PATCH] ffs

---
 {lightning-pub => Umbrel}/docker-compose.yml |  8 ++---
 Umbrel/umbrel-app.yml                        | 36 +++++++++++++++++++
 lightning-pub/umbrel-app.yml                 | 38 --------------------
 tsconfig.json                                |  2 +-
 4 files changed, 41 insertions(+), 43 deletions(-)
 rename {lightning-pub => Umbrel}/docker-compose.yml (74%)
 create mode 100644 Umbrel/umbrel-app.yml
 delete mode 100644 lightning-pub/umbrel-app.yml

diff --git a/lightning-pub/docker-compose.yml b/Umbrel/docker-compose.yml
similarity index 74%
rename from lightning-pub/docker-compose.yml
rename to Umbrel/docker-compose.yml
index 82c87720..66556f1e 100644
--- a/lightning-pub/docker-compose.yml
+++ b/Umbrel/docker-compose.yml
@@ -2,11 +2,11 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: lightning-pub_server_1
-      APP_PORT: 8090
+      APP_HOST: lightning-pub
+      APP_PORT: 1776
       
   server:
-    image: bixie/lightning-pub:latest@sha256:9eac671645d31d1caa4c99b354d174b49d0c258486503994515aee35f481f847
+    image:
     volumes:
       - "${APP_DATA_DIR}/data:/data"
       - "${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro"
@@ -17,6 +17,6 @@ services:
       LND_MACAROON_PATH: "/lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/admin.macaroon"
       DATABASE_FILE: "/data/db.sqlite"
       METRICS_DATABASE_FILE: "/data/metrics.sqlite"
-      PORT: 8090
+      PORT: 1776
     restart: on-failure
     stop_grace_period: 1m
diff --git a/Umbrel/umbrel-app.yml b/Umbrel/umbrel-app.yml
new file mode 100644
index 00000000..5bb9ee2e
--- /dev/null
+++ b/Umbrel/umbrel-app.yml
@@ -0,0 +1,36 @@
+  manifestVersion: 1
+id: lightning-pub
+category: finance
+name: Lightning.Pub
+version: "1.0.0"
+tagline: lightning, nostr, accounts, lnurl, web
+description: >-
+"Pub" is a Nostr-native account system designed 
+to make running Lightning infrastructure for your friends/family/customers 
+easier than previously thought possible.
+
+ Being Nostr-native eliminates the complexity of configuring your node like a server by using commodity Nostr relays. 
+These relays, unlike LNURL proxies, are trustless by nature of Nostr's own encryption spec (NIP44).
+
+ Support for optional services are integrated into Pub for operators seeking backward compatibility with legacy LNURLs and Lightning Addresses.
+
+ By solving the networking and programability hurdles, Pub provides Lightning with a 3rd Layer that enables node-runners and 
+ Uncle Jims to more easily bring their personal network into Bitcoin's permissionless economy. In doing so, Pub runners 
+ can keep the Lightning Network decentralized, with custodial scaling that is free of fiat rails, large banks, 
+ and other forms of high-time-preference shitcoinery.
+developer: shocknet
+website: https://shock.network
+dependencies:
+  - lightning
+repo: https://github.com/shocknet/Lightning.Pub
+support: https://github.com/shocknet/Lightning.Pub/discussions
+port: 1776
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+defaultUsername: ""
+defaultPassword: ""
+submitter: shocknet
+submission: https://github.com/getumbrel/umbrel/pull/334
\ No newline at end of file
diff --git a/lightning-pub/umbrel-app.yml b/lightning-pub/umbrel-app.yml
deleted file mode 100644
index f1dc7365..00000000
--- a/lightning-pub/umbrel-app.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-  manifestVersion: 1
-id: lightning-pub
-category: finance
-name: Lightning Pub
-version: "3.3.0"
-tagline: Simple, database-free blockchain explorer
-description: >-
-  BTC RPC Explorer is a full-featured, self-hosted explorer for the
-  Bitcoin blockchain. With this explorer, you can explore not just the
-  blockchain database, but also explore the functional capabilities of your
-  Umbrel.
-
-  It comes with a network summary dashboard, detailed view of blocks, transactions, addresses, along with analysis tools for viewing stats on miner activity, mempool summary, with fee, size, and age breakdowns. You can also search by transaction ID, block hash/height, and addresses.
-
-  It's time to appreciate the "fullness" of your node.
-releaseNotes: >-
-  Dark mode is finally here! Easily switch between your preferred mode
-  in one click.
-
-  This version also includes lots of minor styling improvements, better
-  error handling, and several bugfixes.
-developer: Dan Janosik
-website: https://explorer.btc21.org
-dependencies:
-  - bitcoin
-  - lightning
-repo: https://github.com/janoside/btc-rpc-explorer
-support: https://github.com/janoside/btc-rpc-explorer/discussions
-port: 8090
-gallery:
-  - 1.jpg
-  - 2.jpg
-  - 3.jpg
-path: ""
-defaultUsername: ""
-defaultPassword: ""
-submitter: Umbrel
-submission: https://github.com/getumbrel/umbrel/pull/334
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index d6a10f46..1bff3bae 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -68,4 +68,4 @@
    "exclude": [
       "./tests"
    ],
-}
\ No newline at end of file
+}