Remove even more Umbrel references

app-system/sources.list

@@ -1,8 +1,11 @@
 # SPDX-FileCopyrightText: 2021 Aaron Dewes <aaron.dewes@protonmail.com>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
+
 # A collection of fully FLOSS app definitions and FLOSS apps for Citadel.
 https://github.com/runcitadel/apps main
-# Some apps copied from Umbrel which aren't fully FLOSS yet.
-# Enabled by default so we have all features from Umbrel.
+
+# 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 main

app/lib/composegenerator/v1/utils/networking.py

@@ -8,7 +8,8 @@ import random
 
 
 def getFreePort(networkingFile: str, appId: str):
-    # Ports used currently in Umbrel
+    # Ports used currently in Citadel
+    # TODO: Update this list, currently it's outdated
     usedPorts = [80, 8333, 8332, 28332, 28333, 28334, 10009, 8080, 50001, 9050, 3002, 3000, 3300, 3001, 3004, 25441,
                  3003, 3007, 3006, 3009, 3005, 8898, 3008, 8081, 8082, 8083, 8085, 2222, 8086, 8087, 8008, 8088, 8089, 8091]
     networkingData = {}

scripts/configure

@@ -28,7 +28,7 @@ def is_amd64():
   return subprocess.check_output(['uname', '-m']).decode('utf-8').strip() == 'x86_64'
 
 if not is_arm64() and not is_amd64():
-  print('Umbrel only works on arm64 and amd64!')
+  print('Citadel only works on arm64 and amd64!')
   exit(1)
 
 # Check the output of "docker compose version", if it matches "Docker Compose version v2.0.0-rc.3", return true

scripts/debug

@@ -26,7 +26,7 @@ upload() {
     --header "Content-Type: text/plain" \
     --request POST \
     --data-binary @- \
-    https://api.debug.umbrel.tech/api/upload \
+    https://citadel-debug-api.vercel.app/api/upload \
     | jq '.key' \
     | sed 's/"//g' \
     | awk -F '"' '{print "https://citadel-paste.vercel.app/"$1}'
@@ -39,7 +39,7 @@ torupload() {
     --request POST \
     --socks5 "localhost:${TOR_PROXY_PORT}" \
     --data-binary @- \
-    https://api.debug.umbrel.tech/api/upload \
+    https://citadel-debug-api.vercel.app/api/upload \
     | jq '.key' \
     | sed 's/"//g' \
     | awk -F '"' '{print "https://citadel-paste.vercel.app/"$1}'

scripts/start

@@ -42,7 +42,7 @@ if [[ ! -d "$CITADEL_ROOT" ]]; then
   exit 1
 fi
 
-# Configure Umbrel if it isn't already configured
+# Configure Citadel if it isn't already configured
 if [[ ! -f "${CITADEL_ROOT}/statuses/configured" ]]; then
   NGINX_PORT=${NGINX_PORT:-80} NETWORK="${NETWORK:-mainnet}" "${CITADEL_ROOT}/scripts/configure"
 fi
@@ -116,7 +116,7 @@ docker compose up --detach --build --remove-orphans || {
 }
 echo
 
-# Unlock the user file on each start of Umbrel to avoid issues
+# Unlock the user file on each start of Citadel to avoid issues
 # Normally, the user file shouldn't ever be locked, if it is, something went wrong, but it could still be working
 if [[ -f "${CITADEL_ROOT}/db/user.json.lock" ]]; then
   echo "WARNING: The user file was locked, Citadel probably wasn't shut down properly"

scripts/update/00-run.sh

@@ -10,11 +10,6 @@ set -euo pipefail
 RELEASE=$1
 CITADEL_ROOT=$2
 
-if [ -d "$CITADEL_ROOT/.umbrel-$RELEASE" ]; then
-    echo "Migration from Umbrel isn't supported anymore!" 
-    exit 1
-fi
-
 echo
 echo "======================================="
 echo "=============== UPDATE ================"

scripts/update/01-run.sh

@@ -10,12 +10,7 @@ set -euo pipefail
 RELEASE=$1
 CITADEL_ROOT=$2
 
-if [ -d "$CITADEL_ROOT/.umbrel-$RELEASE" ]; then
-    echo "Migration from Umbrel isn't supported anymore!" 
-    exit 1
-fi
-
-# Only used on Umbrel OS and Citadel OS
+# Only used on Citadel OS
 SD_CARD_CITADEL_ROOT="/sd-root${CITADEL_ROOT}"
 
 echo
@@ -39,7 +34,7 @@ if [[ ! -z "${CITADEL_OS:-}" ]]; then
     echo
     
     # Update SD card installation
-    if  [[ -f "${SD_CARD_CITADEL_ROOT}/.umbrel" ]] || [[ -f "${SD_CARD_CITADEL_ROOT}/.citadel" ]]; then
+    if  [[ -f "${SD_CARD_CITADEL_ROOT}/.citadel" ]]; then
         echo "Replacing ${SD_CARD_CITADEL_ROOT} on SD card with the new release"
         rsync --archive \
             --verbose \
@@ -65,10 +60,6 @@ if [[ ! -z "${CITADEL_OS:-}" ]]; then
     done
 fi
 
-cat <<EOF > "$CITADEL_ROOT"/statuses/update-status.json
-{"state": "installing", "progress": 33, "description": "Configuring settings", "updateTo": "$RELEASE"}
-EOF
-
 # Checkout to the new release
 cd "$CITADEL_ROOT"/.citadel-"$RELEASE"
 

scripts/update/03-run.sh

@@ -19,7 +19,6 @@ echo
 
 # Cleanup
 echo "Removing backup"
-[[ -d "$CITADEL_ROOT"/.umbrel-backup ]] && rm -rf "$CITADEL_ROOT"/.umbrel-backup
 [[ -d "$CITADEL_ROOT"/.citadel-backup ]] && rm -rf "$CITADEL_ROOT"/.citadel-backup
 
 echo "Successfully installed Citadel $RELEASE"