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 <matthewonthemoon@gmail.com>
Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com>
Co-authored-by: Lucy C <12953208+elvece@users.noreply.github.com>
This commit is contained in:
Aiden McClelland
2023-05-11 16:48:52 -06:00
committed by GitHub
parent c7d82102ed
commit 4a8f323be7
86 changed files with 516 additions and 468 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +1,6 @@
<!-- omit in toc -->
# 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)
<!-- omit in toc -->
@@ -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.
<!-- this should only be included if the project has a GUI -->
- **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

View File

@@ -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
<p align="center">
<img src="assets/embassyOS.png" alt="embassyOS" width="85%">
<img src="assets/StartOS.png" alt="StartOS" width="85%">
</p>
<p align="center">
<img src="assets/eOS-preferences.png" alt="Embassy Preferences" width="49%">
<img src="assets/eOS-ghost.png" alt="Embassy Ghost Service" width="49%">
<img src="assets/preferences.png" alt="StartOS Preferences" width="49%">
<img src="assets/ghost.png" alt="StartOS Ghost Service" width="49%">
</p>
<p align="center">
<img src="assets/eOS-synapse-health-check.png" alt="Embassy Synapse Health Checks" width="49%">
<img src="assets/eOS-sideload.png" alt="Embassy Sideload Service" width="49%">
<img src="assets/synapse-health-check.png" alt="StartOS Synapse Health Checks" width="49%">
<img src="assets/sideload.png" alt="StartOS Sideload Service" width="49%">
</p>

View File

Before

Width:  |  Height:  |  Size: 191 KiB

After

Width:  |  Height:  |  Size: 191 KiB

View File

Before

Width:  |  Height:  |  Size: 281 KiB

After

Width:  |  Height:  |  Size: 281 KiB

View File

Before

Width:  |  Height:  |  Size: 266 KiB

After

Width:  |  Height:  |  Size: 266 KiB

View File

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

View File

Before

Width:  |  Height:  |  Size: 213 KiB

After

Width:  |  Height:  |  Size: 213 KiB

View File

@@ -1,6 +1,6 @@
[package]
authors = ["Aiden McClelland <me@drbonez.dev>"]
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]

View File

@@ -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.

View File

@@ -31,7 +31,7 @@ async fn setup_or_init(cfg_path: Option<PathBuf>) -> 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<PathBuf>) -> 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?;

View File

@@ -213,7 +213,7 @@ pub async fn import<P: AsRef<Path>>(
.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<P: AsRef<Path>>(
.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,
));
}

View File

@@ -258,7 +258,7 @@ pub async fn init(cfg: &RpcContextConfig) -> Result<InitResult, Error> {
// 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?;

View File

@@ -7,4 +7,4 @@ prompt = no
[req_distinguished_name]
CN = {hostname}.local
O = Start9 Labs
OU = Embassy
OU = StartOS

View File

@@ -173,7 +173,7 @@ pub fn make_root_cert(root_key: &PKey<Private>, hostname: &Hostname) -> Result<X
let mut subject_name_builder = X509NameBuilder::new()?;
subject_name_builder.append_entry_by_text("CN", &format!("{} Local Root CA", &*hostname.0))?;
subject_name_builder.append_entry_by_text("O", "Start9")?;
subject_name_builder.append_entry_by_text("OU", "Embassy")?;
subject_name_builder.append_entry_by_text("OU", "StartOS")?;
let subject_name = subject_name_builder.build();
builder.set_subject_name(&subject_name)?;
@@ -225,9 +225,9 @@ pub fn make_int_cert(
builder.set_serial_number(&*rand_serial()?)?;
let mut subject_name_builder = X509NameBuilder::new()?;
subject_name_builder.append_entry_by_text("CN", "Embassy Local Intermediate CA")?;
subject_name_builder.append_entry_by_text("CN", "StartOS Local Intermediate CA")?;
subject_name_builder.append_entry_by_text("O", "Start9")?;
subject_name_builder.append_entry_by_text("OU", "Embassy")?;
subject_name_builder.append_entry_by_text("OU", "StartOS")?;
let subject_name = subject_name_builder.build();
builder.set_subject_name(&subject_name)?;
@@ -370,7 +370,7 @@ pub fn make_leaf_cert(
.unwrap_or("localhost"),
)?;
subject_name_builder.append_entry_by_text("O", "Start9")?;
subject_name_builder.append_entry_by_text("OU", "Embassy")?;
subject_name_builder.append_entry_by_text("OU", "StartOS")?;
let subject_name = subject_name_builder.build();
builder.set_subject_name(&subject_name)?;

View File

@@ -173,7 +173,7 @@ pub async fn delete(#[context] ctx: RpcContext, #[arg] ssid: String) -> 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

View File

@@ -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(&current)

View File

@@ -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()));
}

View File

@@ -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 <ip> 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?

