From 3535cd89f92b5dab1ebf93cdb39f38a5ccc5ee19 Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Wed, 9 Feb 2022 16:08:03 +0700
Subject: [PATCH] Add urbit app (#1246)

Co-authored-by: Amadeo Bellotti <amadeo.bellotti@gmail.com>
---
 apps/registry.json            | 23 +++++++++++++++++++++++
 apps/urbit/docker-compose.yml | 16 ++++++++++++++++
 scripts/configure             |  8 ++++++++
 templates/.env-sample         |  5 ++++-
 templates/torrc-server-sample |  4 ++++
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 apps/urbit/docker-compose.yml

diff --git a/apps/registry.json b/apps/registry.json
index 8ff7d6b..4198503 100644
--- a/apps/registry.json
+++ b/apps/registry.json
@@ -849,5 +849,28 @@
         "path": "",
         "defaultUsername": "lndg-admin",
         "deterministicPassword": true
+    },
+    {
+        "id": "urbit",
+        "category": "Networking",
+        "name": "Urbit",
+        "version": "0.1.0",
+        "tagline": "Run Urbit on your Umbrel",
+        "description": "Urbit is a personal server for self-sovereign personal & networked computing. Nock, a functional combinator, is built into Hoon, a system programming language, used to implement Arvo, a deterministic operating system, that communicates over Ames, a decentralized, encrypted P2P network.\n\nThis app helps you boot and manage Urbit instances on your Umbrel. It provides a simple management GUI, start and stop operations, and passes your +code through the interface.\n\nCredit to ~timluc-miptev, ~master-forwex, ~sipsen-pilser & ~rivpyl-sidfyl",
+        "developer": "~mopfel-winrux & ~sitful-hatred",
+        "website": "https://github.com/mopfel-winrux/urbit-umbrel",
+        "dependencies": [],
+        "repo": "https://github.com/mopfel-winrux/urbit-umbrel",
+        "support": "https://github.com/mopfel-winrux/urbit-umbrel/issues",
+        "port": 8090,
+        "gallery": [
+            "1.jpg",
+            "2.jpg",
+            "3.jpg"
+        ],
+        "path": "/launch",
+        "defaultUsername": "umbrel",
+        "deterministicPassword": true,
+        "torOnly": false
     }
 ]
diff --git a/apps/urbit/docker-compose.yml b/apps/urbit/docker-compose.yml
new file mode 100644
index 0000000..9d4d8f5
--- /dev/null
+++ b/apps/urbit/docker-compose.yml
@@ -0,0 +1,16 @@
+version: "3.3"
+services:
+  manager:
+    image: mopfelwinrux/urbit-umbrel:latest@sha256:72630ed72801d615a1ef5de0bbe0234855d7434d529542b09206a72fb4a8367c
+    ports:
+      - "${APP_URBIT_PORT}:8090"
+      - "${APP_URBIT_P2P_PORT}:34343"
+    volumes:
+      - ${APP_DATA_DIR}/piers:/data/piers
+      - ${APP_DATA_DIR}/keys:/data/keys
+    environment:
+      FLASK_APP: app
+      APP_PASSWORD: ${APP_PASSWORD}
+    networks:
+      default:
+        ipv4_address: $APP_URBIT_IP
diff --git a/scripts/configure b/scripts/configure
index da4811b..5e665e9 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -234,6 +234,11 @@ APP_SUREDBITS_WALLET_SERVER_IP="10.21.21.74"
 APP_SUREDBITS_WALLET_P2P_PORT="2862"
 APP_LNDG_IP="10.21.21.75"
 APP_LNDG_PORT="8889"
+APP_LNDG_IP="10.21.21.75"
+APP_LNDG_PORT="8889"
+APP_URBIT_IP="10.21.21.76"
+APP_URBIT_PORT="8090"
+APP_URBIT_P2P_PORT="34343"
 
 # Generate RPC credentials
 if [[ -z ${BITCOIN_RPC_USER+x} ]] || [[ -z ${BITCOIN_RPC_PASS+x} ]] || [[ -z ${BITCOIN_RPC_AUTH+x} ]]; then
@@ -470,6 +475,9 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
   sed -i "s/<app-suredbits-wallet-p2p-port>/${APP_SUREDBITS_WALLET_P2P_PORT}/g" "${template}"
   sed -i "s/<app-lndg-ip>/${APP_LNDG_IP}/g" "${template}"
   sed -i "s/<app-lndg-port>/${APP_LNDG_PORT}/g" "${template}"
+  sed -i "s/<app-urbit-ip>/${APP_URBIT_IP}/g" "${template}"
+  sed -i "s/<app-urbit-port>/${APP_URBIT_PORT}/g" "${template}"
+  sed -i "s/<app-urbit-p2p-port>/${APP_URBIT_P2P_PORT}/g" "${template}"
 done
 
 ##########################################################
diff --git a/templates/.env-sample b/templates/.env-sample
index 354b7ef..8aad809 100644
--- a/templates/.env-sample
+++ b/templates/.env-sample
@@ -133,4 +133,7 @@ APP_SUREDBITS_WALLET_PORT=<app-suredbits-wallet-port>
 APP_SUREDBITS_WALLET_SERVER_IP=<app-suredbits-wallet-server-ip>
 APP_SUREDBITS_WALLET_P2P_PORT=<app-suredbits-wallet-p2p-port>
 APP_LNDG_IP=<app-lndg-ip>
-APP_LNDG_PORT=<app-lndg-port>
\ No newline at end of file
+APP_LNDG_PORT=<app-lndg-port>
+APP_URBIT_IP=<app-urbit-ip>
+APP_URBIT_PORT=<app-urbit-port>
+APP_URBIT_P2P_PORT=<app-urbit-p2p-port>
\ No newline at end of file
diff --git a/templates/torrc-server-sample b/templates/torrc-server-sample
index 86d2a1f..a7079f8 100644
--- a/templates/torrc-server-sample
+++ b/templates/torrc-server-sample
@@ -197,3 +197,7 @@ HiddenServicePort <app-suredbits-wallet-p2p-port> <app-suredbits-wallet-server-i
 # lndg Hidden Service
 HiddenServiceDir /data/app-lndg
 HiddenServicePort 80 <app-lndg-ip>:<app-lndg-port>
+
+# urbit Hidden Service
+HiddenServiceDir /data/app-urbit
+HiddenServicePort 80 <app-urbit-ip>:<app-urbit-port>