Fix key

Previously, the human-readable name was compared to the app id

.gitignore

@@ -25,7 +25,6 @@ electrs/*
 fulcrumx/*
 nginx/*
 redis/*
-events/signals/*
 docker-compose.override.yml
 
 # Commit these empty directories
@@ -36,7 +35,6 @@ docker-compose.override.yml
 !db/citadel-seed
 db/citadel-seed/*
 !db/citadel-seed/.gitkeep
-!events/signals/.gitkeep
 !lnd/.gitkeep
 !logs/.gitkeep
 !tor/data/.gitkeep
@@ -46,7 +44,6 @@ db/citadel-seed/*
 !nginx/.gitkeep
 !redis/.gitkeep
 !fulcrumx/.gitkeep
-!events/signals/.gitkeep
 
 !**/*.license
 services/installed.json

app-system/sources.list

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # A collection of fully FLOSS app definitions and FLOSS apps for Citadel.
-https://github.com/runcitadel/apps v3-stable
+https://github.com/runcitadel/apps v3-beta
 
 # Some apps modified version of Umbrel apps, and their app definitions aren't FLOSS yet.
 # Include them anyway, but as a separate repo.
 # Add a # to the line below to disable the repo and only use FLOSS apps.
-https://github.com/runcitadel/apps-nonfree v3-stable
+https://github.com/runcitadel/apps-nonfree v3-beta

docker-compose.yml

@@ -120,7 +120,6 @@ services:
     volumes:
     - ${PWD}/info.json:/info.json
     - ${PWD}/db:/db
-    - ${PWD}/events/signals:/signals
     - ${PWD}/events:/events
     - ${PWD}/apps:/apps
     - ${PWD}/lnd:/lnd:ro

info.json

@@ -1,6 +1,6 @@
 {
-    "version": "0.0.4",
+    "version": "0.0.4-rc.1",
-    "name": "Citadel 0.0.4",
+    "name": "Citadel 0.0.4 Release Candidate 1",
     "requires": ">=0.0.1",
-    "notes": "This update fixes multiple bugs in the 0.0.3 release."
+    "notes": "This update fixes multiple bugs in the 0.0.4 release."
 }

scripts/add-https

@@ -53,11 +53,17 @@ with open(registry_file) as file:
 
 port = None
 for app in registry:
-    if app['name'] == service:
+    if app['id'] == service:
         if "internalPort" in app:
             port = app['internalPort']
+        else:
+            port = app['port']
         break
 
+if port is None:
+    print("No port found!")
+    exit(1)
+
 original_config = crossplane.parse(nginx_config_file)
 parsedConfig = original_config["config"][0]["parsed"]
 
@@ -70,14 +76,6 @@ ip_alt_env_var = "APP_{}_MAIN_IP".format(
     service.upper().replace("-", "_")
 )
 
-port_env_var = "APP_{}_WEB_PORT".format(
-    service.upper().replace("-", "_")
-)
-
-port_alt_env_var = "APP_{}_MAIN_PORT".format(
-    service.upper().replace("-", "_")
-)
-
 env = parse_dotenv(os.path.join(node_root, '.env'))
 
 ip=None
@@ -89,21 +87,6 @@ else:
     print("Error: No IP found for {}".format(service))
     exit(1)
 
-if port == None:
-    if port_env_var in env:
-        port = env[port_env_var]
-    elif port_alt_env_var in env:
-        port = env[port_alt_env_var]
-    else:
-        print("Error: No port found for {}".format(service))
-        exit(1)
-
-if service == "btcpay-server":
-    port = 1234
-
-if service == "lnme":
-    port = 1323
-
 actual_url="http://{}:{}".format(ip, port)
 
 

scripts/backup/decoy-trigger

@@ -39,7 +39,7 @@ main () {
     echo "Sleeping for ${delay} seconds..."
     sleep $delay
     echo "Triggering decoy backup..."
-    touch "${CITADEL_ROOT}/events/signals/backup"
+    "${CITADEL_ROOT}/scripts/backup/backup"
   done
 }
 

scripts/backup/monitor

@@ -48,10 +48,10 @@ monitor_file () {
       sleep 1
     done
     echo "$file_path created! Triggering backup..."
-    touch "${CITADEL_ROOT}/events/signals/backup"
+    "${CITADEL_ROOT}/scripts/backup/backup"
   fi
 
-  fswatch -0 --event Updated $file_path | xargs -0 -n 1 -I {} touch "${CITADEL_ROOT}/events/signals/backup"
+  fswatch -0 --event Updated $file_path | xargs -0 -n 1 -I {} "${CITADEL_ROOT}/scripts/backup/backup"
 }
 
 if [[ ! -d "${CITADEL_ROOT}" ]]; then

scripts/update/.updateignore

@@ -5,7 +5,6 @@ lnd/*
 statuses
 tor/*
 electrs/*
-events/signals
 logs/*
 app-data/*
 apps/networking.json