View File

@@ -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"

View File

@@ -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");

View File

@@ -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

View File

@@ -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`

View File

@@ -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",

View File

@@ -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": {

View File

@@ -5,7 +5,7 @@
class="ion-text-center"
style="padding-bottom: 36px; font-size: calc(2vw + 14px)"
>
embassyOS - Diagnostic Mode
StartOS - Diagnostic Mode
</h1>
<ng-container *ngIf="error">
@@ -16,7 +16,7 @@
font-weight: bold;
"
>
embassyOS launch error:
StartOS launch error:
</h2>
<div class="code-block">
<code>
@@ -28,7 +28,7 @@
</span>
</code>
</div>
<ion-button routerLink="logs"> View Logs </ion-button>
<ion-button routerLink="logs">View Logs</ion-button>
<h2
style="
padding: 32px 0 16px 0;
@@ -41,7 +41,7 @@
<div class="code-block">
<code><ion-text color="success">{{ error.solution }}</ion-text></code>
</div>
<ion-button (click)="restart()"> Restart Embassy </ion-button>
<ion-button (click)="restart()">Restart Server</ion-button>
<ion-button
class="ion-padding-start"
*ngIf="error.code === 15 || error.code === 25"
@@ -52,15 +52,15 @@
</ion-button>
<div class="ion-padding-top">
<ion-button (click)="presentAlertSystemRebuild()" color="warning"
>System Rebuild</ion-button
>
<ion-button (click)="presentAlertSystemRebuild()" color="warning">
System Rebuild
</ion-button>
</div>
<div class="ion-padding-top">
<ion-button (click)="presentAlertRepairDisk()" color="danger"
>Repair Drive</ion-button
>
<ion-button (click)="presentAlertRepairDisk()" color="danger">
Repair Drive
</ion-button>
</div>
</ng-container>
</ng-container>
@@ -70,12 +70,12 @@
class="ion-text-center"
style="padding-bottom: 36px; font-size: calc(2vw + 12px)"
>
Embassy is restarting
Server is restarting
</h1>
<h2 style="padding-bottom: 16px; font-size: calc(1vw + 12px)">
Wait for Embassy restart, then refresh this page or click REFRESH below.
Wait for the server to restart, then refresh this page.
</h2>
<ion-button (click)="refreshPage()"> Refresh </ion-button>
<ion-button (click)="refreshPage()">Refresh</ion-button>
</ng-template>
</div>
</ion-content>

View File

@@ -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:
'<p>This action will tear down all service containers and rebuild them from scratch. No data will be deleted.</p><p>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.</p><p>It may take up to an hour to complete. During this time, you will lose all connectivity to your Embassy.</p>',
'<p>This action will tear down all service containers and rebuild them from scratch. No data will be deleted.</p><p>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.</p><p>It may take up to an hour to complete. During this time, you will lose all connectivity to your Start9 server.</p>',
buttons: [
{
text: 'Cancel',

View File

@@ -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' },
}
}

View File

@@ -1,22 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>StartOS Diagnostic UI</title>
<head>
<meta charset="utf-8" />
<title>embassyOS Diagnostic UI</title>
<base href="/" />
<base href="/" />
<meta name="color-scheme" content="light dark" />
<meta
name="viewport"
content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
/>
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<meta name="color-scheme" content="light dark" />
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<link rel="icon" type="image/png" href="assets/icon/favicon.ico" />
</head>
<body>
<app-root></app-root>
</body>
<link rel="icon" type="image/png" href="assets/icon/favicon.ico" />
</head>
<body>
<app-root></app-root>
</body>
</html>

View File

@@ -70,11 +70,9 @@
></ion-icon>
<ion-label>
<h1>
<ion-text color="success"
>Re-Install embassyOS</ion-text
>
<ion-text color="success">Re-Install StartOS</ion-text>
</h1>
<h2>Will preserve existing embassyOS data</h2>
<h2>Will preserve existing StartOS data</h2>
</ion-label>
</ion-item>
@@ -92,7 +90,7 @@
[color]="(selectedDisk | guid) ? 'danger' : 'success'"
>
{{ (selectedDisk | guid) ? 'Factory Reset' : 'Install
embassyOS' }}
StartOS' }}
</ion-text>
</h1>
<h2>Will delete existing data on disk</h2>

View File

@@ -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()

View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>embassyOS Install Wizard</title>
<title>StartOS Install Wizard</title>
<base href="/" />

View File

@@ -26,7 +26,7 @@ const routes: Routes = [
),
},
{
path: 'embassy',
path: 'storage',
loadChildren: () =>
import('./pages/embassy/embassy.module').then(m => m.EmbassyPageModule),
},

View File

@@ -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<void> {
private async presentModalPassword(diskInfo: StartOSDiskInfo): Promise<void> {
const target: CifsBackupTarget = {
...this.cifs,
mountable: true,
'embassy-os': embassyOS,
'embassy-os': diskInfo,
}
const modal = await this.modalController.create({

View File

@@ -1,8 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>
{{ storageDrive ? 'Set Password' : 'Unlock Drive' }}
</ion-title>
<ion-title>{{ storageDrive ? 'Set Password' : 'Unlock Drive' }}</ion-title>
</ion-toolbar>
</ion-header>
@@ -13,7 +11,7 @@
</p>
<ng-template #choose>
<p>
Choose a password for your Embassy.
Choose a password for your server.
<i>Make it good. Write it down.</i>
</p>
</ng-template>

View File

@@ -6,10 +6,9 @@
<ion-card-header class="ion-text-center">
<ion-card-title>Use existing drive</ion-card-title>
<div class="center-wrapper">
<ion-card-subtitle
>Select the physical drive containing your Embassy
data</ion-card-subtitle
>
<ion-card-subtitle>
Select the physical drive containing your StartOS data
</ion-card-subtitle>
</div>
</ion-card-header>
@@ -24,8 +23,8 @@
<ion-item-group *ngIf="!loading" class="ion-text-center">
<!-- drives -->
<p *ngIf="!drives.length">
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.
</p>

View File

@@ -11,7 +11,7 @@
<ion-card-title>Select storage drive</ion-card-title>
<div class="center-wrapper">
<ion-card-subtitle>
This is the drive where your Embassy data will be stored.
This is the drive where your StartOS data will be stored.
</ion-card-subtitle>
</div>
</ion-card-header>
@@ -23,8 +23,8 @@
<ion-card-title>No drives found</ion-card-title>
<div class="center-wrapper">
<ion-card-subtitle>
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".
</ion-card-subtitle>
</div>
</ion-card-header>

View File

@@ -21,8 +21,8 @@
<ion-icon slot="icon-only" name="arrow-back"></ion-icon>
</ion-button>
<ion-card-title>
{{ swiper?.activeIndex === 0 ? 'embassyOS Setup' : 'Recover
Options' }}
{{ swiper?.activeIndex === 0 ? 'StartOS Setup' : 'Recover Options'
}}
</ion-card-title>
</ion-card-header>
<ion-card-content class="ion-margin-bottom">
@@ -39,12 +39,12 @@
[disabled]="error"
detail="false"
lines="none"
routerLink="/embassy"
routerLink="/storage"
>
<ion-icon slot="start" name="add"></ion-icon>
<ion-label>
<h2><ion-text color="success">Start Fresh</ion-text></h2>
<p>Get started with a brand new Embassy</p>
<p>Get started with a brand new Start9 server</p>
</ion-label>
</ion-item>
@@ -59,7 +59,7 @@
<ion-icon slot="start" name="reload"></ion-icon>
<ion-label>
<h2><ion-text color="danger">Recover</ion-text></h2>
<p>Recover, restore, or transfer Embassy data</p>
<p>Recover, restore, or transfer StartOS data</p>
</ion-label>
</ion-item>
</ng-template>
@@ -78,7 +78,11 @@
<h2>
<ion-text color="success">Use Existing Drive</ion-text>
</h2>
<p>Attach an existing embassyOS data drive (<b>not</b> a backup)</p>
<p>
Attach an existing StartOS data drive (
<b>not</b>
a backup)
</p>
</ion-label>
</ion-item>
@@ -95,7 +99,7 @@
<ion-text color="primary">Transfer</ion-text>
</h2>
<p>
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
<br />
</p>
@@ -116,7 +120,7 @@
Restore From Backup (Disaster Recovery)
</ion-text>
</h2>
<p>Restore embassyOS data from an encrypted backup</p>
<p>Restore StartOS data from an encrypted backup</p>
</ion-label>
</ion-item>
</ng-template>

View File

@@ -7,7 +7,7 @@
color="dark"
>
<ion-card-header>
<ion-card-title>Initializing Embassy</ion-card-title>
<ion-card-title>Initializing StartOS</ion-card-title>
<div class="center-wrapper">
<ion-card-subtitle *ngIf="progress.decimal as decimal">
Progress: {{ (decimal * 100).toFixed(0)}}%

View File

@@ -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) {

View File

@@ -2,13 +2,13 @@
<!-- has backup -->
<h2 *ngIf="hasValidBackup; else noBackup">
<ion-icon name="cloud-done" color="success"></ion-icon>
Embassy backup detected
StartOS backup detected
</h2>
<!-- no backup -->
<ng-template #noBackup>
<h2>
<ion-icon name="cloud-offline" color="danger"></ion-icon>
No Embassy backup
No StartOS backup
</h2>
</ng-template>
</div>

View File

@@ -19,8 +19,8 @@
<!-- cifs -->
<h2 class="target-label">Network Folder</h2>
<p class="ion-padding-bottom ion-text-left">
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.
</p>
<!-- connect -->
@@ -42,8 +42,8 @@
<h2 class="target-label">Physical Drive</h2>
<div class="ion-text-left ion-padding-bottom">
<p>
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.
</p>
<br />
<b>

View File

@@ -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`)
}
}

