rename appmgr

Makefile

@@ -1,9 +1,9 @@
-EMBASSY_BINS := appmgr/target/aarch64-unknown-linux-gnu/release/embassyd appmgr/target/aarch64-unknown-linux-gnu/release/embassy-init appmgr/target/aarch64-unknown-linux-gnu/release/embassy-cli appmgr/target/aarch64-unknown-linux-gnu/release/embassy-sdk
+EMBASSY_BINS := backend/target/aarch64-unknown-linux-gnu/release/embassyd backend/target/aarch64-unknown-linux-gnu/release/embassy-init backend/target/aarch64-unknown-linux-gnu/release/embassy-cli backend/target/aarch64-unknown-linux-gnu/release/embassy-sdk
 EMBASSY_UIS := ui/www setup-wizard/www diagnostic-ui/www
-EMBASSY_SRC := ubuntu.img product_key.txt $(EMBASSY_BINS) appmgr/embassyd.service appmgr/embassy-init.service $(EMBASSY_UIS) $(shell find build)
+EMBASSY_SRC := ubuntu.img product_key.txt $(EMBASSY_BINS) backend/embassyd.service backend/embassy-init.service $(EMBASSY_UIS) $(shell find build)
 COMPAT_SRC := $(shell find system-images/compat/src)
 UTILS_SRC := $(shell find system-images/utils/Dockerfile)
-APPMGR_SRC := $(shell find appmgr/src) $(shell find patch-db/*/src) $(shell find rpc-toolkit/*/src) appmgr/Cargo.toml appmgr/Cargo.lock
+APPMGR_SRC := $(shell find backend/src) $(shell find patch-db/*/src) $(shell find rpc-toolkit/*/src) backend/Cargo.toml backend/Cargo.lock
 UI_SRC := $(shell find ui/src)
 SETUP_WIZARD_SRC := $(shell find setup-wizard/src)
 DIAGNOSTIC_UI_SRC := $(shell find diagnostic-ui/src)
@@ -55,7 +55,7 @@ product_key.txt:
 	echo >> product_key.txt
 
 $(EMBASSY_BINS): $(APPMGR_SRC)
-	cd appmgr && ./build-prod.sh
+	cd backend && ./build-prod.sh
 
 ui/node_modules: ui/package.json
 	npm --prefix ui install

appmgr/README.md

@@ -1,22 +0,0 @@
-# appmgr
-
-# Instructions
-
-Clone the repo and enter the appmgr directory
-
-`git clone https://github.com/Start9Labs/embassy-os.git`
-
-`cd embassy-os/appmgr`
-
-Install the portable version of appmgr
-
-`cargo install --path=. --features=portable --no-default-features`
-
-## Exit Codes
-1. General Error
-2. File System IO Error
-3. Docker Error
-4. Config Spec violation
-5. Config Rules violation
-6. Requested value does not exist
-7. Invalid Backup Password

backend/README.md

@@ -0,0 +1,2 @@
+# backend
+(TODO)

backend/build-dev.sh

@@ -4,13 +4,13 @@ set -e
 shopt -s expand_aliases
 
 if [ "$0" != "./build-dev.sh" ]; then
-	>&2 echo "Must be run from appmgr directory"
+	>&2 echo "Must be run from backend directory"
 	exit 1
 fi
 
 alias 'rust-arm64-builder'='docker run --rm -it -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64'
 
 cd ..
-rust-arm64-builder sh -c "(cd appmgr && cargo build)"
-cd appmgr
+rust-arm64-builder sh -c "(cd backend && cargo build)"
+cd backend
 #rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd

backend/build-portable-dev.sh

@@ -4,12 +4,12 @@ set -e
 shopt -s expand_aliases
 
 if [ "$0" != "./build-portable-dev.sh" ]; then
-	>&2 echo "Must be run from appmgr directory"
+	>&2 echo "Must be run from backend directory"
 	exit 1
 fi
 
 alias 'rust-musl-builder'='docker run --rm -it -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl'
 
 cd ..
-rust-musl-builder sh -c "(cd appmgr && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features)"
-cd appmgr
+rust-musl-builder sh -c "(cd backend && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features)"
+cd backend

backend/build-portable.sh

@@ -4,12 +4,12 @@ set -e
 shopt -s expand_aliases
 
 if [ "$0" != "./build-portable.sh" ]; then
-	>&2 echo "Must be run from appmgr directory"
+	>&2 echo "Must be run from backend directory"
 	exit 1
 fi
 
 alias 'rust-musl-builder'='docker run --rm -it -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl'
 
 cd ..
-rust-musl-builder sh -c "(cd appmgr && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features)"
-cd appmgr
+rust-musl-builder sh -c "(cd backend && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features)"
+cd backend

backend/build-prod.sh

@@ -4,7 +4,7 @@ set -e
 shopt -s expand_aliases
 
 if [ "$0" != "./build-prod.sh" ]; then
-	>&2 echo "Must be run from appmgr directory"
+	>&2 echo "Must be run from backend directory"
 	exit 1
 fi
 
@@ -12,9 +12,9 @@ alias 'rust-arm64-builder'='docker run --rm -it -v "$HOME/.cargo/registry":/root
 
 cd ..
 if [[ "$ENVIRONMENT" =~ (^|-)unstable($|-) ]]; then
-	rust-arm64-builder sh -c "(cd appmgr && cargo build --release --features unstable)"
+	rust-arm64-builder sh -c "(cd backend && cargo build --release --features unstable)"
 else
-	rust-arm64-builder sh -c "(cd appmgr && cargo build --release)"
+	rust-arm64-builder sh -c "(cd backend && cargo build --release)"
 fi
-cd appmgr
+cd backend
 #rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd

backend/copy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Enter the appmgr directory, copy over the built EmbassyOS binaries and systemd services, edit the nginx config, then create the .ssh directory
+# Enter the backend directory, copy over the built EmbassyOS binaries and systemd services, edit the nginx config, then create the .ssh directory
 
 cp target/aarch64-unknown-linux-gnu/release/embassy-init /mnt/usr/local/bin
 cp target/aarch64-unknown-linux-gnu/release/embassyd /mnt/usr/local/bin