From edde4783828d61a90b9f4dbc0dd3eb85f851dac0 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Fri, 21 Jan 2022 19:02:23 -0700 Subject: [PATCH] rename appmgr --- Makefile | 8 +++---- appmgr/README.md | 22 ------------------- {appmgr => backend}/.gitignore | 0 {appmgr => backend}/Cargo.lock | 0 {appmgr => backend}/Cargo.toml | 0 backend/README.md | 2 ++ {appmgr => backend}/build-dev.sh | 6 ++--- {appmgr => backend}/build-portable-dev.sh | 6 ++--- {appmgr => backend}/build-portable.sh | 6 ++--- {appmgr => backend}/build-prod.sh | 8 +++---- {appmgr => backend}/copy.sh | 2 +- {appmgr => backend}/deny.toml | 0 {appmgr => backend}/embassy-init.service | 0 {appmgr => backend}/embassyd.service | 0 .../migrations/20210629193146_Init.sql | 0 {appmgr => backend}/rustfmt.toml | 0 {appmgr => backend}/sqlx-data.json | 0 {appmgr => backend}/src/action/docker.rs | 0 {appmgr => backend}/src/action/mod.rs | 0 {appmgr => backend}/src/auth.rs | 0 {appmgr => backend}/src/backup/backup_bulk.rs | 0 {appmgr => backend}/src/backup/mod.rs | 0 {appmgr => backend}/src/backup/restore.rs | 0 {appmgr => backend}/src/backup/target/cifs.rs | 0 {appmgr => backend}/src/backup/target/mod.rs | 0 {appmgr => backend}/src/bin/embassy-cli.rs | 0 {appmgr => backend}/src/bin/embassy-init.rs | 0 {appmgr => backend}/src/bin/embassy-sdk.rs | 0 {appmgr => backend}/src/bin/embassyd.rs | 0 {appmgr => backend}/src/config/action.rs | 0 {appmgr => backend}/src/config/mod.rs | 0 {appmgr => backend}/src/config/spec.rs | 0 {appmgr => backend}/src/config/util.rs | 0 {appmgr => backend}/src/context/cli.rs | 0 {appmgr => backend}/src/context/diagnostic.rs | 0 {appmgr => backend}/src/context/mod.rs | 0 {appmgr => backend}/src/context/rpc.rs | 0 {appmgr => backend}/src/context/sdk.rs | 0 {appmgr => backend}/src/context/setup.rs | 0 {appmgr => backend}/src/control.rs | 0 {appmgr => backend}/src/core/mod.rs | 0 .../src/core/rpc_continuations.rs | 0 {appmgr => backend}/src/db/mod.rs | 0 {appmgr => backend}/src/db/model.rs | 0 {appmgr => backend}/src/db/util.rs | 0 {appmgr => backend}/src/dependencies.rs | 0 {appmgr => backend}/src/developer/mod.rs | 0 {appmgr => backend}/src/diagnostic.rs | 0 {appmgr => backend}/src/disk/main.rs | 0 {appmgr => backend}/src/disk/mod.rs | 0 {appmgr => backend}/src/disk/mount/backup.rs | 0 .../src/disk/mount/filesystem/block_dev.rs | 0 .../src/disk/mount/filesystem/cifs.rs | 0 .../src/disk/mount/filesystem/ecryptfs.rs | 0 .../src/disk/mount/filesystem/label.rs | 0 .../src/disk/mount/filesystem/mod.rs | 0 {appmgr => backend}/src/disk/mount/guard.rs | 0 {appmgr => backend}/src/disk/mount/mod.rs | 0 {appmgr => backend}/src/disk/mount/util.rs | 0 {appmgr => backend}/src/disk/quirks.rs | 0 {appmgr => backend}/src/disk/util.rs | 0 {appmgr => backend}/src/error.rs | 0 {appmgr => backend}/src/hostname.rs | 0 {appmgr => backend}/src/id.rs | 0 {appmgr => backend}/src/init.rs | 0 {appmgr => backend}/src/inspect.rs | 0 {appmgr => backend}/src/install/cleanup.rs | 0 {appmgr => backend}/src/install/mod.rs | 0 {appmgr => backend}/src/install/progress.rs | 0 {appmgr => backend}/src/install/update.rs | 0 {appmgr => backend}/src/lib.rs | 0 {appmgr => backend}/src/logs.rs | 0 {appmgr => backend}/src/manager/health.rs | 0 {appmgr => backend}/src/manager/mod.rs | 0 {appmgr => backend}/src/manager/sync.rs | 0 {appmgr => backend}/src/marketplace.rs | 0 {appmgr => backend}/src/middleware/auth.rs | 0 {appmgr => backend}/src/middleware/cors.rs | 0 .../src/middleware/diagnostic.rs | 0 {appmgr => backend}/src/middleware/encrypt.rs | 0 {appmgr => backend}/src/middleware/mod.rs | 0 {appmgr => backend}/src/migration.rs | 0 .../src/net/cert-local.csr.conf.template | 0 {appmgr => backend}/src/net/interface.rs | 0 {appmgr => backend}/src/net/mdns.rs | 0 {appmgr => backend}/src/net/mod.rs | 0 .../src/net/nginx.conf.template | 0 {appmgr => backend}/src/net/nginx.rs | 0 {appmgr => backend}/src/net/ssl.rs | 0 {appmgr => backend}/src/net/tor.rs | 0 {appmgr => backend}/src/net/wifi.rs | 0 .../src/net/wpa_supplicant.conf.base | 0 .../src/nginx/diagnostic-ui.conf | 0 .../src/nginx/main-ui.conf.template | 0 .../src/nginx/setup-wizard.conf | 0 {appmgr => backend}/src/notifications.rs | 0 {appmgr => backend}/src/properties.rs | 0 {appmgr => backend}/src/s9pk/builder.rs | 0 {appmgr => backend}/src/s9pk/header.rs | 0 {appmgr => backend}/src/s9pk/manifest.rs | 0 {appmgr => backend}/src/s9pk/mod.rs | 0 {appmgr => backend}/src/s9pk/reader.rs | 0 {appmgr => backend}/src/setup.rs | 0 {appmgr => backend}/src/shutdown.rs | 0 {appmgr => backend}/src/sound.rs | 0 {appmgr => backend}/src/ssh.rs | 0 {appmgr => backend}/src/static_server.rs | 0 .../src/status/health_check.rs | 0 {appmgr => backend}/src/status/mod.rs | 0 {appmgr => backend}/src/system.rs | 0 .../src/update/latest_information.rs | 0 {appmgr => backend}/src/update/mod.rs | 0 {appmgr => backend}/src/util/io.rs | 0 {appmgr => backend}/src/util/logger.rs | 0 {appmgr => backend}/src/util/mod.rs | 0 {appmgr => backend}/src/util/serde.rs | 0 {appmgr => backend}/src/version/mod.rs | 0 {appmgr => backend}/src/version/v0_3_0.rs | 0 {appmgr => backend}/src/volume.rs | 0 {appmgr => backend}/taplo.toml | 0 build/NOTES.md | 2 +- build/README.old.md | 2 +- build/write-image.sh | 4 ++-- system-images/compat/Cargo.toml | 2 +- 124 files changed, 25 insertions(+), 45 deletions(-) delete mode 100644 appmgr/README.md rename {appmgr => backend}/.gitignore (100%) rename {appmgr => backend}/Cargo.lock (100%) rename {appmgr => backend}/Cargo.toml (100%) create mode 100644 backend/README.md rename {appmgr => backend}/build-dev.sh (75%) rename {appmgr => backend}/build-portable-dev.sh (60%) rename {appmgr => backend}/build-portable.sh (58%) rename {appmgr => backend}/build-prod.sh (66%) rename {appmgr => backend}/copy.sh (71%) rename {appmgr => backend}/deny.toml (100%) rename {appmgr => backend}/embassy-init.service (100%) rename {appmgr => backend}/embassyd.service (100%) rename {appmgr => backend}/migrations/20210629193146_Init.sql (100%) rename {appmgr => backend}/rustfmt.toml (100%) rename {appmgr => backend}/sqlx-data.json (100%) rename {appmgr => backend}/src/action/docker.rs (100%) rename {appmgr => backend}/src/action/mod.rs (100%) rename {appmgr => backend}/src/auth.rs (100%) rename {appmgr => backend}/src/backup/backup_bulk.rs (100%) rename {appmgr => backend}/src/backup/mod.rs (100%) rename {appmgr => backend}/src/backup/restore.rs (100%) rename {appmgr => backend}/src/backup/target/cifs.rs (100%) rename {appmgr => backend}/src/backup/target/mod.rs (100%) rename {appmgr => backend}/src/bin/embassy-cli.rs (100%) rename {appmgr => backend}/src/bin/embassy-init.rs (100%) rename {appmgr => backend}/src/bin/embassy-sdk.rs (100%) rename {appmgr => backend}/src/bin/embassyd.rs (100%) rename {appmgr => backend}/src/config/action.rs (100%) rename {appmgr => backend}/src/config/mod.rs (100%) rename {appmgr => backend}/src/config/spec.rs (100%) rename {appmgr => backend}/src/config/util.rs (100%) rename {appmgr => backend}/src/context/cli.rs (100%) rename {appmgr => backend}/src/context/diagnostic.rs (100%) rename {appmgr => backend}/src/context/mod.rs (100%) rename {appmgr => backend}/src/context/rpc.rs (100%) rename {appmgr => backend}/src/context/sdk.rs (100%) rename {appmgr => backend}/src/context/setup.rs (100%) rename {appmgr => backend}/src/control.rs (100%) rename {appmgr => backend}/src/core/mod.rs (100%) rename {appmgr => backend}/src/core/rpc_continuations.rs (100%) rename {appmgr => backend}/src/db/mod.rs (100%) rename {appmgr => backend}/src/db/model.rs (100%) rename {appmgr => backend}/src/db/util.rs (100%) rename {appmgr => backend}/src/dependencies.rs (100%) rename {appmgr => backend}/src/developer/mod.rs (100%) rename {appmgr => backend}/src/diagnostic.rs (100%) rename {appmgr => backend}/src/disk/main.rs (100%) rename {appmgr => backend}/src/disk/mod.rs (100%) rename {appmgr => backend}/src/disk/mount/backup.rs (100%) rename {appmgr => backend}/src/disk/mount/filesystem/block_dev.rs (100%) rename {appmgr => backend}/src/disk/mount/filesystem/cifs.rs (100%) rename {appmgr => backend}/src/disk/mount/filesystem/ecryptfs.rs (100%) rename {appmgr => backend}/src/disk/mount/filesystem/label.rs (100%) rename {appmgr => backend}/src/disk/mount/filesystem/mod.rs (100%) rename {appmgr => backend}/src/disk/mount/guard.rs (100%) rename {appmgr => backend}/src/disk/mount/mod.rs (100%) rename {appmgr => backend}/src/disk/mount/util.rs (100%) rename {appmgr => backend}/src/disk/quirks.rs (100%) rename {appmgr => backend}/src/disk/util.rs (100%) rename {appmgr => backend}/src/error.rs (100%) rename {appmgr => backend}/src/hostname.rs (100%) rename {appmgr => backend}/src/id.rs (100%) rename {appmgr => backend}/src/init.rs (100%) rename {appmgr => backend}/src/inspect.rs (100%) rename {appmgr => backend}/src/install/cleanup.rs (100%) rename {appmgr => backend}/src/install/mod.rs (100%) rename {appmgr => backend}/src/install/progress.rs (100%) rename {appmgr => backend}/src/install/update.rs (100%) rename {appmgr => backend}/src/lib.rs (100%) rename {appmgr => backend}/src/logs.rs (100%) rename {appmgr => backend}/src/manager/health.rs (100%) rename {appmgr => backend}/src/manager/mod.rs (100%) rename {appmgr => backend}/src/manager/sync.rs (100%) rename {appmgr => backend}/src/marketplace.rs (100%) rename {appmgr => backend}/src/middleware/auth.rs (100%) rename {appmgr => backend}/src/middleware/cors.rs (100%) rename {appmgr => backend}/src/middleware/diagnostic.rs (100%) rename {appmgr => backend}/src/middleware/encrypt.rs (100%) rename {appmgr => backend}/src/middleware/mod.rs (100%) rename {appmgr => backend}/src/migration.rs (100%) rename {appmgr => backend}/src/net/cert-local.csr.conf.template (100%) rename {appmgr => backend}/src/net/interface.rs (100%) rename {appmgr => backend}/src/net/mdns.rs (100%) rename {appmgr => backend}/src/net/mod.rs (100%) rename {appmgr => backend}/src/net/nginx.conf.template (100%) rename {appmgr => backend}/src/net/nginx.rs (100%) rename {appmgr => backend}/src/net/ssl.rs (100%) rename {appmgr => backend}/src/net/tor.rs (100%) rename {appmgr => backend}/src/net/wifi.rs (100%) rename {appmgr => backend}/src/net/wpa_supplicant.conf.base (100%) rename {appmgr => backend}/src/nginx/diagnostic-ui.conf (100%) rename {appmgr => backend}/src/nginx/main-ui.conf.template (100%) rename {appmgr => backend}/src/nginx/setup-wizard.conf (100%) rename {appmgr => backend}/src/notifications.rs (100%) rename {appmgr => backend}/src/properties.rs (100%) rename {appmgr => backend}/src/s9pk/builder.rs (100%) rename {appmgr => backend}/src/s9pk/header.rs (100%) rename {appmgr => backend}/src/s9pk/manifest.rs (100%) rename {appmgr => backend}/src/s9pk/mod.rs (100%) rename {appmgr => backend}/src/s9pk/reader.rs (100%) rename {appmgr => backend}/src/setup.rs (100%) rename {appmgr => backend}/src/shutdown.rs (100%) rename {appmgr => backend}/src/sound.rs (100%) rename {appmgr => backend}/src/ssh.rs (100%) rename {appmgr => backend}/src/static_server.rs (100%) rename {appmgr => backend}/src/status/health_check.rs (100%) rename {appmgr => backend}/src/status/mod.rs (100%) rename {appmgr => backend}/src/system.rs (100%) rename {appmgr => backend}/src/update/latest_information.rs (100%) rename {appmgr => backend}/src/update/mod.rs (100%) rename {appmgr => backend}/src/util/io.rs (100%) rename {appmgr => backend}/src/util/logger.rs (100%) rename {appmgr => backend}/src/util/mod.rs (100%) rename {appmgr => backend}/src/util/serde.rs (100%) rename {appmgr => backend}/src/version/mod.rs (100%) rename {appmgr => backend}/src/version/v0_3_0.rs (100%) rename {appmgr => backend}/src/volume.rs (100%) rename {appmgr => backend}/taplo.toml (100%) diff --git a/Makefile b/Makefile index 15091b57d..5d1621c93 100644 --- a/Makefile +++ b/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 diff --git a/appmgr/README.md b/appmgr/README.md deleted file mode 100644 index 2f081b159..000000000 --- a/appmgr/README.md +++ /dev/null @@ -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 diff --git a/appmgr/.gitignore b/backend/.gitignore similarity index 100% rename from appmgr/.gitignore rename to backend/.gitignore diff --git a/appmgr/Cargo.lock b/backend/Cargo.lock similarity index 100% rename from appmgr/Cargo.lock rename to backend/Cargo.lock diff --git a/appmgr/Cargo.toml b/backend/Cargo.toml similarity index 100% rename from appmgr/Cargo.toml rename to backend/Cargo.toml diff --git a/backend/README.md b/backend/README.md new file mode 100644 index 000000000..dc5163afe --- /dev/null +++ b/backend/README.md @@ -0,0 +1,2 @@ +# backend +(TODO) diff --git a/appmgr/build-dev.sh b/backend/build-dev.sh similarity index 75% rename from appmgr/build-dev.sh rename to backend/build-dev.sh index 9f2dd2b90..ec30ada93 100755 --- a/appmgr/build-dev.sh +++ b/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 diff --git a/appmgr/build-portable-dev.sh b/backend/build-portable-dev.sh similarity index 60% rename from appmgr/build-portable-dev.sh rename to backend/build-portable-dev.sh index 98c96d17e..af12822cf 100755 --- a/appmgr/build-portable-dev.sh +++ b/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 diff --git a/appmgr/build-portable.sh b/backend/build-portable.sh similarity index 58% rename from appmgr/build-portable.sh rename to backend/build-portable.sh index d452a093b..bc8efe0b0 100755 --- a/appmgr/build-portable.sh +++ b/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 diff --git a/appmgr/build-prod.sh b/backend/build-prod.sh similarity index 66% rename from appmgr/build-prod.sh rename to backend/build-prod.sh index 13cffc55b..c79636938 100755 --- a/appmgr/build-prod.sh +++ b/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 diff --git a/appmgr/copy.sh b/backend/copy.sh similarity index 71% rename from appmgr/copy.sh rename to backend/copy.sh index e90cdde3e..bb6c9f8e5 100755 --- a/appmgr/copy.sh +++ b/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 diff --git a/appmgr/deny.toml b/backend/deny.toml similarity index 100% rename from appmgr/deny.toml rename to backend/deny.toml diff --git a/appmgr/embassy-init.service b/backend/embassy-init.service similarity index 100% rename from appmgr/embassy-init.service rename to backend/embassy-init.service diff --git a/appmgr/embassyd.service b/backend/embassyd.service similarity index 100% rename from appmgr/embassyd.service rename to backend/embassyd.service diff --git a/appmgr/migrations/20210629193146_Init.sql b/backend/migrations/20210629193146_Init.sql similarity index 100% rename from appmgr/migrations/20210629193146_Init.sql rename to backend/migrations/20210629193146_Init.sql diff --git a/appmgr/rustfmt.toml b/backend/rustfmt.toml similarity index 100% rename from appmgr/rustfmt.toml rename to backend/rustfmt.toml diff --git a/appmgr/sqlx-data.json b/backend/sqlx-data.json similarity index 100% rename from appmgr/sqlx-data.json rename to backend/sqlx-data.json diff --git a/appmgr/src/action/docker.rs b/backend/src/action/docker.rs similarity index 100% rename from appmgr/src/action/docker.rs rename to backend/src/action/docker.rs diff --git a/appmgr/src/action/mod.rs b/backend/src/action/mod.rs similarity index 100% rename from appmgr/src/action/mod.rs rename to backend/src/action/mod.rs diff --git a/appmgr/src/auth.rs b/backend/src/auth.rs similarity index 100% rename from appmgr/src/auth.rs rename to backend/src/auth.rs diff --git a/appmgr/src/backup/backup_bulk.rs b/backend/src/backup/backup_bulk.rs similarity index 100% rename from appmgr/src/backup/backup_bulk.rs rename to backend/src/backup/backup_bulk.rs diff --git a/appmgr/src/backup/mod.rs b/backend/src/backup/mod.rs similarity index 100% rename from appmgr/src/backup/mod.rs rename to backend/src/backup/mod.rs diff --git a/appmgr/src/backup/restore.rs b/backend/src/backup/restore.rs similarity index 100% rename from appmgr/src/backup/restore.rs rename to backend/src/backup/restore.rs diff --git a/appmgr/src/backup/target/cifs.rs b/backend/src/backup/target/cifs.rs similarity index 100% rename from appmgr/src/backup/target/cifs.rs rename to backend/src/backup/target/cifs.rs diff --git a/appmgr/src/backup/target/mod.rs b/backend/src/backup/target/mod.rs similarity index 100% rename from appmgr/src/backup/target/mod.rs rename to backend/src/backup/target/mod.rs diff --git a/appmgr/src/bin/embassy-cli.rs b/backend/src/bin/embassy-cli.rs similarity index 100% rename from appmgr/src/bin/embassy-cli.rs rename to backend/src/bin/embassy-cli.rs diff --git a/appmgr/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs similarity index 100% rename from appmgr/src/bin/embassy-init.rs rename to backend/src/bin/embassy-init.rs diff --git a/appmgr/src/bin/embassy-sdk.rs b/backend/src/bin/embassy-sdk.rs similarity index 100% rename from appmgr/src/bin/embassy-sdk.rs rename to backend/src/bin/embassy-sdk.rs diff --git a/appmgr/src/bin/embassyd.rs b/backend/src/bin/embassyd.rs similarity index 100% rename from appmgr/src/bin/embassyd.rs rename to backend/src/bin/embassyd.rs diff --git a/appmgr/src/config/action.rs b/backend/src/config/action.rs similarity index 100% rename from appmgr/src/config/action.rs rename to backend/src/config/action.rs diff --git a/appmgr/src/config/mod.rs b/backend/src/config/mod.rs similarity index 100% rename from appmgr/src/config/mod.rs rename to backend/src/config/mod.rs diff --git a/appmgr/src/config/spec.rs b/backend/src/config/spec.rs similarity index 100% rename from appmgr/src/config/spec.rs rename to backend/src/config/spec.rs diff --git a/appmgr/src/config/util.rs b/backend/src/config/util.rs similarity index 100% rename from appmgr/src/config/util.rs rename to backend/src/config/util.rs diff --git a/appmgr/src/context/cli.rs b/backend/src/context/cli.rs similarity index 100% rename from appmgr/src/context/cli.rs rename to backend/src/context/cli.rs diff --git a/appmgr/src/context/diagnostic.rs b/backend/src/context/diagnostic.rs similarity index 100% rename from appmgr/src/context/diagnostic.rs rename to backend/src/context/diagnostic.rs diff --git a/appmgr/src/context/mod.rs b/backend/src/context/mod.rs similarity index 100% rename from appmgr/src/context/mod.rs rename to backend/src/context/mod.rs diff --git a/appmgr/src/context/rpc.rs b/backend/src/context/rpc.rs similarity index 100% rename from appmgr/src/context/rpc.rs rename to backend/src/context/rpc.rs diff --git a/appmgr/src/context/sdk.rs b/backend/src/context/sdk.rs similarity index 100% rename from appmgr/src/context/sdk.rs rename to backend/src/context/sdk.rs diff --git a/appmgr/src/context/setup.rs b/backend/src/context/setup.rs similarity index 100% rename from appmgr/src/context/setup.rs rename to backend/src/context/setup.rs diff --git a/appmgr/src/control.rs b/backend/src/control.rs similarity index 100% rename from appmgr/src/control.rs rename to backend/src/control.rs diff --git a/appmgr/src/core/mod.rs b/backend/src/core/mod.rs similarity index 100% rename from appmgr/src/core/mod.rs rename to backend/src/core/mod.rs diff --git a/appmgr/src/core/rpc_continuations.rs b/backend/src/core/rpc_continuations.rs similarity index 100% rename from appmgr/src/core/rpc_continuations.rs rename to backend/src/core/rpc_continuations.rs diff --git a/appmgr/src/db/mod.rs b/backend/src/db/mod.rs similarity index 100% rename from appmgr/src/db/mod.rs rename to backend/src/db/mod.rs diff --git a/appmgr/src/db/model.rs b/backend/src/db/model.rs similarity index 100% rename from appmgr/src/db/model.rs rename to backend/src/db/model.rs diff --git a/appmgr/src/db/util.rs b/backend/src/db/util.rs similarity index 100% rename from appmgr/src/db/util.rs rename to backend/src/db/util.rs diff --git a/appmgr/src/dependencies.rs b/backend/src/dependencies.rs similarity index 100% rename from appmgr/src/dependencies.rs rename to backend/src/dependencies.rs diff --git a/appmgr/src/developer/mod.rs b/backend/src/developer/mod.rs similarity index 100% rename from appmgr/src/developer/mod.rs rename to backend/src/developer/mod.rs diff --git a/appmgr/src/diagnostic.rs b/backend/src/diagnostic.rs similarity index 100% rename from appmgr/src/diagnostic.rs rename to backend/src/diagnostic.rs diff --git a/appmgr/src/disk/main.rs b/backend/src/disk/main.rs similarity index 100% rename from appmgr/src/disk/main.rs rename to backend/src/disk/main.rs diff --git a/appmgr/src/disk/mod.rs b/backend/src/disk/mod.rs similarity index 100% rename from appmgr/src/disk/mod.rs rename to backend/src/disk/mod.rs diff --git a/appmgr/src/disk/mount/backup.rs b/backend/src/disk/mount/backup.rs similarity index 100% rename from appmgr/src/disk/mount/backup.rs rename to backend/src/disk/mount/backup.rs diff --git a/appmgr/src/disk/mount/filesystem/block_dev.rs b/backend/src/disk/mount/filesystem/block_dev.rs similarity index 100% rename from appmgr/src/disk/mount/filesystem/block_dev.rs rename to backend/src/disk/mount/filesystem/block_dev.rs diff --git a/appmgr/src/disk/mount/filesystem/cifs.rs b/backend/src/disk/mount/filesystem/cifs.rs similarity index 100% rename from appmgr/src/disk/mount/filesystem/cifs.rs rename to backend/src/disk/mount/filesystem/cifs.rs diff --git a/appmgr/src/disk/mount/filesystem/ecryptfs.rs b/backend/src/disk/mount/filesystem/ecryptfs.rs similarity index 100% rename from appmgr/src/disk/mount/filesystem/ecryptfs.rs rename to backend/src/disk/mount/filesystem/ecryptfs.rs diff --git a/appmgr/src/disk/mount/filesystem/label.rs b/backend/src/disk/mount/filesystem/label.rs similarity index 100% rename from appmgr/src/disk/mount/filesystem/label.rs rename to backend/src/disk/mount/filesystem/label.rs diff --git a/appmgr/src/disk/mount/filesystem/mod.rs b/backend/src/disk/mount/filesystem/mod.rs similarity index 100% rename from appmgr/src/disk/mount/filesystem/mod.rs rename to backend/src/disk/mount/filesystem/mod.rs diff --git a/appmgr/src/disk/mount/guard.rs b/backend/src/disk/mount/guard.rs similarity index 100% rename from appmgr/src/disk/mount/guard.rs rename to backend/src/disk/mount/guard.rs diff --git a/appmgr/src/disk/mount/mod.rs b/backend/src/disk/mount/mod.rs similarity index 100% rename from appmgr/src/disk/mount/mod.rs rename to backend/src/disk/mount/mod.rs diff --git a/appmgr/src/disk/mount/util.rs b/backend/src/disk/mount/util.rs similarity index 100% rename from appmgr/src/disk/mount/util.rs rename to backend/src/disk/mount/util.rs diff --git a/appmgr/src/disk/quirks.rs b/backend/src/disk/quirks.rs similarity index 100% rename from appmgr/src/disk/quirks.rs rename to backend/src/disk/quirks.rs diff --git a/appmgr/src/disk/util.rs b/backend/src/disk/util.rs similarity index 100% rename from appmgr/src/disk/util.rs rename to backend/src/disk/util.rs diff --git a/appmgr/src/error.rs b/backend/src/error.rs similarity index 100% rename from appmgr/src/error.rs rename to backend/src/error.rs diff --git a/appmgr/src/hostname.rs b/backend/src/hostname.rs similarity index 100% rename from appmgr/src/hostname.rs rename to backend/src/hostname.rs diff --git a/appmgr/src/id.rs b/backend/src/id.rs similarity index 100% rename from appmgr/src/id.rs rename to backend/src/id.rs diff --git a/appmgr/src/init.rs b/backend/src/init.rs similarity index 100% rename from appmgr/src/init.rs rename to backend/src/init.rs diff --git a/appmgr/src/inspect.rs b/backend/src/inspect.rs similarity index 100% rename from appmgr/src/inspect.rs rename to backend/src/inspect.rs diff --git a/appmgr/src/install/cleanup.rs b/backend/src/install/cleanup.rs similarity index 100% rename from appmgr/src/install/cleanup.rs rename to backend/src/install/cleanup.rs diff --git a/appmgr/src/install/mod.rs b/backend/src/install/mod.rs similarity index 100% rename from appmgr/src/install/mod.rs rename to backend/src/install/mod.rs diff --git a/appmgr/src/install/progress.rs b/backend/src/install/progress.rs similarity index 100% rename from appmgr/src/install/progress.rs rename to backend/src/install/progress.rs diff --git a/appmgr/src/install/update.rs b/backend/src/install/update.rs similarity index 100% rename from appmgr/src/install/update.rs rename to backend/src/install/update.rs diff --git a/appmgr/src/lib.rs b/backend/src/lib.rs similarity index 100% rename from appmgr/src/lib.rs rename to backend/src/lib.rs diff --git a/appmgr/src/logs.rs b/backend/src/logs.rs similarity index 100% rename from appmgr/src/logs.rs rename to backend/src/logs.rs diff --git a/appmgr/src/manager/health.rs b/backend/src/manager/health.rs similarity index 100% rename from appmgr/src/manager/health.rs rename to backend/src/manager/health.rs diff --git a/appmgr/src/manager/mod.rs b/backend/src/manager/mod.rs similarity index 100% rename from appmgr/src/manager/mod.rs rename to backend/src/manager/mod.rs diff --git a/appmgr/src/manager/sync.rs b/backend/src/manager/sync.rs similarity index 100% rename from appmgr/src/manager/sync.rs rename to backend/src/manager/sync.rs diff --git a/appmgr/src/marketplace.rs b/backend/src/marketplace.rs similarity index 100% rename from appmgr/src/marketplace.rs rename to backend/src/marketplace.rs diff --git a/appmgr/src/middleware/auth.rs b/backend/src/middleware/auth.rs similarity index 100% rename from appmgr/src/middleware/auth.rs rename to backend/src/middleware/auth.rs diff --git a/appmgr/src/middleware/cors.rs b/backend/src/middleware/cors.rs similarity index 100% rename from appmgr/src/middleware/cors.rs rename to backend/src/middleware/cors.rs diff --git a/appmgr/src/middleware/diagnostic.rs b/backend/src/middleware/diagnostic.rs similarity index 100% rename from appmgr/src/middleware/diagnostic.rs rename to backend/src/middleware/diagnostic.rs diff --git a/appmgr/src/middleware/encrypt.rs b/backend/src/middleware/encrypt.rs similarity index 100% rename from appmgr/src/middleware/encrypt.rs rename to backend/src/middleware/encrypt.rs diff --git a/appmgr/src/middleware/mod.rs b/backend/src/middleware/mod.rs similarity index 100% rename from appmgr/src/middleware/mod.rs rename to backend/src/middleware/mod.rs diff --git a/appmgr/src/migration.rs b/backend/src/migration.rs similarity index 100% rename from appmgr/src/migration.rs rename to backend/src/migration.rs diff --git a/appmgr/src/net/cert-local.csr.conf.template b/backend/src/net/cert-local.csr.conf.template similarity index 100% rename from appmgr/src/net/cert-local.csr.conf.template rename to backend/src/net/cert-local.csr.conf.template diff --git a/appmgr/src/net/interface.rs b/backend/src/net/interface.rs similarity index 100% rename from appmgr/src/net/interface.rs rename to backend/src/net/interface.rs diff --git a/appmgr/src/net/mdns.rs b/backend/src/net/mdns.rs similarity index 100% rename from appmgr/src/net/mdns.rs rename to backend/src/net/mdns.rs diff --git a/appmgr/src/net/mod.rs b/backend/src/net/mod.rs similarity index 100% rename from appmgr/src/net/mod.rs rename to backend/src/net/mod.rs diff --git a/appmgr/src/net/nginx.conf.template b/backend/src/net/nginx.conf.template similarity index 100% rename from appmgr/src/net/nginx.conf.template rename to backend/src/net/nginx.conf.template diff --git a/appmgr/src/net/nginx.rs b/backend/src/net/nginx.rs similarity index 100% rename from appmgr/src/net/nginx.rs rename to backend/src/net/nginx.rs diff --git a/appmgr/src/net/ssl.rs b/backend/src/net/ssl.rs similarity index 100% rename from appmgr/src/net/ssl.rs rename to backend/src/net/ssl.rs diff --git a/appmgr/src/net/tor.rs b/backend/src/net/tor.rs similarity index 100% rename from appmgr/src/net/tor.rs rename to backend/src/net/tor.rs diff --git a/appmgr/src/net/wifi.rs b/backend/src/net/wifi.rs similarity index 100% rename from appmgr/src/net/wifi.rs rename to backend/src/net/wifi.rs diff --git a/appmgr/src/net/wpa_supplicant.conf.base b/backend/src/net/wpa_supplicant.conf.base similarity index 100% rename from appmgr/src/net/wpa_supplicant.conf.base rename to backend/src/net/wpa_supplicant.conf.base diff --git a/appmgr/src/nginx/diagnostic-ui.conf b/backend/src/nginx/diagnostic-ui.conf similarity index 100% rename from appmgr/src/nginx/diagnostic-ui.conf rename to backend/src/nginx/diagnostic-ui.conf diff --git a/appmgr/src/nginx/main-ui.conf.template b/backend/src/nginx/main-ui.conf.template similarity index 100% rename from appmgr/src/nginx/main-ui.conf.template rename to backend/src/nginx/main-ui.conf.template diff --git a/appmgr/src/nginx/setup-wizard.conf b/backend/src/nginx/setup-wizard.conf similarity index 100% rename from appmgr/src/nginx/setup-wizard.conf rename to backend/src/nginx/setup-wizard.conf diff --git a/appmgr/src/notifications.rs b/backend/src/notifications.rs similarity index 100% rename from appmgr/src/notifications.rs rename to backend/src/notifications.rs diff --git a/appmgr/src/properties.rs b/backend/src/properties.rs similarity index 100% rename from appmgr/src/properties.rs rename to backend/src/properties.rs diff --git a/appmgr/src/s9pk/builder.rs b/backend/src/s9pk/builder.rs similarity index 100% rename from appmgr/src/s9pk/builder.rs rename to backend/src/s9pk/builder.rs diff --git a/appmgr/src/s9pk/header.rs b/backend/src/s9pk/header.rs similarity index 100% rename from appmgr/src/s9pk/header.rs rename to backend/src/s9pk/header.rs diff --git a/appmgr/src/s9pk/manifest.rs b/backend/src/s9pk/manifest.rs similarity index 100% rename from appmgr/src/s9pk/manifest.rs rename to backend/src/s9pk/manifest.rs diff --git a/appmgr/src/s9pk/mod.rs b/backend/src/s9pk/mod.rs similarity index 100% rename from appmgr/src/s9pk/mod.rs rename to backend/src/s9pk/mod.rs diff --git a/appmgr/src/s9pk/reader.rs b/backend/src/s9pk/reader.rs similarity index 100% rename from appmgr/src/s9pk/reader.rs rename to backend/src/s9pk/reader.rs diff --git a/appmgr/src/setup.rs b/backend/src/setup.rs similarity index 100% rename from appmgr/src/setup.rs rename to backend/src/setup.rs diff --git a/appmgr/src/shutdown.rs b/backend/src/shutdown.rs similarity index 100% rename from appmgr/src/shutdown.rs rename to backend/src/shutdown.rs diff --git a/appmgr/src/sound.rs b/backend/src/sound.rs similarity index 100% rename from appmgr/src/sound.rs rename to backend/src/sound.rs diff --git a/appmgr/src/ssh.rs b/backend/src/ssh.rs similarity index 100% rename from appmgr/src/ssh.rs rename to backend/src/ssh.rs diff --git a/appmgr/src/static_server.rs b/backend/src/static_server.rs similarity index 100% rename from appmgr/src/static_server.rs rename to backend/src/static_server.rs diff --git a/appmgr/src/status/health_check.rs b/backend/src/status/health_check.rs similarity index 100% rename from appmgr/src/status/health_check.rs rename to backend/src/status/health_check.rs diff --git a/appmgr/src/status/mod.rs b/backend/src/status/mod.rs similarity index 100% rename from appmgr/src/status/mod.rs rename to backend/src/status/mod.rs diff --git a/appmgr/src/system.rs b/backend/src/system.rs similarity index 100% rename from appmgr/src/system.rs rename to backend/src/system.rs diff --git a/appmgr/src/update/latest_information.rs b/backend/src/update/latest_information.rs similarity index 100% rename from appmgr/src/update/latest_information.rs rename to backend/src/update/latest_information.rs diff --git a/appmgr/src/update/mod.rs b/backend/src/update/mod.rs similarity index 100% rename from appmgr/src/update/mod.rs rename to backend/src/update/mod.rs diff --git a/appmgr/src/util/io.rs b/backend/src/util/io.rs similarity index 100% rename from appmgr/src/util/io.rs rename to backend/src/util/io.rs diff --git a/appmgr/src/util/logger.rs b/backend/src/util/logger.rs similarity index 100% rename from appmgr/src/util/logger.rs rename to backend/src/util/logger.rs diff --git a/appmgr/src/util/mod.rs b/backend/src/util/mod.rs similarity index 100% rename from appmgr/src/util/mod.rs rename to backend/src/util/mod.rs diff --git a/appmgr/src/util/serde.rs b/backend/src/util/serde.rs similarity index 100% rename from appmgr/src/util/serde.rs rename to backend/src/util/serde.rs diff --git a/appmgr/src/version/mod.rs b/backend/src/version/mod.rs similarity index 100% rename from appmgr/src/version/mod.rs rename to backend/src/version/mod.rs diff --git a/appmgr/src/version/v0_3_0.rs b/backend/src/version/v0_3_0.rs similarity index 100% rename from appmgr/src/version/v0_3_0.rs rename to backend/src/version/v0_3_0.rs diff --git a/appmgr/src/volume.rs b/backend/src/volume.rs similarity index 100% rename from appmgr/src/volume.rs rename to backend/src/volume.rs diff --git a/appmgr/taplo.toml b/backend/taplo.toml similarity index 100% rename from appmgr/taplo.toml rename to backend/taplo.toml diff --git a/build/NOTES.md b/build/NOTES.md index 94660ba2f..0b8c3ec68 100644 --- a/build/NOTES.md +++ b/build/NOTES.md @@ -104,7 +104,7 @@ - `sudo mount /dev/mmcblk0p3 /mnt` to mount the writable filesystem -- Build embassy-os (LINK OR UPDATE, this step ridic – PULL LATEST CODE!!!) (for now, `docker run --rm --privileged linuxkit/binfmt:v0.8`, get rust-arm-cross.img and `docker load < rust-arm-cross.img`, have latest dev branch for patch, yajrc, and master for rpc-toolkit, then from appmgr dir: `./build-prod.sh`), then, also from the appmgr dir: +- Build embassy-os (LINK OR UPDATE, this step ridic – PULL LATEST CODE!!!) (for now, `docker run --rm --privileged linuxkit/binfmt:v0.8`, get rust-arm-cross.img and `docker load < rust-arm-cross.img`, have latest dev branch for patch, yajrc, and master for rpc-toolkit, then from backend dir: `./build-prod.sh`), then, also from the backend dir: (Can use `copy.sh` here) diff --git a/build/README.old.md b/build/README.old.md index bb1a97dcb..4d395fc68 100644 --- a/build/README.old.md +++ b/build/README.old.md @@ -28,7 +28,7 @@ 6. d) `sudo mount /dev/mmcblk0p3 /mnt` to mount the writable filesystem -7. a) Build EmbassyOS: Move into the EmbassyOS directory with `cd embassy-os` and Build embassy-os (NEEDS UPDATE – PULL LATEST CODE!!!) (for now, `docker run --rm --privileged linuxkit/binfmt:v0.8`, get rust-arm-cross.img and `docker load < rust-arm-cross.img`, then from appmgr dir: `./build-prod.sh`) +7. a) Build EmbassyOS: Move into the EmbassyOS directory with `cd embassy-os` and Build embassy-os (NEEDS UPDATE – PULL LATEST CODE!!!) (for now, `docker run --rm --privileged linuxkit/binfmt:v0.8`, get rust-arm-cross.img and `docker load < rust-arm-cross.img`, then from backend dir: `./build-prod.sh`) 7. b) Build UI: First, make sure you have `git`, `node`, and `npm` installed. Then, `cd ui` to enter ui dir, and run `npm i -g @ionic/cli` to install Ionic, `npm i` to install, then `cd ..` to return to the `embassy-os` directory diff --git a/build/write-image.sh b/build/write-image.sh index 8f12e1550..cae8261d6 100755 --- a/build/write-image.sh +++ b/build/write-image.sh @@ -47,8 +47,8 @@ sudo mount ${OUTPUT_DEVICE}p3 /tmp/eos-mnt sudo mkdir /tmp/eos-mnt/media/boot-rw sudo mkdir /tmp/eos-mnt/embassy-os sudo cp build/fstab /tmp/eos-mnt/etc/fstab -# Enter the appmgr directory, copy over the built EmbassyOS binaries and systemd services, edit the nginx config, then create the .ssh directory -cd appmgr/ +# Enter the backend directory, copy over the built EmbassyOS binaries and systemd services, edit the nginx config, then create the .ssh directory +cd backend/ sudo cp target/aarch64-unknown-linux-gnu/release/embassy-init /tmp/eos-mnt/usr/local/bin sudo cp target/aarch64-unknown-linux-gnu/release/embassyd /tmp/eos-mnt/usr/local/bin diff --git a/system-images/compat/Cargo.toml b/system-images/compat/Cargo.toml index 1454d3a93..33b45f476 100644 --- a/system-images/compat/Cargo.toml +++ b/system-images/compat/Cargo.toml @@ -10,7 +10,7 @@ version = "0.1.0" anyhow = { version = "1.0.40", features = ["backtrace"] } beau_collector = "0.2.1" clap = "2.33.3" -embassy-os = { path = "../../appmgr", default-features = false } +embassy-os = { path = "../../backend", default-features = false } emver = { version = "0.1.2", features = ["serde"] } failure = "0.1.8" indexmap = { version = "1.6.2", features = ["serde"] }