View File

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Embassy Address Info</title>
<title>StartOS Address Info</title>
</head>
<body>
<div
@@ -21,7 +21,7 @@
padding: 1rem;
"
>
Embassy Address Info
StartOS Address Info
</h1>
<section
@@ -36,7 +36,7 @@
</h2>
<p>
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:
</p>
<p
style="
@@ -60,15 +60,15 @@
>
follow the instructions
</a>
to establish a secure connection by installing your Embassy's
certificate.
to establish a secure connection by installing your server's root
certificate authority.
</p>
</div>
<div style="padding: 2rem; text-align: center">
<a
id="cert"
download="embassy.crt"
[download]="crtName"
style="
display: inline-block;
padding: 1em 1.2em;

View File

@@ -1,7 +1,14 @@
import { Component } from '@angular/core'
import { Component, Input } from '@angular/core'
@Component({
selector: 'download-doc',
templateUrl: 'download-doc.component.html',
})
export class DownloadDocComponent {}
export class DownloadDocComponent {
@Input() lanAddress!: string
get crtName(): string {
const hostname = new URL(this.lanAddress).hostname
return `${hostname}.crt`
}
}

View File

@@ -46,17 +46,17 @@
You can now safely unplug your backup drive
</h3>
<h3 *ngIf="setupType === 'transfer'">
You can now safely unplug your old Embassy drive
You can now safely unplug your old StartOS data drive
</h3>
</div>
<div class="card-container">
<ion-card id="information" (click)="download()">
<ion-card-content>
<ion-card-title
>Download permanent address info</ion-card-title
>
<ion-card-title>
Download permanent address info
</ion-card-title>
<p>
embassy.local was for setup purposes only. It will no
start.local was for setup purposes only. It will no
longer work.
</p>
</ion-card-content>
@@ -77,7 +77,7 @@
>
<div class="container">
<div class="inline">
<p>Go to Embassy login</p>
<p>Login to StartOS</p>
<ion-icon name="open-outline"></ion-icon>
</div>
</div>
@@ -86,7 +86,11 @@
</ion-col>
</ion-row>
<!-- download elem -->
<download-doc hidden id="downloadable"></download-doc>
<download-doc
hidden
id="downloadable"
[lanAddress]="lanAddress"
></download-doc>
</ion-card>
</ng-template>
</ion-col>

