From 4a8f323be7b0441503a514e588c8d5678333c0df Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Thu, 11 May 2023 16:48:52 -0600 Subject: [PATCH] external rename (#2265) * backend rename * rename embassy and closes #2179 * update root ca name on disk * update MOTD * update readmes * your server typo * another tiny typo * fix png name * Update backend/src/net/wifi.rs Co-authored-by: Lucy C <12953208+elvece@users.noreply.github.com> * changes needed due to rebase --------- Co-authored-by: Matt Hill Co-authored-by: Matt Hill Co-authored-by: Lucy C <12953208+elvece@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/bug-report.yml | 16 +- .github/ISSUE_TEMPLATE/feature-request.yml | 8 +- CONTRIBUTING.md | 49 ++-- README.md | 38 +-- assets/{embassyOS.png => StartOS.png} | Bin assets/{eOS-ghost.png => ghost.png} | Bin .../{eOS-preferences.png => preferences.png} | Bin assets/{eOS-sideload.png => sideload.png} | Bin ...lth-check.png => synapse-health-check.png} | Bin backend/Cargo.toml | 4 +- backend/README.md | 10 +- backend/src/bin/embassy-init.rs | 4 +- backend/src/disk/main.rs | 4 +- backend/src/init.rs | 2 +- backend/src/net/cert-local.csr.conf.template | 2 +- backend/src/net/ssl.rs | 8 +- backend/src/net/wifi.rs | 2 +- backend/src/os_install/mod.rs | 2 +- backend/src/setup.rs | 4 +- build/README.md | 22 +- build/lib/motd | 18 +- build/lib/scripts/enable-kiosk | 4 +- build/lib/scripts/firefox-trust-cert | 2 +- frontend/README.md | 14 +- frontend/package-lock.json | 8 +- frontend/package.json | 4 +- .../src/app/pages/home/home.page.html | 26 +- .../src/app/pages/home/home.page.ts | 10 +- .../src/app/services/api/mock-api.service.ts | 2 +- .../projects/diagnostic-ui/src/index.html | 31 +-- .../src/app/pages/home/home.page.html | 8 +- .../src/app/pages/home/home.page.ts | 8 +- .../projects/install-wizard/src/index.html | 2 +- .../src/app/app-routing.module.ts | 2 +- .../app/modals/cifs-modal/cifs-modal.page.ts | 12 +- .../app/modals/password/password.page.html | 6 +- .../src/app/pages/attach/attach.page.html | 11 +- .../src/app/pages/embassy/embassy.page.html | 6 +- .../src/app/pages/home/home.page.html | 20 +- .../src/app/pages/loading/loading.page.html | 2 +- .../src/app/pages/loading/loading.page.ts | 2 +- .../pages/recover/drive-status.component.html | 4 +- .../src/app/pages/recover/recover.page.html | 8 +- .../src/app/pages/recover/recover.page.ts | 4 +- .../download-doc/download-doc.component.html | 12 +- .../download-doc/download-doc.component.ts | 11 +- .../src/app/pages/success/success.page.html | 18 +- .../src/app/pages/success/success.page.ts | 2 +- .../src/app/pages/transfer/transfer.page.html | 2 +- .../src/app/services/api/api.service.ts | 8 +- .../src/app/services/api/live-api.service.ts | 4 +- .../src/app/services/api/mock-api.service.ts | 2 +- frontend/projects/setup-wizard/src/index.html | 35 +-- frontend/projects/shared/src/types/api.ts | 4 +- frontend/projects/ui/src/app/app.component.ts | 2 +- .../backup-drives-status.component.html | 12 +- .../backup-drives.component.html | 25 +- .../notifications-toast.component.html | 2 +- .../update-toast/update-toast.component.html | 4 +- .../widget-list/widget-list.component.ts | 10 +- .../app-recover-select.page.html | 2 +- .../app/modals/os-update/os-update.page.html | 6 +- .../modals/os-welcome/os-welcome.page.html | 30 ++- .../app-actions/app-actions.page.html | 14 +- .../apps-routes/app-list/app-list.page.html | 4 +- .../apps-routes/app-show/app-show.page.html | 6 +- .../developer-menu/form-info.ts | 2 +- .../ui/src/app/pages/login/login.page.html | 2 +- .../notifications/notifications.page.html | 4 +- .../app/pages/server-routes/lan/lan.page.html | 9 +- .../app/pages/server-routes/lan/lan.page.ts | 11 +- .../server-backup/server-backup.page.ts | 2 +- .../server-show/server-show.page.html | 6 +- .../server-show/server-show.page.ts | 26 +- .../server-specs/server-specs.page.html | 2 +- .../server-routes/ssh-keys/ssh-keys.page.html | 10 +- .../server-routes/ssh-keys/ssh-keys.page.ts | 2 +- .../pages/server-routes/wifi/wifi.page.html | 19 +- .../app/pages/server-routes/wifi/wifi.page.ts | 6 +- .../ui/src/app/services/api/api.fixures.ts | 10 +- .../ui/src/app/services/api/api.types.ts | 6 +- .../ui/src/app/services/api/mock-patch.ts | 6 +- frontend/projects/ui/src/index.html | 2 +- index.html | 4 +- libs/artifacts/types.d.ts | 249 +++++++++--------- libs/models/src/errors.rs | 2 +- 86 files changed, 516 insertions(+), 468 deletions(-) rename assets/{embassyOS.png => StartOS.png} (100%) rename assets/{eOS-ghost.png => ghost.png} (100%) rename assets/{eOS-preferences.png => preferences.png} (100%) rename assets/{eOS-sideload.png => sideload.png} (100%) rename assets/{eOS-synapse-health-check.png => synapse-health-check.png} (100%) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 1d0766f8e..33032115b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,6 +1,6 @@ name: 🐛 Bug Report -description: Create a report to help us improve embassyOS -title: '[bug]: ' +description: Create a report to help us improve StartOS +title: "[bug]: " labels: [Bug, Needs Triage] assignees: - MattDHill @@ -10,19 +10,19 @@ body: label: Prerequisites description: Please confirm you have completed the following. options: - - label: I have searched for [existing issues](https://github.com/start9labs/embassy-os/issues) that already report this problem. + - label: I have searched for [existing issues](https://github.com/start9labs/start-os/issues) that already report this problem. required: true - type: input attributes: - label: embassyOS Version - description: What version of embassyOS are you running? - placeholder: e.g. 0.3.0 + label: StartOS Version + description: What version of StartOS are you running? + placeholder: e.g. 0.3.4.2 validations: required: true - type: dropdown attributes: label: Device - description: What device are you using to connect to Embassy? + description: What device are you using to connect to your server? options: - Phone/tablet - Laptop/Desktop @@ -52,7 +52,7 @@ body: - type: dropdown attributes: label: Browser - description: What browser are you using to connect to Embassy? + description: What browser are you using to connect to your server? options: - Firefox - Brave diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index 4714b7a8b..250f15b07 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -1,6 +1,6 @@ name: 💡 Feature Request -description: Suggest an idea for embassyOS -title: '[feat]: ' +description: Suggest an idea for StartOS +title: "[feat]: " labels: [Enhancement] assignees: - MattDHill @@ -10,7 +10,7 @@ body: label: Prerequisites description: Please confirm you have completed the following. options: - - label: I have searched for [existing issues](https://github.com/start9labs/embassy-os/issues) that already suggest this feature. + - label: I have searched for [existing issues](https://github.com/start9labs/start-os/issues) that already suggest this feature. required: true - type: textarea attributes: @@ -27,7 +27,7 @@ body: - type: textarea attributes: label: Describe Preferred Solution - description: How you want this feature added to embassyOS? + description: How you want this feature added to StartOS? - type: textarea attributes: label: Describe Alternatives diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 380ff51a3..76dfec490 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to Embassy OS +# Contributing to StartOS First off, thanks for taking the time to contribute! ❤️ @@ -19,7 +19,7 @@ forward to your contributions. 🎉 > - Tweet about it > - Refer this project in your project's readme > - Mention the project at local meetups and tell your friends/colleagues -> - Buy an [Embassy](https://start9labs.com) +> - Buy a [Start9 server](https://start9.com) @@ -49,7 +49,7 @@ forward to your contributions. 🎉 > [Documentation](https://docs.start9labs.com). Before you ask a question, it is best to search for existing -[Issues](https://github.com/Start9Labs/embassy-os/issues) that might help you. +[Issues](https://github.com/Start9Labs/start-os/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first. @@ -57,7 +57,7 @@ for answers first. If you then still feel the need to ask a question and need clarification, we recommend the following: -- Open an [Issue](https://github.com/Start9Labs/embassy-os/issues/new). +- Open an [Issue](https://github.com/Start9Labs/start-os/issues/new). - Provide as much context as you can about what you're running into. - Provide project and platform versions, depending on what seems relevant. @@ -105,7 +105,7 @@ steps in advance to help us fix any potential bug as fast as possible. - To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the - [bug tracker](https://github.com/Start9Labs/embassy-os/issues?q=label%3Abug). + [bug tracker](https://github.com/Start9Labs/start-os/issues?q=label%3Abug). - Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue. - Collect information about the bug: @@ -131,7 +131,7 @@ steps in advance to help us fix any potential bug as fast as possible. We use GitHub issues to track bugs and errors. If you run into an issue with the project: -- Open an [Issue](https://github.com/Start9Labs/embassy-os/issues/new/choose) +- Open an [Issue](https://github.com/Start9Labs/start-os/issues/new/choose) selecting the appropriate type. - Explain the behavior you would expect and the actual behavior. - Please provide as much context as possible and describe the _reproduction @@ -155,8 +155,7 @@ Once it's filed: ### Suggesting Enhancements -This section guides you through submitting an enhancement suggestion for Embassy -OS, **including completely new features and minor improvements to existing +This section guides you through submitting an enhancement suggestion for StartOS, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions. @@ -168,7 +167,7 @@ community to understand your suggestion and find related suggestions. - Read the [documentation](https://start9.com/latest/user-manual) carefully and find out if the functionality is already covered, maybe by an individual configuration. -- Perform a [search](https://github.com/Start9Labs/embassy-os/issues) to see if +- Perform a [search](https://github.com/Start9Labs/start-os/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one. - Find out whether your idea fits with the scope and aims of the project. It's @@ -182,7 +181,7 @@ community to understand your suggestion and find related suggestions. #### How Do I Submit a Good Enhancement Suggestion? Enhancement suggestions are tracked as -[GitHub issues](https://github.com/Start9Labs/embassy-os/issues). +[GitHub issues](https://github.com/Start9Labs/start-os/issues). - Use a **clear and descriptive title** for the issue to identify the suggestion. @@ -197,7 +196,7 @@ Enhancement suggestions are tracked as macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. -- **Explain why this enhancement would be useful** to most Embassy OS users. You +- **Explain why this enhancement would be useful** to most StartOS users. You may also want to point out the other projects that solved it better and which could serve as inspiration. @@ -205,24 +204,24 @@ Enhancement suggestions are tracked as ### Project Structure -embassyOS is composed of the following components. Please visit the README for +StartOS is composed of the following components. Please visit the README for each component to understand the dependency requirements and installation instructions. - [`backend`](backend/README.md) (Rust) is a command line utility, daemon, and software development kit that sets up and manages services and their environments, provides the interface for the ui, manages system state, and - provides utilities for packaging services for embassyOS. + provides utilities for packaging services for StartOS. - [`build`](build/README.md) contains scripts and necessary for deploying - embassyOS to a debian/raspbian system. + StartOS to a debian/raspbian system. - [`frontend`](frontend/README.md) (Typescript Ionic Angular) is the code that - is deployed to the browser to provide the user interface for embassyOS. - - `projects/ui` - Code for the user interface that is displayed when embassyOS + is deployed to the browser to provide the user interface for StartOS. + - `projects/ui` - Code for the user interface that is displayed when StartOS is running normally. - `projects/setup-wizard`(frontend/README.md) - Code for the user interface - that is displayed during the setup and recovery process for embassyOS. + that is displayed during the setup and recovery process for StartOS. - `projects/diagnostic-ui` - Code for the user interface that is displayed - when something has gone wrong with starting up embassyOS, which provides + when something has gone wrong with starting up StartOS, which provides helpful debugging tools. - `libs` (Rust) is a set of standalone crates that were separated out of `backend` for the purpose of portability @@ -232,18 +231,18 @@ instructions. [client](https://github.com/Start9Labs/patch-db/tree/master/client) with its own dependency and installation requirements. - `system-images` - (Docker, Rust) A suite of utility Docker images that are - preloaded with embassyOS to assist with functions relating to services (eg. + preloaded with StartOS to assist with functions relating to services (eg. configuration, backups, health checks). ### Your First Code Contribution #### Setting Up Your Development Environment -First, clone the embassyOS repository and from the project root, pull in the +First, clone the StartOS repository and from the project root, pull in the submodules for dependent libraries. ```sh -git clone https://github.com/Start9Labs/embassy-os.git +git clone https://github.com/Start9Labs/start-os.git git submodule update --init --recursive ``` @@ -254,7 +253,7 @@ to, follow the installation requirements listed in that component's README #### Building The Raspberry Pi Image This step is for setting up an environment in which to test your code changes if -you do not yet have a embassyOS. +you do not yet have a StartOS. - Requirements - `ext4fs` (available if running on the Linux kernel) @@ -262,7 +261,7 @@ you do not yet have a embassyOS. - GNU Make - Building - see setup instructions [here](build/README.md) - - run `make embassyos-raspi.img ARCH=aarch64` from the project root + - run `make startos-raspi.img ARCH=aarch64` from the project root ### Improving The Documentation @@ -286,7 +285,7 @@ seamless and intuitive experience. ### Formatting -Each component of embassyOS contains its own style guide. Code must be formatted +Each component of StartOS contains its own style guide. Code must be formatted with the formatter designated for each component. These are outlined within each component folder's README. @@ -306,7 +305,7 @@ component. i.e. `backend: update to tokio v0.3`. The body of a pull request should contain sufficient description of what the changes do, as well as a justification. You should include references to any -relevant [issues](https://github.com/Start9Labs/embassy-os/issues). +relevant [issues](https://github.com/Start9Labs/start-os/issues). ### Rebasing Changes diff --git a/README.md b/README.md index 04bd6b3f7..23df51e80 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# embassyOS -[![version](https://img.shields.io/github/v/tag/Start9Labs/embassy-os?color=success)](https://github.com/Start9Labs/embassy-os/releases) -[![build](https://github.com/Start9Labs/embassy-os/actions/workflows/product.yaml/badge.svg)](https://github.com/Start9Labs/embassy-os/actions/workflows/product.yaml) +# StartOS +[![version](https://img.shields.io/github/v/tag/Start9Labs/start-os?color=success)](https://github.com/Start9Labs/start-os/releases) +[![build](https://github.com/Start9Labs/start-os/actions/workflows/product.yaml/badge.svg)](https://github.com/Start9Labs/start-os/actions/workflows/product.yaml) [![community](https://img.shields.io/badge/community-matrix-yellow)](https://matrix.to/#/#community:matrix.start9labs.com) [![community](https://img.shields.io/badge/community-telegram-informational)](https://t.me/start9_labs) [![support](https://img.shields.io/badge/support-docs-important)](https://docs.start9.com) @@ -12,16 +12,16 @@ ### _Welcome to the era of Sovereign Computing_ ### -embassyOS is a browser-based, graphical operating system for a personal server. embassyOS facilitates the discovery, installation, network configuration, service configuration, data backup, dependency management, and health monitoring of self-hosted software services. It is the most advanced, secure, reliable, and user friendly personal server OS in the world. +StartOS is a browser-based, graphical operating system for a personal server. StartOS facilitates the discovery, installation, network configuration, service configuration, data backup, dependency management, and health monitoring of self-hosted software services. It is the most advanced, secure, reliable, and user friendly personal server OS in the world. -## Running embassyOS -There are multiple ways to get your hands on embassyOS. +## Running StartOS +There are multiple ways to get your hands on StartOS. -### :moneybag: Buy an Embassy -This is the most convenient option. Simply [buy an Embassy](https://start9.com) from Start9 and plug it in. Depending on where you live, shipping costs and import duties will vary. +### :moneybag: Buy a Start9 server +This is the most convenient option. Simply [buy a server](https://start9.com) from Start9 and plug it in. Depending on where you live, shipping costs and import duties will vary. -### :construction_worker: Build your own Embassy -While not as convenient as buying an Embassy, this option is easier than you might imagine, and there are 4 reasons why you might prefer it: +### :construction_worker: Build your own server +This option is easier than you might imagine, and there are 4 reasons why you might prefer it: 1. You already have your own hardware. 1. You want to save on shipping costs. 1. You prefer not to divulge your physical address. @@ -29,23 +29,23 @@ While not as convenient as buying an Embassy, this option is easier than you mig To pursue this option, follow one of our [DIY guides](https://start9.com/latest/diy). -### :hammer_and_wrench: Build embassyOS from Source +### :hammer_and_wrench: Build StartOS from Source -embassyOS can be built from source, for personal use, for free. -A detailed guide for doing so can be found [here](https://github.com/Start9Labs/embassy-os/blob/master/build/README.md). +StartOS can be built from source, for personal use, for free. +A detailed guide for doing so can be found [here](https://github.com/Start9Labs/start-os/blob/master/build/README.md). ## :heart: Contributing -There are multiple ways to contribute: work directly on embassyOS, package a service for the marketplace, or help with documentation and guides. To learn more about contributing, see [here](https://docs.start9.com/latest/contribute/) or [here](https://github.com/Start9Labs/embassy-os/blob/master/CONTRIBUTING.md). +There are multiple ways to contribute: work directly on StartOS, package a service for the marketplace, or help with documentation and guides. To learn more about contributing, see [here](https://docs.start9.com/latest/contribute/) or [here](https://github.com/Start9Labs/start-os/blob/master/CONTRIBUTING.md). ## UI Screenshots

-embassyOS +StartOS

-Embassy Preferences -Embassy Ghost Service +StartOS Preferences +StartOS Ghost Service

-Embassy Synapse Health Checks -Embassy Sideload Service +StartOS Synapse Health Checks +StartOS Sideload Service

diff --git a/assets/embassyOS.png b/assets/StartOS.png similarity index 100% rename from assets/embassyOS.png rename to assets/StartOS.png diff --git a/assets/eOS-ghost.png b/assets/ghost.png similarity index 100% rename from assets/eOS-ghost.png rename to assets/ghost.png diff --git a/assets/eOS-preferences.png b/assets/preferences.png similarity index 100% rename from assets/eOS-preferences.png rename to assets/preferences.png diff --git a/assets/eOS-sideload.png b/assets/sideload.png similarity index 100% rename from assets/eOS-sideload.png rename to assets/sideload.png diff --git a/assets/eOS-synapse-health-check.png b/assets/synapse-health-check.png similarity index 100% rename from assets/eOS-synapse-health-check.png rename to assets/synapse-health-check.png diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 7fac446a9..2c5a74daf 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Aiden McClelland "] -description = "The core of the Start9 Embassy Operating System" +description = "The core of StartOS" documentation = "https://docs.rs/embassy-os" edition = "2021" keywords = [ @@ -13,7 +13,7 @@ keywords = [ ] name = "embassy-os" readme = "README.md" -repository = "https://github.com/Start9Labs/embassy-os" +repository = "https://github.com/Start9Labs/start-os" version = "0.3.4-rev.1" [lib] diff --git a/backend/README.md b/backend/README.md index 36a27eb49..8734e6f70 100644 --- a/backend/README.md +++ b/backend/README.md @@ -1,4 +1,4 @@ -# embassyOS Backend +# StartOS Backend - Requirements: - [Install Rust](https://rustup.rs) @@ -12,16 +12,16 @@ ## Structure -The embassyOS backend is broken up into 4 different binaries: +The StartOS backend is broken up into 4 different binaries: -- embassyd: This is the main workhorse of embassyOS - any new functionality you +- embassyd: This is the main workhorse of StartOS - any new functionality you want will likely go here - embassy-init: This is the component responsible for allowing you to set up your device, and handles system initialization on startup - embassy-cli: This is a CLI tool that will allow you to issue commands to embassyd and control it similarly to the UI - embassy-sdk: This is a CLI tool that aids in building and packaging services - you wish to deploy to the Embassy + you wish to deploy to StartOS Finally there is a library `embassy` that supports all four of these tools. @@ -30,7 +30,7 @@ See [here](/backend/Cargo.toml) for details. ## Building You can build the entire operating system image using `make` from the root of -the embassyOS project. This will subsequently invoke the build scripts above to +the StartOS project. This will subsequently invoke the build scripts above to actually create the requisite binaries and put them onto the final operating system image. diff --git a/backend/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs index aceeb6e83..1bc079c58 100644 --- a/backend/src/bin/embassy-init.rs +++ b/backend/src/bin/embassy-init.rs @@ -31,7 +31,7 @@ async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { .arg("ssh") .invoke(crate::ErrorKind::OpenSsh) .await?; - embassy::hostname::sync_hostname(&embassy::hostname::Hostname("embassy".into())).await?; + embassy::hostname::sync_hostname(&embassy::hostname::Hostname("start".into())).await?; let ctx = InstallContext::init(cfg_path).await?; @@ -55,7 +55,7 @@ async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { .await .is_err() { - embassy::hostname::sync_hostname(&embassy::hostname::Hostname("embassy".into())).await?; + embassy::hostname::sync_hostname(&embassy::hostname::Hostname("start".into())).await?; let ctx = SetupContext::init(cfg_path).await?; diff --git a/backend/src/disk/main.rs b/backend/src/disk/main.rs index 35852505a..f9ec4bf08 100644 --- a/backend/src/disk/main.rs +++ b/backend/src/disk/main.rs @@ -213,7 +213,7 @@ pub async fn import>( .is_none() { return Err(Error::new( - eyre!("Embassy disk not found."), + eyre!("StartOS disk not found."), crate::ErrorKind::DiskNotAvailable, )); } @@ -223,7 +223,7 @@ pub async fn import>( .any(|id| id == guid) { return Err(Error::new( - eyre!("An Embassy disk was found, but it is not the correct disk for this device."), + eyre!("A StartOS disk was found, but it is not the correct disk for this device."), crate::ErrorKind::IncorrectDisk, )); } diff --git a/backend/src/init.rs b/backend/src/init.rs index e1b415a6c..68ac2365d 100644 --- a/backend/src/init.rs +++ b/backend/src/init.rs @@ -258,7 +258,7 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { // write to ca cert store tokio::fs::write( - "/usr/local/share/ca-certificates/embassy-root-ca.crt", + "/usr/local/share/ca-certificates/startos-root-ca.crt", account.root_ca_cert.to_pem()?, ) .await?; diff --git a/backend/src/net/cert-local.csr.conf.template b/backend/src/net/cert-local.csr.conf.template index 8f725478f..223dd61bf 100644 --- a/backend/src/net/cert-local.csr.conf.template +++ b/backend/src/net/cert-local.csr.conf.template @@ -7,4 +7,4 @@ prompt = no [req_distinguished_name] CN = {hostname}.local O = Start9 Labs -OU = Embassy \ No newline at end of file +OU = StartOS \ No newline at end of file diff --git a/backend/src/net/ssl.rs b/backend/src/net/ssl.rs index 16b8cf6f1..13179da1d 100644 --- a/backend/src/net/ssl.rs +++ b/backend/src/net/ssl.rs @@ -173,7 +173,7 @@ pub fn make_root_cert(root_key: &PKey, hostname: &Hostname) -> Result Result<( let is_current_removed_and_no_hardwire = is_current_being_removed && !interface_connected(&ctx.ethernet_interface).await?; if is_current_removed_and_no_hardwire { - return Err(Error::new(color_eyre::eyre::eyre!("Forbidden: Deleting this Network would make your Embassy Unreachable. Either connect to ethernet or connect to a different WiFi network to remedy this."), ErrorKind::Wifi)); + return Err(Error::new(color_eyre::eyre::eyre!("Forbidden: Deleting this network would make your server unreachable. Either connect to ethernet or connect to a different WiFi network to remedy this."), ErrorKind::Wifi)); } wpa_supplicant diff --git a/backend/src/os_install/mod.rs b/backend/src/os_install/mod.rs index 8b32acf20..4bf3333c7 100644 --- a/backend/src/os_install/mod.rs +++ b/backend/src/os_install/mod.rs @@ -232,7 +232,7 @@ pub async fn execute( .invoke(crate::ErrorKind::OpenSsh) .await?; - tokio::fs::write(current.join("etc/hostname"), "embassy\n").await?; + tokio::fs::write(current.join("etc/hostname"), "start\n").await?; Command::new("chroot") .arg(¤t) diff --git a/backend/src/setup.rs b/backend/src/setup.rs index dd8b8af61..0ac21cce2 100644 --- a/backend/src/setup.rs +++ b/backend/src/setup.rs @@ -135,7 +135,7 @@ pub async fn attach( crate::disk::main::export(&*guid, &ctx.datadir).await?; return Err(Error::new( eyre!( - "Errors were corrected with your disk, but the Embassy must be restarted in order to proceed" + "Errors were corrected with your disk, but the server must be restarted in order to proceed" ), ErrorKind::DiskManagement, )); @@ -294,7 +294,7 @@ pub async fn execute( })); } Err(e) => { - tracing::error!("Error Setting Up Embassy: {}", e); + tracing::error!("Error Setting Up Server: {}", e); tracing::debug!("{:?}", e); *ctx.setup_status.write().await = Some(Err(e.into())); } diff --git a/build/README.md b/build/README.md index 7a1e9afb6..3bab01866 100644 --- a/build/README.md +++ b/build/README.md @@ -1,4 +1,4 @@ -# Building Embassy OS +# Building StartOS ⚠️ The commands given assume a Debian or Ubuntu-based environment. _Building in a VM is NOT yet supported_ ⚠️ @@ -42,15 +42,15 @@ a VM is NOT yet supported_ ⚠️ 2. Clone the latest repo with required submodules > :information_source: You chan check latest available version - > [here](https://github.com/Start9Labs/embassy-os/releases) + > [here](https://github.com/Start9Labs/start-os/releases) ``` - git clone --recursive https://github.com/Start9Labs/embassy-os.git --branch latest + git clone --recursive https://github.com/Start9Labs/start-os.git --branch latest ``` ## Build Raspberry Pi Image ``` -cd embassy-os +cd start-os make embassyos-raspi.img ARCH=aarch64 ``` @@ -62,7 +62,7 @@ We recommend [Balena Etcher](https://www.balena.io/etcher/) ## Setup -Visit http://embassy.local from any web browser - We recommend +Visit http://start.local from any web browser - We recommend [Firefox](https://www.mozilla.org/firefox/browsers) Enter your product key. This is generated during the build process and can be @@ -70,11 +70,11 @@ found in `product_key.txt`, located in the root directory. ## Troubleshooting -1. I just flashed my SD card, fired up my Embassy, bootup sounds and all, but my - browser is saying "Unable to connect" with embassy.local. +1. I just flashed my SD card, fired up StartOS, bootup sounds and all, but my + browser is saying "Unable to connect" with start.local. - Try doing a hard refresh on your browser, or opening the url in a - private/incognito window. If you've ran an instance of Embassy before, + private/incognito window. If you've ran an instance of StartOS before, sometimes you can have a stale cache that will block you from navigating to the page. @@ -91,14 +91,14 @@ found in `product_key.txt`, located in the root directory. - Find the IP of your device - Run `nc 8080` and it will print the logs -4. I need to ssh into my Embassy to fix something, but I cannot get to the +4. I need to ssh into my server to fix something, but I cannot get to the console to add ssh keys normally. - During the Build step, instead of running just `make embassyos-raspi.img ARCH=aarch64` run `ENVIRONMENT=dev make embassyos-raspi.img ARCH=aarch64`. Flash like normal, - and insert into your Embassy. Boot up your Embassy, and on another computer on - the same network, ssh into the Embassy with the username `start9` password + and insert into your server. Boot up StartOS, then on another computer on + the same network, ssh into the the server with the username `start9` password `embassy`. 4. I need to reset my password, how can I do that? diff --git a/build/lib/motd b/build/lib/motd index 9b66cdfd2..fc07a2ceb 100644 --- a/build/lib/motd +++ b/build/lib/motd @@ -2,14 +2,20 @@ printf "\n" printf "Welcome to\n" cat << "ASCII" - | ,---.,---. -,---.,-.-.|---.,---.,---.,---., .| |`---. -|---'| | || |,---|`---.`---.| || | | -`---'` ' '`---'`---^`---'`---'`---|`---'`---' - `---' +╭ ━ ━ ━ ╮ ╭ ╮ ╱ ╱ ╱ ╱ ╱ ╭ ╮ ╭ ━ ━ ━ ┳ ━ ━ ━ ╮ +┃ ╭ ━ ╮ ┣ ╯ ╰ ╮ ╱ ╱ ╱ ╭ ╯ ╰ ┫ ╭ ━ ╮ ┃ ╭ ━ ╮ ┃ +┃ ╰ ━ ━ ╋ ╮ ╭ ╋ ━ ━ ┳ ┻ ╮ ╭ ┫ ┃ ╱ ┃ ┃ ╰ ━ ━ ╮ +╰ ━ ━ ╮ ┃ ┃ ┃ ┃ ╭ ╮ ┃ ╭ ┫ ┃ ┃ ┃ ╱ ┃ ┣ ━ ━ ╮ ┃ +┃ ╰ ━ ╯ ┃ ┃ ╰ ┫ ╭ ╮ ┃ ┃ ┃ ╰ ┫ ╰ ━ ╯ ┃ ╰ ━ ╯ ┃ +╰ ━ ━ ━ ╯ ╰ ━ ┻ ╯ ╰ ┻ ╯ ╰ ━ ┻ ━ ━ ━ ┻ ━ ━ ━ ╯ ASCII printf " %s (%s %s)\n" "$(uname -o)" "$(uname -r)" "$(uname -m)" -printf " $(embassy-cli --version | sed 's/Embassy CLI /embassyOS v/g') - $(embassy-cli git-info)\n" +printf " $(embassy-cli --version | sed 's/Embassy CLI /StartOS v/g') - $(embassy-cli git-info)" +if [ -n "$(cat /usr/lib/embassy/ENVIRONMENT.txt)" ]; then + printf " ~ $(cat /usr/lib/embassy/ENVIRONMENT.txt)\n" +else + printf "\n" +fi printf "\n" printf " * Documentation: https://start9.com\n" diff --git a/build/lib/scripts/enable-kiosk b/build/lib/scripts/enable-kiosk index 9a3eb0d61..3e6d0992d 100755 --- a/build/lib/scripts/enable-kiosk +++ b/build/lib/scripts/enable-kiosk @@ -10,8 +10,8 @@ set -e cat > /home/start9/kiosk.sh << 'EOF' #!/bin/sh PROFILE=$(mktemp -d) -if [ -f /usr/local/share/ca-certificates/embassy-root-ca.crt ]; then - certutil -A -n "Embassy Local Root CA" -t "TCu,Cuw,Tuw" -i /usr/local/share/ca-certificates/embassy-root-ca.crt -d $PROFILE +if [ -f /usr/local/share/ca-certificates/startos-root-ca.crt ]; then + certutil -A -n "StartOS Local Root CA" -t "TCu,Cuw,Tuw" -i /usr/local/share/ca-certificates/startos-root-ca.crt -d $PROFILE fi cat >> $PROFILE/prefs.js << EOT user_pref("network.proxy.autoconfig_url", "file:///usr/lib/embassy/proxy.pac"); diff --git a/build/lib/scripts/firefox-trust-cert b/build/lib/scripts/firefox-trust-cert index 545b1722b..8f2f21bca 100755 --- a/build/lib/scripts/firefox-trust-cert +++ b/build/lib/scripts/firefox-trust-cert @@ -3,6 +3,6 @@ for mozilladir in $(find /home -name ".mozilla"); do for certDB in $(find ${mozilladir} -name "cert9.db"); do certDir=$(dirname ${certDB}); - certutil -A -n "Embassy Local Root CA" -t "TCu,Cuw,Tuw" -i /usr/local/share/ca-certificates/embassy-root-ca.crt -d ${certDir} + certutil -A -n "StartOS Local Root CA" -t "TCu,Cuw,Tuw" -i /usr/local/share/ca-certificates/startos-root-ca.crt -d ${certDir} done done \ No newline at end of file diff --git a/frontend/README.md b/frontend/README.md index 03ff38a9c..fe77ff363 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,11 +1,11 @@ -# embassyOS Frontend +# StartOS Frontend -embassyOS has three user interfaces and a shared library, all written in Ionic/Angular/Typescript using an Angular workspace environment: +StartOS has three user interfaces and a shared library, all written in Ionic/Angular/Typescript using an Angular workspace environment: 1. **ui**: the main user interface -1. **install-wizard**: used to install embassyOS +1. **install-wizard**: used to install StartOS 1. **setup-wizard**: used to facilitate initial setup -1. **diagnostic-ui**: used to display certain diagnostic information in the event embassyOS fails to initialize +1. **diagnostic-ui**: used to display certain diagnostic information in the event StartOS fails to initialize 1. **marketplace**: abstracted ui elements to search for, list and display details for packages and their dependencies 1. **shared**: contains components, types, and functions shared amongst all of the UIs. @@ -30,8 +30,8 @@ v8.0.0 1. Clone the repository ```sh -git clone https://github.com/Start9Labs/embassy-os.git -cd embassy-os +git clone https://github.com/Start9Labs/start-os.git +cd start-os git submodule update --init --recursive cd frontend npm ci @@ -58,7 +58,7 @@ npm run start:diagnostic-ui ## Running locally with proxied backend -This section enables you to run a local frontend with a remote backend (eg. hosted on a live Embassy). It assumes you have completed Step 1 and Step 2 in the [section above](#running-locally-with-mocks) +This section enables you to run a local frontend with a remote backend (eg. hosted on a live Start9 server). It assumes you have completed Step 1 and Step 2 in the [section above](#running-locally-with-mocks) 1. Set `useMocks: false` in `config.json` diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c84d2e88f..28abcdad9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { - "name": "embassy-os", - "version": "0.3.4.1", + "name": "start-os", + "version": "0.3.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "embassy-os", - "version": "0.3.4.1", + "name": "start-os", + "version": "0.3.4.2", "dependencies": { "@angular/animations": "^14.1.0", "@angular/common": "^14.1.0", diff --git a/frontend/package.json b/frontend/package.json index a7b6b297d..4a5179142 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { - "name": "embassy-os", - "version": "0.3.4.1", + "name": "start-os", + "version": "0.3.4.2", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.html b/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.html index 47823ff77..9cba08258 100644 --- a/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.html +++ b/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.html @@ -5,7 +5,7 @@ class="ion-text-center" style="padding-bottom: 36px; font-size: calc(2vw + 14px)" > - embassyOS - Diagnostic Mode + StartOS - Diagnostic Mode @@ -16,7 +16,7 @@ font-weight: bold; " > - embassyOS launch error: + StartOS launch error:
@@ -28,7 +28,7 @@
- View Logs + View Logs

{{ error.solution }} - Restart Embassy + Restart Server
- System Rebuild + + System Rebuild +
- Repair Drive + + Repair Drive +
@@ -70,12 +70,12 @@ class="ion-text-center" style="padding-bottom: 36px; font-size: calc(2vw + 12px)" > - Embassy is restarting + Server is restarting

- Wait for Embassy restart, then refresh this page or click REFRESH below. + Wait for the server to restart, then refresh this page.

- Refresh + Refresh diff --git a/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts b/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts index 920775b31..bbda6939f 100644 --- a/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts +++ b/frontend/projects/diagnostic-ui/src/app/pages/home/home.page.ts @@ -32,7 +32,7 @@ export class HomePage { code: 15, problem: 'Unknown storage drive detected', solution: - 'To use a different storage drive, replace the current one and click RESTART EMBASSY below. To use the current storage drive, click USE CURRENT DRIVE below, then follow instructions. No data will be erased during this process.', + 'To use a different storage drive, replace the current one and click RESTART SERVER below. To use the current storage drive, click USE CURRENT DRIVE below, then follow instructions. No data will be erased during this process.', details: error.data?.details, } // no drive @@ -41,7 +41,7 @@ export class HomePage { code: 20, problem: 'Storage drive not found', solution: - 'Insert your embassyOS storage drive and click RESTART EMBASSY below.', + 'Insert your StartOS storage drive and click RESTART SERVER below.', details: error.data?.details, } // drive corrupted @@ -60,7 +60,7 @@ export class HomePage { code: 2, problem: 'Filesystem I/O error.', solution: - 'Repairing the disk could help resolve this issue. Please DO NOT unplug the drive or Embassy during this time or the situation will become worse.', + 'Repairing the disk could help resolve this issue. Please DO NOT unplug the drive or server during this time or the situation will become worse.', details: error.data?.details, } // disk management error - disk needs repair @@ -69,7 +69,7 @@ export class HomePage { code: 48, problem: 'Disk management error.', solution: - 'Repairing the disk could help resolve this issue. Please DO NOT unplug the drive or Embassy during this time or the situation will become worse.', + 'Repairing the disk could help resolve this issue. Please DO NOT unplug the drive or server during this time or the situation will become worse.', details: error.data?.details, } } else { @@ -122,7 +122,7 @@ export class HomePage { const alert = await this.alertCtrl.create({ header: 'Warning', message: - '

This action will tear down all service containers and rebuild them from scratch. No data will be deleted.

A system rebuild can be useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues.

It may take up to an hour to complete. During this time, you will lose all connectivity to your Embassy.

', + '

This action will tear down all service containers and rebuild them from scratch. No data will be deleted.

A system rebuild can be useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues.

It may take up to an hour to complete. During this time, you will lose all connectivity to your Start9 server.

', buttons: [ { text: 'Cancel', diff --git a/frontend/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts b/frontend/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts index c8fea5ad6..5d8c13a4f 100644 --- a/frontend/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts +++ b/frontend/projects/diagnostic-ui/src/app/services/api/mock-api.service.ts @@ -9,7 +9,7 @@ export class MockApiService implements ApiService { await pauseFor(1000) return { code: 15, - message: 'Unknown Embassy', + message: 'Unknown server', data: { details: 'Some details about the error here' }, } } diff --git a/frontend/projects/diagnostic-ui/src/index.html b/frontend/projects/diagnostic-ui/src/index.html index 91fd733d7..1822018f3 100644 --- a/frontend/projects/diagnostic-ui/src/index.html +++ b/frontend/projects/diagnostic-ui/src/index.html @@ -1,22 +1,23 @@ + + + StartOS Diagnostic UI - - - embassyOS Diagnostic UI + - + + + + - - - - - - - - - - - + + + + + diff --git a/frontend/projects/install-wizard/src/app/pages/home/home.page.html b/frontend/projects/install-wizard/src/app/pages/home/home.page.html index 61d82eebc..d1ebe43b5 100644 --- a/frontend/projects/install-wizard/src/app/pages/home/home.page.html +++ b/frontend/projects/install-wizard/src/app/pages/home/home.page.html @@ -70,11 +70,9 @@ >

- Re-Install embassyOS + Re-Install StartOS

-

Will preserve existing embassyOS data

+

Will preserve existing StartOS data

 @@ -92,7 +90,7 @@ [color]="(selectedDisk | guid) ? 'danger' : 'success'" > {{ (selectedDisk | guid) ? 'Factory Reset' : 'Install - embassyOS' }} + StartOS' }}

Will delete existing data on disk

diff --git a/frontend/projects/install-wizard/src/app/pages/home/home.page.ts b/frontend/projects/install-wizard/src/app/pages/home/home.page.ts index e367d19bc..c3764a976 100644 --- a/frontend/projects/install-wizard/src/app/pages/home/home.page.ts +++ b/frontend/projects/install-wizard/src/app/pages/home/home.page.ts @@ -56,7 +56,7 @@ export class HomePage { private async install(overwrite: boolean) { const loader = await this.loadingCtrl.create({ - message: 'Installing embassyOS...', + message: 'Installing StartOS...', }) await loader.present() @@ -80,7 +80,7 @@ export class HomePage { header: 'Warning', message: `This action will COMPLETELY erase the disk ${ vendor || 'Unknown Vendor' - } - ${model || 'Unknown Model'} and install embassyOS in its place`, + } - ${model || 'Unknown Model'} and install StartOS in its place`, buttons: [ { text: 'Cancel', @@ -102,7 +102,7 @@ export class HomePage { const alert = await this.alertCtrl.create({ header: 'Install Success', message: - 'Remove the USB stick and reboot your device to begin using your new Embassy', + 'Remove the USB stick and reboot your device to begin using your new Start9 server', buttons: [ { text: 'Reboot', @@ -133,7 +133,7 @@ export class HomePage { private async presentAlertComplete() { const alert = await this.alertCtrl.create({ header: 'Rebooting', - message: 'Please wait for embassyOS to restart, then refresh this page', + message: 'Please wait for StartOS to restart, then refresh this page', buttons: ['OK'], }) await alert.present() diff --git a/frontend/projects/install-wizard/src/index.html b/frontend/projects/install-wizard/src/index.html index 4849401fb..ab121c687 100644 --- a/frontend/projects/install-wizard/src/index.html +++ b/frontend/projects/install-wizard/src/index.html @@ -2,7 +2,7 @@ - embassyOS Install Wizard + StartOS Install Wizard diff --git a/frontend/projects/setup-wizard/src/app/app-routing.module.ts b/frontend/projects/setup-wizard/src/app/app-routing.module.ts index ccc184340..aa56c382d 100644 --- a/frontend/projects/setup-wizard/src/app/app-routing.module.ts +++ b/frontend/projects/setup-wizard/src/app/app-routing.module.ts @@ -26,7 +26,7 @@ const routes: Routes = [ ), }, { - path: 'embassy', + path: 'storage', loadChildren: () => import('./pages/embassy/embassy.module').then(m => m.EmbassyPageModule), }, diff --git a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts index 1f15c4468..7f293f5e0 100644 --- a/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts +++ b/frontend/projects/setup-wizard/src/app/modals/cifs-modal/cifs-modal.page.ts @@ -5,7 +5,7 @@ import { ModalController, } from '@ionic/angular' import { ApiService, CifsBackupTarget } from 'src/app/services/api/api.service' -import { EmbassyOSDiskInfo } from '@start9labs/shared' +import { StartOSDiskInfo } from '@start9labs/shared' import { PasswordPage } from '../password/password.page' @Component({ @@ -41,7 +41,7 @@ export class CifsModal { await loader.present() try { - const embassyOS = await this.api.verifyCifs({ + const diskInfo = await this.api.verifyCifs({ ...this.cifs, password: this.cifs.password ? await this.api.encrypt(this.cifs.password) @@ -50,20 +50,18 @@ export class CifsModal { await loader.dismiss() - this.presentModalPassword(embassyOS) + this.presentModalPassword(diskInfo) } catch (e) { await loader.dismiss() this.presentAlertFailed() } } - private async presentModalPassword( - embassyOS: EmbassyOSDiskInfo, - ): Promise { + private async presentModalPassword(diskInfo: StartOSDiskInfo): Promise { const target: CifsBackupTarget = { ...this.cifs, mountable: true, - 'embassy-os': embassyOS, + 'embassy-os': diskInfo, } const modal = await this.modalController.create({ diff --git a/frontend/projects/setup-wizard/src/app/modals/password/password.page.html b/frontend/projects/setup-wizard/src/app/modals/password/password.page.html index 003b1132c..d779077c6 100644 --- a/frontend/projects/setup-wizard/src/app/modals/password/password.page.html +++ b/frontend/projects/setup-wizard/src/app/modals/password/password.page.html @@ -1,8 +1,6 @@ - - {{ storageDrive ? 'Set Password' : 'Unlock Drive' }} - + {{ storageDrive ? 'Set Password' : 'Unlock Drive' }} @@ -13,7 +11,7 @@

- Choose a password for your Embassy. + Choose a password for your server. Make it good. Write it down.

diff --git a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html index ae39312dd..2c10d9545 100644 --- a/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/attach/attach.page.html @@ -6,10 +6,9 @@ Use existing drive
- Select the physical drive containing your Embassy - data + + Select the physical drive containing your StartOS data +
@@ -24,8 +23,8 @@

- No valid Embassy data drives found. Please make sure the drive - is a valid Embassy data drive (not a backup) and is firmly + No valid StartOS data drives found. Please make sure the drive + is a valid StartOS data drive (not a backup) and is firmly connected, then refresh the page.

diff --git a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html index 8fd808292..bc7e82036 100644 --- a/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.html @@ -11,7 +11,7 @@ Select storage drive
- This is the drive where your Embassy data will be stored. + This is the drive where your StartOS data will be stored.
@@ -23,8 +23,8 @@ No drives found
- Please connect an external storage drive to your Embassy, if - applicable. Next, click "Refresh". + Please connect a storage drive to your server. Then click + "Refresh".
diff --git a/frontend/projects/setup-wizard/src/app/pages/home/home.page.html b/frontend/projects/setup-wizard/src/app/pages/home/home.page.html index ce8d77c9a..b7296ca83 100644 --- a/frontend/projects/setup-wizard/src/app/pages/home/home.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/home/home.page.html @@ -21,8 +21,8 @@ - {{ swiper?.activeIndex === 0 ? 'embassyOS Setup' : 'Recover - Options' }} + {{ swiper?.activeIndex === 0 ? 'StartOS Setup' : 'Recover Options' + }} @@ -39,12 +39,12 @@ [disabled]="error" detail="false" lines="none" - routerLink="/embassy" + routerLink="/storage" >

Start Fresh

-

Get started with a brand new Embassy

+

Get started with a brand new Start9 server

 @@ -59,7 +59,7 @@

Recover

-

Recover, restore, or transfer Embassy data

+

Recover, restore, or transfer StartOS data

 @@ -78,7 +78,11 @@

Use Existing Drive

-

Attach an existing embassyOS data drive (not a backup)

+

+ Attach an existing StartOS data drive ( + not + a backup) +

@@ -95,7 +99,7 @@ Transfer

- Transfer data from an existing embassyOS data drive (not a + Transfer data from an existing StartOS data drive (not a backup) to a new, preferred drive

@@ -116,7 +120,7 @@ Restore From Backup (Disaster Recovery) -

Restore embassyOS data from an encrypted backup

+

Restore StartOS data from an encrypted backup

diff --git a/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html b/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html index d4c34dc05..36a039300 100644 --- a/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.html @@ -7,7 +7,7 @@ color="dark" > - Initializing Embassy + Initializing StartOS
Progress: {{ (decimal * 100).toFixed(0)}}% diff --git a/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.ts b/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.ts index d95ed823c..fd09c84d1 100644 --- a/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.ts +++ b/frontend/projects/setup-wizard/src/app/pages/loading/loading.page.ts @@ -37,7 +37,7 @@ export class ToMessagePipe implements PipeTransform { transform(progress: number | null): string { if (['fresh', 'attach'].includes(this.stateService.setupType || '')) { - return 'Setting up your Embassy' + return 'Setting up your server' } if (!progress) { diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/drive-status.component.html b/frontend/projects/setup-wizard/src/app/pages/recover/drive-status.component.html index 8fa441241..7f4a4e5bd 100644 --- a/frontend/projects/setup-wizard/src/app/pages/recover/drive-status.component.html +++ b/frontend/projects/setup-wizard/src/app/pages/recover/drive-status.component.html @@ -2,13 +2,13 @@

- Embassy backup detected + StartOS backup detected

- No Embassy backup + No StartOS backup

diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html index 533186629..32f71a3ad 100644 --- a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.html @@ -19,8 +19,8 @@

Network Folder

- Restore your Embassy from a folder on another computer that is - connected to the same network as your Embassy. + Restore StartOS data from a folder on another computer that is + connected to the same network as your server.

@@ -42,8 +42,8 @@

Physical Drive

- Restore your Embassy from a physical drive that is plugged - directly into your Embassy. + Restore StartOS data from a physical drive that is plugged + directly into your server.


diff --git a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts index ea852d297..a8cd194ba 100644 --- a/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts +++ b/frontend/projects/setup-wizard/src/app/pages/recover/recover.page.ts @@ -86,7 +86,7 @@ export class RecoverPage { }, } this.stateService.recoveryPassword = res.data.recoveryPassword - this.navCtrl.navigateForward('/embassy') + this.navCtrl.navigateForward('/storage') } }) await modal.present() @@ -119,7 +119,7 @@ export class RecoverPage { }, } this.stateService.recoveryPassword = password - this.navCtrl.navigateForward(`/embassy`) + this.navCtrl.navigateForward(`/storage`) } } diff --git a/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html b/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html index 88208468b..5c5ea38d0 100644 --- a/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html +++ b/frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html @@ -1,7 +1,7 @@ - Embassy Address Info + StartOS Address Info
- Embassy Address Info + StartOS Address Info

Visit the address below when you are connected to the same WiFi or - Local Area Network (LAN) as your Embassy: + Local Area Network (LAN) as your server:

- You can now safely unplug your old Embassy drive + You can now safely unplug your old StartOS data drive

- Download permanent address info + + Download permanent address info +

- embassy.local was for setup purposes only. It will no + start.local was for setup purposes only. It will no longer work.

@@ -77,7 +77,7 @@ >
-

Go to Embassy login

+

Login to StartOS

@@ -86,7 +86,11 @@ - + diff --git a/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts b/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts index ac28bf3f2..ce1f32a7d 100644 --- a/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts +++ b/frontend/projects/setup-wizard/src/app/pages/success/success.page.ts @@ -84,7 +84,7 @@ export class SuccessPage { encodeURIComponent(this.cert), ) let html = this.document.getElementById('downloadable')?.innerHTML || '' - this.downloadHtml.download('embassy-info.html', html).then(_ => { + this.downloadHtml.download('StartOS-info.html', html).then(_ => { this.disableLogin = false }) } diff --git a/frontend/projects/setup-wizard/src/app/pages/transfer/transfer.page.html b/frontend/projects/setup-wizard/src/app/pages/transfer/transfer.page.html index ad669686c..958a1e6d8 100644 --- a/frontend/projects/setup-wizard/src/app/pages/transfer/transfer.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/transfer/transfer.page.html @@ -7,7 +7,7 @@ Transfer
- Select the physical drive containing your Embassy data + Select the physical drive containing your StartOS data
diff --git a/frontend/projects/setup-wizard/src/app/services/api/api.service.ts b/frontend/projects/setup-wizard/src/app/services/api/api.service.ts index 93bf7f4cc..df9636093 100644 --- a/frontend/projects/setup-wizard/src/app/services/api/api.service.ts +++ b/frontend/projects/setup-wizard/src/app/services/api/api.service.ts @@ -1,12 +1,12 @@ import * as jose from 'node-jose' -import { DiskListResponse, EmbassyOSDiskInfo } from '@start9labs/shared' +import { DiskListResponse, StartOSDiskInfo } from '@start9labs/shared' export abstract class ApiService { pubkey?: jose.JWK.Key abstract getStatus(): Promise // setup.status abstract getPubKey(): Promise // setup.get-pubkey abstract getDrives(): Promise // setup.disk.list - abstract verifyCifs(cifs: CifsRecoverySource): Promise // setup.cifs.verify + abstract verifyCifs(cifs: CifsRecoverySource): Promise // setup.cifs.verify abstract attach(importInfo: AttachReq): Promise // setup.attach abstract execute(setupInfo: ExecuteReq): Promise // setup.execute abstract complete(): Promise // setup.complete @@ -58,7 +58,7 @@ export type DiskBackupTarget = { label: string | null capacity: number used: number | null - 'embassy-os': EmbassyOSDiskInfo | null + 'embassy-os': StartOSDiskInfo | null } export type CifsBackupTarget = { @@ -66,7 +66,7 @@ export type CifsBackupTarget = { path: string username: string mountable: boolean - 'embassy-os': EmbassyOSDiskInfo | null + 'embassy-os': StartOSDiskInfo | null } export type DiskRecoverySource = { diff --git a/frontend/projects/setup-wizard/src/app/services/api/live-api.service.ts b/frontend/projects/setup-wizard/src/app/services/api/live-api.service.ts index 724d2316e..ab67db5d0 100644 --- a/frontend/projects/setup-wizard/src/app/services/api/live-api.service.ts +++ b/frontend/projects/setup-wizard/src/app/services/api/live-api.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import { DiskListResponse, - EmbassyOSDiskInfo, + StartOSDiskInfo, encodeBase64, HttpService, isRpcError, @@ -59,7 +59,7 @@ export class LiveApiService extends ApiService { async verifyCifs(source: CifsRecoverySource) { source.path = source.path.replace('/\\/g', '/') - return this.rpcRequest({ + return this.rpcRequest({ method: 'setup.cifs.verify', params: source, }) diff --git a/frontend/projects/setup-wizard/src/app/services/api/mock-api.service.ts b/frontend/projects/setup-wizard/src/app/services/api/mock-api.service.ts index e8c62d5fc..d7ab07bd6 100644 --- a/frontend/projects/setup-wizard/src/app/services/api/mock-api.service.ts +++ b/frontend/projects/setup-wizard/src/app/services/api/mock-api.service.ts @@ -150,7 +150,7 @@ export class MockApiService extends ApiService { await pauseFor(1000) return { 'tor-address': 'http://asdafsadasdasasdasdfasdfasdf.onion', - 'lan-address': 'https://embassy-abcdefgh.local', + 'lan-address': 'https://adjective-noun.local', 'root-ca': encodeBase64(rootCA), } } diff --git a/frontend/projects/setup-wizard/src/index.html b/frontend/projects/setup-wizard/src/index.html index 03ef883e0..9c6e49a64 100644 --- a/frontend/projects/setup-wizard/src/index.html +++ b/frontend/projects/setup-wizard/src/index.html @@ -1,23 +1,24 @@ + + + StartOS Setup - - - Embassy Setup + - - - - - - - - - - - - + + + + + + + + + diff --git a/frontend/projects/shared/src/types/api.ts b/frontend/projects/shared/src/types/api.ts index 4726c05cd..1473dc16a 100644 --- a/frontend/projects/shared/src/types/api.ts +++ b/frontend/projects/shared/src/types/api.ts @@ -31,11 +31,11 @@ export interface PartitionInfo { label: string | null capacity: number used: number | null - 'embassy-os': EmbassyOSDiskInfo | null + 'embassy-os': StartOSDiskInfo | null guid: string | null } -export type EmbassyOSDiskInfo = { +export type StartOSDiskInfo = { version: string full: boolean 'password-hash': string | null diff --git a/frontend/projects/ui/src/app/app.component.ts b/frontend/projects/ui/src/app/app.component.ts index 522219024..af049e130 100644 --- a/frontend/projects/ui/src/app/app.component.ts +++ b/frontend/projects/ui/src/app/app.component.ts @@ -41,7 +41,7 @@ export class AppComponent implements OnDestroy { ngOnInit() { this.patch .watch$('ui', 'name') - .subscribe(name => this.titleService.setTitle(name || 'embassyOS')) + .subscribe(name => this.titleService.setTitle(name || 'StartOS')) } splitPaneVisible({ detail }: any) { diff --git a/frontend/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html b/frontend/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html index f18b7f3e8..e0437cd1d 100644 --- a/frontend/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html +++ b/frontend/projects/ui/src/app/components/backup-drives/backup-drives-status.component.html @@ -1,16 +1,20 @@

- {{ hasValidBackup ? 'Available, contains existing backup' : 'Available for fresh backup' }} + {{ + hasValidBackup + ? 'Available, contains existing backup' + : 'Available for fresh backup' + }}

- Embassy backup detected + StartOS backup detected

- No Embassy backup + No StartOS backup

-
\ No newline at end of file +
diff --git a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html index 0f4a01105..f10c3f9c5 100644 --- a/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html +++ b/frontend/projects/ui/src/app/components/backup-drives/backup-drives.component.html @@ -27,11 +27,11 @@

{{ type === 'create' - ? 'Backup your Embassy to' + ? 'Backup server to' : 'Restore your services from' }} a folder on another computer that is connected to the same network - as your Embassy. View the + as your Start9 server. View the {{ type === 'create' - ? 'Backup your Embassy to' + ? 'Backup server to' : 'Restore your services from' }} - a physcial drive that is plugged directly into your Embassy. View - the + a physical drive that is plugged directly into your Start9 Server. + View the . - Warning. Do not use this option if you are using a Raspberry Pi + + Warning. Do not use this option if you are using a Raspberry Pi with an external SSD. The Raspberry Pi does not support more than one external drive without additional power and can cause - data corruption. + data corruption. +

@@ -136,9 +136,10 @@

No drives detected. - Refresh + + Refresh + +

diff --git a/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.html b/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.html index c37d38a33..6e7f7c6fa 100644 --- a/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.html +++ b/frontend/projects/ui/src/app/components/toast-container/notifications-toast/notifications-toast.component.html @@ -1,6 +1,6 @@ diff --git a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.html b/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.html index cc54ff1eb..b7a4af51b 100644 --- a/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.html +++ b/frontend/projects/ui/src/app/components/toast-container/update-toast/update-toast.component.html @@ -1,10 +1,10 @@ - Restart your Embassy for these updates to take effect. It can take several + Restart your server for these updates to take effect. It can take several minutes to come back online. diff --git a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts b/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts index d9275c768..cec5aacc4 100644 --- a/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts +++ b/frontend/projects/ui/src/app/components/widget-list/widget-list.component.ts @@ -49,28 +49,28 @@ export class WidgetListComponent { title: 'Secure LAN', icon: 'home-outline', color: 'var(--alt-orange)', - description: `Download and trust your Embassy's certificate`, + description: `Download and trust your server's certificate`, link: '/system/lan', }, { title: 'Create Backup', icon: 'duplicate-outline', color: 'var(--alt-purple)', - description: 'Back up your Embassy and service data', + description: 'Back up StartOS and service data', link: '/system/backup', }, { - title: 'Embassy Info', + title: 'Server Info', icon: 'information-circle-outline', color: 'var(--alt-green)', - description: 'View basic information about your Embassy', + description: 'View basic information about your server', link: '/system/specs', }, { title: 'User Manual', icon: 'map-outline', color: 'var(--alt-yellow)', - description: 'Discover what your Embassy can do', + description: 'Discover what StartOS can do', link: 'https://docs.start9.com/latest/user-manual/index', }, { diff --git a/frontend/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html b/frontend/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html index a77b288f7..09a055650 100644 --- a/frontend/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html +++ b/frontend/projects/ui/src/app/modals/app-recover-select/app-recover-select.page.html @@ -29,7 +29,7 @@

- Unavailable. Backup was made on a newer version of embassyOS. + Unavailable. Backup was made on a newer version of StartOS.

diff --git a/frontend/projects/ui/src/app/modals/os-update/os-update.page.html b/frontend/projects/ui/src/app/modals/os-update/os-update.page.html index ffc0abcd8..011a5cc51 100644 --- a/frontend/projects/ui/src/app/modals/os-update/os-update.page.html +++ b/frontend/projects/ui/src/app/modals/os-update/os-update.page.html @@ -1,9 +1,9 @@
- embassyOS {{ versions[0].version }} + + StartOS {{ versions[0].version }} +
Release Notes diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index 9b183c28a..236e98f12 100644 --- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -12,11 +12,35 @@

This Release

+

0.3.4.2

+

+ View the complete + + release notes + + for more details. +

+
Highlights
+
    +
  • Update build system for Server Lite and NUC-based Server One
    • +
  • Rename embassyOS to StartOS
    • +
  • + PWA support for StartOS web interface. You can now save StartOS to your + phone as an app! +
    • +
+ +

Previous Releases

+

0.3.4.1

View the complete @@ -29,13 +53,11 @@

  • 0.3.4 bug fixes
    • -

    Previous Releases

    -

    0.3.4

    View the complete diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html b/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html index d8c845fe7..adcfcb829 100644 --- a/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html +++ b/frontend/projects/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html @@ -14,17 +14,16 @@ - + > - Actions for {{ pkg.manifest.title }} + + Actions for {{ pkg.manifest.title }} + - + > diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html index b1558ba88..05e4a76cf 100644 --- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html +++ b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html @@ -12,7 +12,7 @@

    -

    Welcome to embassyOS

    +

    Welcome to StartOS

    @@ -38,6 +38,6 @@ - +     diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html b/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html index a2b8f7664..bc57dd27b 100644 --- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html +++ b/frontend/projects/ui/src/app/pages/apps-routes/app-show/app-show.page.html @@ -63,8 +63,10 @@ download and trust your Embassy's certificate. + > + download and trust your server's certificate + + .

    Open https diff --git a/frontend/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts b/frontend/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts index e585cbc68..b8a848f12 100644 --- a/frontend/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts +++ b/frontend/projects/ui/src/app/pages/developer-routes/developer-menu/form-info.ts @@ -46,7 +46,7 @@ export function getBasicInfoSpec(devData: DevProjectData): ConfigSpec { type: 'string', name: 'Service Version', description: - 'Service version - accepts up to four digits, where the last confirms to revisions necessary for embassyOS - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of the service', + 'Service version - accepts up to four digits, where the last confirms to revisions necessary for StartOS - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of the service', placeholder: 'e.g. 0.1.2.3', nullable: false, masked: false, diff --git a/frontend/projects/ui/src/app/pages/login/login.page.html b/frontend/projects/ui/src/app/pages/login/login.page.html index bca5833c9..8719b360a 100644 --- a/frontend/projects/ui/src/app/pages/login/login.page.html +++ b/frontend/projects/ui/src/app/pages/login/login.page.html @@ -6,7 +6,7 @@ - Embassy Login + StartOS Login diff --git a/frontend/projects/ui/src/app/pages/notifications/notifications.page.html b/frontend/projects/ui/src/app/pages/notifications/notifications.page.html index 6ad13607e..f9e697107 100644 --- a/frontend/projects/ui/src/app/pages/notifications/notifications.page.html +++ b/frontend/projects/ui/src/app/pages/notifications/notifications.page.html @@ -60,8 +60,8 @@ name="mail-outline" >

    - Important system alerts and notifications from your Embassy will - display here + Important system alerts and notifications from StartOS will display + here

    diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html index 5357584a0..5c11fea02 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html +++ b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html @@ -18,14 +18,15 @@ href="https://docs.start9.com/latest/user-manual/connecting/connecting-lan" target="_blank" rel="noreferrer" - >follow instructions - to download and trust your Embassy's Root Certificate Authority + follow instructions + + to download and trust your server's Root Certificate Authority - +

    Download Certificate

    @@ -37,6 +38,6 @@ diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.ts b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.ts index 087449392..bcb0a968f 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.ts +++ b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.ts @@ -1,4 +1,7 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core' +import { ChangeDetectionStrategy, Component, Input } from '@angular/core' +import { PatchDB } from 'patch-db-client' +import { map } from 'rxjs' +import { DataModel } from 'src/app/services/patch-db/data-model' @Component({ selector: 'lan', @@ -7,6 +10,12 @@ import { ChangeDetectionStrategy, Component } from '@angular/core' changeDetection: ChangeDetectionStrategy.OnPush, }) export class LANPage { + readonly crtName$ = this.patch + .watch$('server-info', 'lan-address') + .pipe(map(addr => `${new URL(addr).hostname}.crt`)) + + constructor(private readonly patch: PatchDB) {} + installCert(): void { document.getElementById('install-cert')?.click() } diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts b/frontend/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts index 92e302d66..2d4d3901e 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts +++ b/frontend/projects/ui/src/app/pages/server-routes/server-backup/server-backup.page.ts @@ -49,7 +49,7 @@ export class ServerBackupPage { .pipe(skip(1), takeUntil(this.destroy$)) .subscribe(isBackingUp => { if (!isBackingUp) { - this.navCtrl.navigateRoot('/embassy') + this.navCtrl.navigateRoot('/system') } }) } diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html index 6698f5ce2..e236895df 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html +++ b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.html @@ -1,6 +1,6 @@ - System + System @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@

    Click the button on the right to switch to https. Your browser may warn you that the page is insecure. You can safely bypass this - warning. It will go away after you download and trust your Embassy's + warning. It will go away after you download and trust your server's certificate

    diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts index 6373791fb..bdadd9e69 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts +++ b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts @@ -65,7 +65,7 @@ export class ServerShowPage { message: `This value will be displayed as the title of your browser tab.`, label: 'Device Name', useMask: false, - placeholder: 'embassyOS', + placeholder: 'StartOS', nullable: true, initialValue: chosenName, buttonText: 'Save', @@ -113,7 +113,7 @@ export class ServerShowPage { const alert = await this.alertCtrl.create({ header: 'Restart', message: - 'Are you sure you want to restart your Embassy? It can take several minutes to come back online.', + 'Are you sure you want to restart your server? It can take several minutes to come back online.', buttons: [ { text: 'Cancel', @@ -135,7 +135,7 @@ export class ServerShowPage { const alert = await this.alertCtrl.create({ header: 'Warning', message: - 'Are you sure you want to power down your Embassy? This can take several minutes, and your Embassy will not come back online automatically. To power on again, You will need to physically unplug your Embassy and plug it back in', + 'Are you sure you want to power down your server? This can take several minutes, and your server will not come back online automatically. To power on again, You will need to physically unplug your server and plug it back in', buttons: [ { text: 'Cancel', @@ -159,7 +159,7 @@ export class ServerShowPage { const minutes = Object.keys(localPkgs).length * 2 const alert = await this.alertCtrl.create({ header: 'Warning', - message: `This action will tear down all service containers and rebuild them from scratch. No data will be deleted. This action is useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues. It may take up to ${minutes} minutes to complete. During this time, you will lose all connectivity to your Embassy.`, + message: `This action will tear down all service containers and rebuild them from scratch. No data will be deleted. This action is useful if your system gets into a bad state, and it should only be performed if you are experiencing general performance or reliability issues. It may take up to ${minutes} minutes to complete. During this time, you will lose all connectivity to your server.`, buttons: [ { text: 'Cancel', @@ -325,7 +325,7 @@ export class ServerShowPage { private async presentAlertLatest() { const alert = await this.alertCtrl.create({ header: 'Up to date!', - message: 'You are on the latest version of embassyOS.', + message: 'You are on the latest version of StartOS.', buttons: [ { text: 'OK', @@ -341,7 +341,7 @@ export class ServerShowPage { private async presentAlertInProgress(verb: string, message: string) { const alert = await this.alertCtrl.create({ header: `${verb} In Progress...`, - message: `Stopping all services gracefully. This can take a while.

    If you have a speaker, your Embassy will ♫ play a melody ♫ before shutting down. Your Embassy will then become unreachable${message}`, + message: `Stopping all services gracefully. This can take a while.

    If you have a speaker, your server will ♫ play a melody ♫ before shutting down. Your server will then become unreachable${message}`, buttons: [ { text: 'OK', @@ -357,7 +357,7 @@ export class ServerShowPage { Backups: [ { title: 'Create Backup', - description: 'Back up your Embassy and service data', + description: 'Back up StartOS and service data', icon: 'duplicate-outline', action: () => this.navCtrl.navigateForward(['backup'], { relativeTo: this.route }), @@ -380,7 +380,7 @@ export class ServerShowPage { Manage: [ { title: 'Software Update', - description: 'Get the latest version of embassyOS', + description: 'Get the latest version of StartOS', icon: 'cloud-download-outline', action: () => this.eosService.updateAvailable$.getValue() @@ -399,7 +399,7 @@ export class ServerShowPage { }, { title: 'LAN', - description: `Download and trust your Embassy's certificate for a secure local connection`, + description: `Download and trust your server's certificate for a secure local connection`, icon: 'home-outline', action: () => this.navCtrl.navigateForward(['lan'], { relativeTo: this.route }), @@ -409,7 +409,7 @@ export class ServerShowPage { { title: 'SSH', description: - 'Manage your SSH keys to access your Embassy from the command line', + 'Manage your SSH keys to access your server from the command line', icon: 'terminal-outline', action: () => this.navCtrl.navigateForward(['ssh'], { relativeTo: this.route }), @@ -440,7 +440,7 @@ export class ServerShowPage { Insights: [ { title: 'About', - description: 'Basic information about your Embassy', + description: 'Basic information about your server', icon: 'information-circle-outline', action: () => this.navCtrl.navigateForward(['specs'], { relativeTo: this.route }), @@ -492,7 +492,7 @@ export class ServerShowPage { Support: [ { title: 'User Manual', - description: 'Discover what your Embassy can do', + description: 'Discover what StartOS can do', icon: 'map-outline', action: () => window.open( @@ -518,7 +518,7 @@ export class ServerShowPage { }, { title: 'Donate to Start9', - description: `Support embassyOS development`, + description: `Support StartOS development`, icon: 'logo-bitcoin', action: () => this.document.defaultView?.open( diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html index 695254c03..ab4618820 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html +++ b/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html @@ -9,7 +9,7 @@ - embassyOS Info + StartOS Info

    Version

    diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html b/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html index 6975a9993..4ac7d5439 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html +++ b/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html @@ -13,11 +13,11 @@

    - Adding SSH keys to your Embassy is useful for command line access, as - well as for debugging purposes. - View instructions + Adding SSH keys to StartOS is useful for command line access, as well + as for debugging purposes. + + View instructions +

    diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts b/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts index f28a32ae2..f2336586c 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts +++ b/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.ts @@ -119,7 +119,7 @@ const sshSpec = { type: 'string', name: 'SSH Key', description: - 'Enter the SSH public key you would like to authorize for root access to your Embassy.', + 'Enter the SSH public key you would like to authorize for root access to your server.', nullable: false, masked: false, copyable: false, diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html index f6d0136d7..588756b91 100644 --- a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html +++ b/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html @@ -19,15 +19,16 @@

    - Adding WiFi credentials to your Embassy allows you to remove the - Ethernet cable and move the device anywhere you want. Embassy will + Adding WiFi credentials to your StartOS allows you to remove the + Ethernet cable and move the device anywhere you want. StartOS will automatically connect to available networks. View instructions + View instructions +

    @@ -42,9 +43,9 @@ [disabled]="loading" > - {{ wifi.country }} - {{ this.countries[wifi.country] }} + + {{ wifi.country }} - {{ this.countries[wifi.country] }} + Select Country     @@ -79,9 +80,9 @@ - Saved Networks + + Saved Networks + - embassyOS + StartOS diff --git a/index.html b/index.html index 21e7c66c9..aa68e3a04 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - Embassy | Initializing + StartOS | Initializing -

    embassyOS Initializing

    +

    StartOS Initializing

    This process can take up to several minutes to complete.

    diff --git a/libs/artifacts/types.d.ts b/libs/artifacts/types.d.ts index f8b0f58db..ccf7acd42 100644 --- a/libs/artifacts/types.d.ts +++ b/libs/artifacts/types.d.ts @@ -1,38 +1,39 @@ export namespace ExpectedExports { - /** Set configuration is called after we have modified and saved the configuration in the embassy ui. Use this to make a file for the docker to read from for configuration. */ + /** Set configuration is called after we have modified and saved the configuration in the StartOS ui. Use this to make a file for the docker to read from for configuration. */ export type setConfig = ( effects: Effects, - input: Config, + input: Config ) => Promise>; - /** Get configuration returns a shape that describes the format that the embassy ui will generate, and later send to the set config */ + /** Get configuration returns a shape that describes the format that the StartOS ui will generate, and later send to the set config */ export type getConfig = (effects: Effects) => Promise>; /** These are how we make sure the our dependency configurations are valid and if not how to fix them. */ export type dependencies = Dependencies; /** Properties are used to get values from the docker, like a username + password, what ports we are hosting from */ export type properties = ( - effects: Effects, + effects: Effects ) => Promise>; export type health = { /** Should be the health check id */ [id: string]: ( effects: Effects, - dateMs: number, + dateMs: number ) => Promise>; }; export type migration = ( effects: Effects, - version: string, + version: string ) => Promise>; } - /** Used to reach out from the pure js runtime */ export type Effects = { /** Usable when not sandboxed */ - writeFile( - input: { path: string; volumeId: string; toWrite: string }, - ): Promise; + writeFile(input: { + path: string; + volumeId: string; + toWrite: string; + }): Promise; readFile(input: { volumeId: string; path: string }): Promise; metadata(input: { volumeId: string; path: string }): Promise; /** Create a directory. Usable when not sandboxed */ @@ -42,9 +43,11 @@ export type Effects = { removeFile(input: { volumeId: string; path: string }): Promise; /** Write a json file into an object. Usable when not sandboxed */ - writeJsonFile( - input: { volumeId: string; path: string; toWrite: object }, - ): Promise; + writeJsonFile(input: { + volumeId: string; + path: string; + toWrite: object; + }): Promise; /** Read a json file into an object */ readJsonFile(input: { volumeId: string; path: string }): Promise; @@ -62,22 +65,21 @@ export type Effects = { /** Sandbox mode lets us read but not write */ is_sandboxed(): boolean; - }; export type Metadata = { - fileType: string, - isDir: boolean, - isFile: boolean, - isSymlink: boolean, - len: number, - modified?: Date, - accessed?: Date, - created?: Date, - readonly: boolean, - uid: number, - gid: number, - mode: number -} + fileType: string; + isDir: boolean; + isFile: boolean; + isSymlink: boolean; + len: number; + modified?: Date; + accessed?: Date; + created?: Date; + readonly: boolean; + uid: number; + gid: number; + mode: number; +}; export type MigrationRes = { configured: boolean; @@ -134,8 +136,8 @@ export type Target = V & { export type UniqueBy = | { - any: UniqueBy[]; - } + any: UniqueBy[]; + } | string | null; @@ -145,25 +147,23 @@ export type WithNullable = T & { export type DefaultString = | String | { - /** The chars available for the randome generation */ - charset?: string; - /** Length that we generate to */ - len: number; - }; + /** The chars available for the randome generation */ + charset?: string; + /** Length that we generate to */ + len: number; + }; -export type ValueSpecString = - & ( - | {} - | { +export type ValueSpecString = ( + | {} + | { pattern: string; "pattern-description": string; } - ) - & { - copyable?: boolean; - masked?: boolean; - placeholder?: string; - }; +) & { + copyable?: boolean; + masked?: boolean; + placeholder?: string; +}; export type ValueSpecNumber = { /** Something like [3,6] or [0, *) */ range?: string; @@ -176,68 +176,68 @@ export type ValueSpecBoolean = {}; export type ValueSpecAny = | Tag<"boolean", WithDescription>> | Tag< - "string", - WithDescription, DefaultString>> - > + "string", + WithDescription, DefaultString>> + > | Tag< - "number", - WithDescription, number>> - > + "number", + WithDescription, number>> + > | Tag< - "enum", - WithDescription< - WithDefault< - { - values: string[]; - "value-names": { - [key: string]: string; - }; - }, - string + "enum", + WithDescription< + WithDefault< + { + values: string[]; + "value-names": { + [key: string]: string; + }; + }, + string + > > > - > | Tag<"list", ValueSpecList> | Tag<"object", WithDescription>> | Tag<"union", WithDescription>> | Tag< - "pointer", - WithDescription< - | Subtype< - "package", - | Target< - "tor-key", - { - "package-id": string; - interface: string; - } - > - | Target< - "tor-address", - { - "package-id": string; - interface: string; - } - > - | Target< - "lan-address", - { - "package-id": string; - interface: string; - } - > - | Target< - "config", - { - "package-id": string; - selector: string; - multi: boolean; - } - > + "pointer", + WithDescription< + | Subtype< + "package", + | Target< + "tor-key", + { + "package-id": string; + interface: string; + } + > + | Target< + "tor-address", + { + "package-id": string; + interface: string; + } + > + | Target< + "lan-address", + { + "package-id": string; + interface: string; + } + > + | Target< + "config", + { + "package-id": string; + selector: string; + multi: boolean; + } + > + > + | Subtype<"system", {}> > - | Subtype<"system", {}> - > - >; + >; export type ValueSpecUnion = { /** What tag for the specification, for tag unions */ tag: { @@ -262,36 +262,29 @@ export type ValueSpecObject = { }; export type ValueSpecList = | Subtype< - "boolean", - WithDescription, boolean[]>> - > - | Subtype< - "string", - WithDescription, string[]>> - > - | Subtype< - "number", - WithDescription, number[]>> - > - | Subtype< - "enum", - WithDescription< - WithDefault< - ListSpec< - ValueSpecEnum - >, - string[] - > + "boolean", + WithDescription, boolean[]>> > - > | Subtype< - "object", - WithDescription, {}[]>> - > + "string", + WithDescription, string[]>> + > | Subtype< - "union", - WithDescription, string[]>> - >; + "number", + WithDescription, number[]>> + > + | Subtype< + "enum", + WithDescription, string[]>> + > + | Subtype< + "object", + WithDescription, {}[]>> + > + | Subtype< + "union", + WithDescription, string[]>> + >; export type ValueSpecEnum = { values: string[]; "value-names": { [key: string]: string }; @@ -338,9 +331,11 @@ export type SetResult = { }; }; -export type KnownError = { error: String } | { - "error-code": [number, string] | readonly [number, string]; -}; +export type KnownError = + | { error: String } + | { + "error-code": [number, string] | readonly [number, string]; + }; export type ResultType = KnownError | { result: T }; export type PackagePropertiesV2 = { diff --git a/libs/models/src/errors.rs b/libs/models/src/errors.rs index 245409416..332560f7b 100644 --- a/libs/models/src/errors.rs +++ b/libs/models/src/errors.rs @@ -130,7 +130,7 @@ impl ErrorKind { DiskManagement => "Disk Management Error", OpenSsl => "OpenSSL Internal Error", PasswordHashGeneration => "Password Hash Generation Error", - DiagnosticMode => "Embassy is in Diagnostic Mode", + DiagnosticMode => "Server is in Diagnostic Mode", ParseDbField => "Database Field Parse Error", Duplicate => "Duplication Error", MultipleErrors => "Multiple Errors",