View File

@@ -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
})
}

View File

@@ -7,7 +7,7 @@
<ion-card-title>Transfer</ion-card-title>
<div class="center-wrapper">
<ion-card-subtitle>
Select the physical drive containing your Embassy data
Select the physical drive containing your StartOS data
</ion-card-subtitle>
</div>
</ion-card-header>

View File

@@ -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<StatusRes> // setup.status
abstract getPubKey(): Promise<void> // setup.get-pubkey
abstract getDrives(): Promise<DiskListResponse> // setup.disk.list
abstract verifyCifs(cifs: CifsRecoverySource): Promise<EmbassyOSDiskInfo> // setup.cifs.verify
abstract verifyCifs(cifs: CifsRecoverySource): Promise<StartOSDiskInfo> // setup.cifs.verify
abstract attach(importInfo: AttachReq): Promise<void> // setup.attach
abstract execute(setupInfo: ExecuteReq): Promise<void> // setup.execute
abstract complete(): Promise<CompleteRes> // 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 = {

View File

@@ -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<EmbassyOSDiskInfo>({
return this.rpcRequest<StartOSDiskInfo>({
method: 'setup.cifs.verify',
params: source,
})

View File

@@ -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),
}
}

View File

@@ -1,23 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>StartOS Setup</title>
<head>
<meta charset="utf-8" />
<title>Embassy Setup</title>
<base href="/" />
<base href="/" />
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<script>
var global = window;
</script>
<link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico"/>
</head>
<body>
<app-root></app-root>
</body>
<meta
name="viewport"
content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
/>
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<script>
var global = window
</script>
<link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico" />
</head>
<body>
<app-root></app-root>
</body>
</html>

View File

@@ -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

View File

@@ -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) {

View File

@@ -1,16 +1,20 @@
<div class="inline">
<h2 *ngIf="type === 'create'; else restore">
<ion-icon name="cloud-outline" color="success"></ion-icon>
{{ hasValidBackup ? 'Available, contains existing backup' : 'Available for fresh backup' }}
{{
hasValidBackup
? 'Available, contains existing backup'
: 'Available for fresh backup'
}}
</h2>
<ng-template #restore>
<h2 *ngIf="hasValidBackup">
<ion-icon name="cloud-done-outline" color="success"></ion-icon>
Embassy backup detected
StartOS backup detected
</h2>
<h2 *ngIf="!hasValidBackup">
<ion-icon name="cloud-offline-outline" color="danger"></ion-icon>
No Embassy backup
No StartOS backup
</h2>
</ng-template>
</div>

View File

@@ -27,11 +27,11 @@
<h2>
{{
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
<a
href="https://docs.start9.com/latest/user-manual/backups/backup-create"
target="_blank"
@@ -103,11 +103,11 @@
<h2>
{{
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
<a
href="https://docs.start9.com/latest/user-manual/backups/backup-setup/backup-physical"
target="_blank"
@@ -118,12 +118,12 @@
<ion-icon name="open-outline" size="small"></ion-icon>
</a>
.
<ion-text color="warning"
>Warning. Do not use this option if you are using a Raspberry Pi
<ion-text color="warning">
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.</ion-text
>
data corruption.
</ion-text>
</h2>
</ion-label>
</ion-item>
@@ -136,9 +136,10 @@
<br />
<p>
No drives detected.
<a style="cursor: pointer" (click)="refresh()"
>Refresh<ion-icon name="refresh"></ion-icon
></a>
<a style="cursor: pointer" (click)="refresh()">
Refresh
<ion-icon name="refresh"></ion-icon>
</a>
</p>
</div>
<!-- drives detected -->

View File

@@ -1,6 +1,6 @@
<toast
*ngIf="visible$ | async as message"
header="Embassy"
header="StartOS"
[duration]="4000"
(dismiss)="onDismiss()"
>

View File

@@ -1,10 +1,10 @@
<toast
*ngIf="visible$ | async as message"
class="success-toast"
header="embassyOS download complete!"
header="StartOS download complete!"
(dismiss)="onDismiss()"
>
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.
<button toastButton icon="close" side="start" (click)="onDismiss()"></button>
<button toastButton side="end" (click)="restart()">Restart</button>

View File

@@ -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',
},
{

View File

@@ -29,7 +29,7 @@
</p>
<p *ngIf="option['newer-eos']">
<ion-text color="danger">
Unavailable. Backup was made on a newer version of embassyOS.
Unavailable. Backup was made on a newer version of StartOS.
</ion-text>
</p>
</ion-label>

View File

@@ -1,9 +1,9 @@
<ion-header>
<ion-toolbar>
<div style="padding: 10px 0">
<ion-title style="font-size: 32px"
>embassyOS {{ versions[0].version }}</ion-title
>
<ion-title style="font-size: 32px">
StartOS {{ versions[0].version }}
</ion-title>
<div class="underline"></div>
<ion-title>
<i>Release Notes</i>

View File

@@ -12,11 +12,35 @@
<ion-content class="ion-padding">
<h2>This Release</h2>
<h4>0.3.4.2</h4>
<p class="note-padding">
View the complete
<a
href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.4.2"
target="_blank"
noreferrer
>
release notes
</a>
for more details.
</p>
<h6>Highlights</h6>
<ul class="spaced-list">
<li>Update build system for Server Lite and NUC-based Server One</li>
<li>Rename embassyOS to StartOS</li>
<li>
PWA support for StartOS web interface. You can now save StartOS to your
phone as an app!
</li>
</ul>
<h2>Previous Releases</h2>
<h4>0.3.4.1</h4>
<p class="note-padding">
View the complete
<a
href="https://github.com/Start9Labs/embassy-os/releases/tag/v0.3.4.1"
href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.4.1"
target="_blank"
noreferrer
>
@@ -29,13 +53,11 @@
<li>0.3.4 bug fixes</li>
</ul>
<h2>Previous Releases</h2>
<h4>0.3.4</h4>
<p class="note-padding">
View the complete
<a
href="https://github.com/Start9Labs/embassy-os/releases/tag/v0.3.4"
href="https://github.com/Start9Labs/start-os/releases/tag/v0.3.4"
target="_blank"
noreferrer
>

View File

@@ -14,17 +14,16 @@
<app-actions-item
[action]="{
name: 'Uninstall',
description: 'This will uninstall the service from your Embassy and delete all data permanently.',
description: 'This will uninstall the service from StartOS and delete all data permanently.',
icon: 'trash-outline'
}"
(click)="tryUninstall(pkg)"
>
</app-actions-item>
></app-actions-item>
<!-- ** specific actions ** -->
<ion-item-divider *ngIf="!(pkg.manifest.actions | empty)"
>Actions for {{ pkg.manifest.title }}</ion-item-divider
>
<ion-item-divider *ngIf="!(pkg.manifest.actions | empty)">
Actions for {{ pkg.manifest.title }}
</ion-item-divider>
<app-actions-item
*ngFor="let action of pkg.manifest.actions | keyvalue: asIsOrder"
[action]="{
@@ -33,7 +32,6 @@
icon: 'play-circle-outline'
}"
(click)="handleAction(pkg, action)"
>
</app-actions-item>
></app-actions-item>
</ion-item-group>
</ion-content>

View File

@@ -12,7 +12,7 @@
<ng-container *ngIf="pkgs$ | async as pkgs; else loading">
<ng-container *ngIf="!pkgs.length; else list">
<div class="welcome-header">
<h1>Welcome to embassyOS</h1>
<h1>Welcome to StartOS</h1>
</div>
<widget-list></widget-list>
</ng-container>
@@ -38,6 +38,6 @@
<!-- loading -->
<ng-template #loading>
<text-spinner text="Connecting to Embassy"></text-spinner>
<text-spinner text="Connecting to server"></text-spinner>
</ng-template>
</ion-content>

View File

@@ -63,8 +63,10 @@
<a
[routerLink]="['/system', 'lan']"
style="color: var(--ion-color-dark)"
>download and trust your Embassy's certificate</a
>.
>
download and trust your server's certificate
</a>
.
</p>
<ion-button (click)="launchHttps()">
Open https

View File

@@ -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,

View File

@@ -6,7 +6,7 @@
<ion-card class="card">
<ion-card-header>
<ion-card-title class="title">Embassy Login</ion-card-title>
<ion-card-title class="title">StartOS Login</ion-card-title>
</ion-card-header>
<ion-card-content class="ion-margin">

View File

@@ -60,8 +60,8 @@
name="mail-outline"
></ion-icon>
<h4 style="color: #767676; margin-top: 0px; font-weight: 600">
Important system alerts and notifications from your Embassy will
display here
Important system alerts and notifications from StartOS will display
here
</h4>
</div>
</ion-item-group>

View File

@@ -18,14 +18,15 @@
href="https://docs.start9.com/latest/user-manual/connecting/connecting-lan"
target="_blank"
rel="noreferrer"
>follow instructions</a
>
to download and trust your Embassy's Root Certificate Authority
follow instructions
</a>
to download and trust your server's Root Certificate Authority
</h2>
</ion-label>
</ion-item>
<ion-item button (click)="installCert()">
<ion-item button (click)="installCert()" [disabled]="!(crtName$ | async)">
<ion-icon slot="start" name="download-outline" size="large"></ion-icon>
<ion-label>
<h1>Download Certificate</h1>
@@ -37,6 +38,6 @@
<a
id="install-cert"
href="/public/eos/local.crt"
download="Embassy Local CA.crt"
[download]="crtName$ | async"
></a>
</ion-content>

View File

@@ -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<DataModel>) {}
installCert(): void {
document.getElementById('install-cert')?.click()
}

View File

@@ -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')
}
})
}

View File

@@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title> System </ion-title>
<ion-title>System</ion-title>
<ion-buttons slot="end">
<badge-menu-button></badge-menu-button>
</ion-buttons>
@@ -10,7 +10,7 @@
<ion-content class="ion-padding with-widgets">
<!-- loading -->
<ng-template #loading>
<text-spinner text="Connecting to Embassy"></text-spinner>
<text-spinner text="Connecting to server"></text-spinner>
</ng-template>
<!-- loaded -->
@@ -22,7 +22,7 @@
<p style="font-weight: 600">
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
</p>
</ion-label>

View File

@@ -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.<br /><br />If you have a speaker, your Embassy will <b>♫ play a melody ♫</b> before shutting down. Your Embassy will then become unreachable${message}`,
message: `Stopping all services gracefully. This can take a while.<br /><br />If you have a speaker, your server will <b>♫ play a melody ♫</b> 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(

View File

@@ -9,7 +9,7 @@
<ion-content class="with-widgets">
<ion-item-group *ngIf="server$ | async as server">
<ion-item-divider>embassyOS Info</ion-item-divider>
<ion-item-divider>StartOS Info</ion-item-divider>
<ion-item>
<ion-label>
<h2>Version</h2>

View File

@@ -13,11 +13,11 @@
<ion-item>
<ion-label>
<h2>
Adding SSH keys to your Embassy is useful for command line access, as
well as for debugging purposes.
<a [href]="docsUrl" target="_blank" rel="noreferrer"
>View instructions</a
>
Adding SSH keys to StartOS is useful for command line access, as well
as for debugging purposes.
<a [href]="docsUrl" target="_blank" rel="noreferrer">
View instructions
</a>
</h2>
</ion-label>
</ion-item>

View File

@@ -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,

View File

@@ -19,15 +19,16 @@
<ion-item>
<ion-label>
<h2>
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.
<a
href="https://docs.start9.com/latest/user-manual/wifi"
target="_blank"
rel="noreferrer"
>View instructions</a
>
View instructions
</a>
</h2>
</ion-label>
</ion-item>
@@ -42,9 +43,9 @@
[disabled]="loading"
>
<ion-icon slot="start" name="earth-outline" size="large"></ion-icon>
<ion-label *ngIf="wifi.country"
>{{ wifi.country }} - {{ this.countries[wifi.country] }}</ion-label
>
<ion-label *ngIf="wifi.country">
{{ wifi.country }} - {{ this.countries[wifi.country] }}
</ion-label>
<ion-label *ngIf="!wifi.country">Select Country</ion-label>
</ion-item>
@@ -79,9 +80,9 @@
<!-- not loading -->
<ng-container *ngIf="!loading && wifi.country">
<ion-item-divider *ngIf="!(wifi.ssids | empty)"
>Saved Networks</ion-item-divider
>
<ion-item-divider *ngIf="!(wifi.ssids | empty)">
Saved Networks
</ion-item-divider>
<ion-item
button
detail="false"

View File

@@ -61,7 +61,7 @@ export class WifiPage {
const alert = await this.alertCtrl.create({
header: 'Cannot Complete Action',
message:
'You must be connected to your Embassy via LAN to change the country.',
'You must be connected to your server via LAN to change the country.',
buttons: [
{
text: 'OK',
@@ -89,7 +89,7 @@ export class WifiPage {
const alert = await this.alertCtrl.create({
header: 'Select Country',
subHeader:
'Warning: Changing the country will delete all saved networks from the Embassy.',
'Warning: Changing the country will delete all saved networks from StartOS.',
inputs,
buttons: [
{
@@ -225,7 +225,7 @@ export class WifiPage {
const alert = await this.alertCtrl.create({
header: `Connected to "${ssid}"`,
message:
'Note. It may take several minutes to an hour for your Embassy to reconnect over Tor.',
'Note. It may take several minutes to an hour for StartOS to reconnect over Tor.',
buttons: [
{
text: 'Ok',

View File

@@ -480,7 +480,7 @@ export module Mock {
description: 'LND needs bitcoin to live.',
requirement: {
type: 'opt-out',
how: 'You can use an external node from your Embassy if you prefer.',
how: 'You can use an external node from your server if you prefer.',
},
config: null,
},
@@ -776,7 +776,7 @@ export module Mock {
code: 1,
level: NotificationLevel.Success,
title: 'Backup Complete',
message: 'Embassy and services have been successfully backed up.',
message: 'StartOS and services have been successfully backed up.',
data: {
server: {
attempted: false,
@@ -942,7 +942,7 @@ export module Mock {
{
timestamp: '2019-12-26T14:21:30.872Z',
message:
'\u001b[34mPOST \u001b[0;32;49m200\u001b[0m photoview.embassy/api/graphql \u001b[0;36;49m1.169406ms\u001b',
'\u001b[34mPOST \u001b[0;32;49m200\u001b[0m photoview.startos/api/graphql \u001b[0;36;49m1.169406ms\u001b',
},
{
timestamp: '2019-12-26T14:22:30.872Z',
@@ -1047,7 +1047,7 @@ export module Mock {
hsbdjhasbasda: {
type: 'cifs',
hostname: 'smb://192.169.10.0',
path: '/Desktop/embassy-backups',
path: '/Desktop/startos-backups',
username: 'TestUser',
mountable: false,
'embassy-os': {
@@ -1072,7 +1072,7 @@ export module Mock {
csgashbdjkasnd: {
type: 'cifs',
hostname: 'smb://192.169.10.0',
path: '/Desktop/embassy-backups-2',
path: '/Desktop/startos-backups-2',
username: 'TestUser',
mountable: true,
'embassy-os': null,

View File

@@ -7,7 +7,7 @@ import {
DependencyError,
Manifest,
} from 'src/app/services/patch-db/data-model'
import { EmbassyOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
import { StartOSDiskInfo, LogsRes, ServerLogsReq } from '@start9labs/shared'
export module RR {
// DB
@@ -347,7 +347,7 @@ export interface DiskBackupTarget {
label: string | null
capacity: number
used: number | null
'embassy-os': EmbassyOSDiskInfo | null
'embassy-os': StartOSDiskInfo | null
}
export interface CifsBackupTarget {
@@ -356,7 +356,7 @@ export interface CifsBackupTarget {
path: string
username: string
mountable: boolean
'embassy-os': EmbassyOSDiskInfo | null
'embassy-os': StartOSDiskInfo | null
}
export type RecoverySource = DiskRecoverySource | CifsRecoverySource

View File

@@ -12,7 +12,7 @@ import { BUILT_IN_WIDGETS } from '../../pages/widgets/built-in/widgets'
export const mockPatchData: DataModel = {
ui: {
name: `Matt's Embassy`,
name: `Matt's Server`,
'ack-welcome': '1.0.0',
theme: 'Dark',
widgets: BUILT_IN_WIDGETS.filter(
@@ -46,7 +46,7 @@ export const mockPatchData: DataModel = {
id: 'abcdefgh',
version: '0.3.4',
'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
'lan-address': 'https://embassy-abcdefgh.local',
'lan-address': 'https://adjective-noun.local',
'tor-address': 'http://myveryownspecialtoraddress.onion',
'ip-info': {
eth0: {
@@ -609,7 +609,7 @@ export const mockPatchData: DataModel = {
description: 'LND needs bitcoin to live.',
requirement: {
type: 'opt-out',
how: 'You can use an external node from your Embassy if you prefer.',
how: 'You can use an external node from your server if you prefer.',
},
config: null,
},

View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>embassyOS</title>
<title>StartOS</title>
<base href="/" />

View File

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Embassy | Initializing</title>
<title>StartOS | Initializing</title>
<style>
body {
background: #333333;
@@ -29,7 +29,7 @@
</style>
</head>
<body>
<h2 class="header-title"><span>embassyOS Initializing</span></h2>
<h2 class="header-title"><span>StartOS Initializing</span></h2>
<p style="padding: 20px;">This process can take up to several minutes to complete.</p>
</body>
</html>

View File

@@ -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<ResultType<SetResult>>;
/** 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<ResultType<ConfigRes>>;
/** 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<ResultType<Properties>>;
export type health = {
/** Should be the health check id */
[id: string]: (
effects: Effects,
dateMs: number,
dateMs: number
) => Promise<ResultType<null | void>>;
};
export type migration = (
effects: Effects,
version: string,
version: string
) => Promise<ResultType<MigrationRes>>;
}
/** 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<void>;
writeFile(input: {
path: string;
volumeId: string;
toWrite: string;
}): Promise<void>;
readFile(input: { volumeId: string; path: string }): Promise<string>;
metadata(input: { volumeId: string; path: string }): Promise<Metadata>;
/** Create a directory. Usable when not sandboxed */
@@ -42,9 +43,11 @@ export type Effects = {
removeFile(input: { volumeId: string; path: string }): Promise<void>;
/** Write a json file into an object. Usable when not sandboxed */
writeJsonFile(
input: { volumeId: string; path: string; toWrite: object },
): Promise<void>;
writeJsonFile(input: {
volumeId: string;
path: string;
toWrite: object;
}): Promise<void>;
/** Read a json file into an object */
readJsonFile(input: { volumeId: string; path: string }): Promise<object>;
@@ -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<T extends string, V> = V & {
export type UniqueBy =
| {
any: UniqueBy[];
}
any: UniqueBy[];
}
| string
| null;
@@ -145,25 +147,23 @@ export type WithNullable<T> = 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<WithDefault<ValueSpecBoolean, boolean>>>
| Tag<
"string",
WithDescription<WithDefault<WithNullable<ValueSpecString>, DefaultString>>
>
"string",
WithDescription<WithDefault<WithNullable<ValueSpecString>, DefaultString>>
>
| Tag<
"number",
WithDescription<WithDefault<WithNullable<ValueSpecNumber>, number>>
>
"number",
WithDescription<WithDefault<WithNullable<ValueSpecNumber>, 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<WithDefault<ValueSpecObject, Config>>>
| Tag<"union", WithDescription<WithDefault<ValueSpecUnion, string>>>
| 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<WithDefault<ListSpec<ValueSpecBoolean>, boolean[]>>
>
| Subtype<
"string",
WithDescription<WithDefault<ListSpec<ValueSpecString>, string[]>>
>
| Subtype<
"number",
WithDescription<WithDefault<ListSpec<ValueSpecNumber>, number[]>>
>
| Subtype<
"enum",
WithDescription<
WithDefault<
ListSpec<
ValueSpecEnum
>,
string[]
>
"boolean",
WithDescription<WithDefault<ListSpec<ValueSpecBoolean>, boolean[]>>
>
>
| Subtype<
"object",
WithDescription<WithDefault<ListSpec<ValueSpecObject>, {}[]>>
>
"string",
WithDescription<WithDefault<ListSpec<ValueSpecString>, string[]>>
>
| Subtype<
"union",
WithDescription<WithDefault<ListSpec<ValueSpecUnion>, string[]>>
>;
"number",
WithDescription<WithDefault<ListSpec<ValueSpecNumber>, number[]>>
>
| Subtype<
"enum",
WithDescription<WithDefault<ListSpec<ValueSpecEnum>, string[]>>
>
| Subtype<
"object",
WithDescription<WithDefault<ListSpec<ValueSpecObject>, {}[]>>
>
| Subtype<
"union",
WithDescription<WithDefault<ListSpec<ValueSpecUnion>, 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<T> = KnownError | { result: T };
export type PackagePropertiesV2 = {

View File

@@ -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",