bump version (#1871)

* Update index.html

Co-authored-by: Matt Hill <MattDHill@users.noreply.github.com>

backend/Cargo.lock

@@ -1120,7 +1120,7 @@ dependencies = [
 
 [[package]]
 name = "embassy-os"
-version = "0.3.2"
+version = "0.3.2-rev.1"
 dependencies = [
  "aes",
  "async-stream",

backend/Cargo.toml

@@ -14,7 +14,7 @@ keywords = [
 name = "embassy-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/embassy-os"
-version = "0.3.2"
+version = "0.3.2-rev.1"
 
 [lib]
 name = "embassy"

backend/src/version/mod.rs

@@ -16,8 +16,9 @@ mod v0_3_1;
 mod v0_3_1_1;
 mod v0_3_1_2;
 mod v0_3_2;
+mod v0_3_2_1;
 
-pub type Current = v0_3_2::Version;
+pub type Current = v0_3_2_1::Version;
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 #[serde(untagged)]
@@ -30,6 +31,7 @@ enum Version {
     V0_3_1_1(Wrapper<v0_3_1_1::Version>),
     V0_3_1_2(Wrapper<v0_3_1_2::Version>),
     V0_3_2(Wrapper<v0_3_2::Version>),
+    V0_3_2_1(Wrapper<v0_3_2_1::Version>),
     Other(emver::Version),
 }
 
@@ -53,6 +55,7 @@ impl Version {
             Version::V0_3_1_1(Wrapper(x)) => x.semver(),
             Version::V0_3_1_2(Wrapper(x)) => x.semver(),
             Version::V0_3_2(Wrapper(x)) => x.semver(),
+            Version::V0_3_2_1(Wrapper(x)) => x.semver(),
             Version::Other(x) => x.clone(),
         }
     }
@@ -187,6 +190,7 @@ pub async fn init<Db: DbHandle>(
         Version::V0_3_1_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
         Version::V0_3_1_2(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
         Version::V0_3_2(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
+        Version::V0_3_2_1(v) => v.0.migrate_to(&Current::new(), db, receipts).await?,
         Version::Other(_) => {
             return Err(Error::new(
                 eyre!("Cannot downgrade"),
@@ -227,6 +231,7 @@ mod tests {
             Just(Version::V0_3_1_1(Wrapper(v0_3_1_1::Version::new()))),
             Just(Version::V0_3_1_2(Wrapper(v0_3_1_2::Version::new()))),
             Just(Version::V0_3_2(Wrapper(v0_3_2::Version::new()))),
+            Just(Version::V0_3_2_1(Wrapper(v0_3_2_1::Version::new()))),
             em_version().prop_map(Version::Other),
         ]
     }

backend/src/version/v0_3_2.rs

@@ -1,8 +1,6 @@
 use emver::VersionRange;
 
-use crate::config::util::MergeWith;
 use crate::hostname::{generate_id, get_hostname, sync_hostname};
-use crate::ErrorKind;
 
 use super::v0_3_0::V0_3_0_COMPAT;
 use super::*;

backend/src/version/v0_3_2_1.rs

@@ -0,0 +1,26 @@
+use super::v0_3_0::V0_3_0_COMPAT;
+use super::*;
+
+const V0_3_2_1: emver::Version = emver::Version::new(0, 3, 2, 1);
+
+#[derive(Clone, Debug)]
+pub struct Version;
+#[async_trait]
+impl VersionT for Version {
+    type Previous = v0_3_2::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> emver::Version {
+        V0_3_2_1
+    }
+    fn compat(&self) -> &'static emver::VersionRange {
+        &*V0_3_0_COMPAT
+    }
+    async fn up<Db: DbHandle>(&self, db: &mut Db) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down<Db: DbHandle>(&self, _db: &mut Db) -> Result<(), Error> {
+        Ok(())
+    }
+}

build/initialization.sh

@@ -108,6 +108,7 @@ sed -i 's/ExecStart=\/usr\/bin\/dockerd/ExecStart=\/usr\/bin\/dockerd --exec-opt
 sed -i '/}/i \ \ \ \ application\/wasm \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ wasm;' /etc/nginx/mime.types
 sed -i 's/# server_names_hash_bucket_size 64;/server_names_hash_bucket_size 128;/g' /etc/nginx/nginx.conf
 sed -i 's/#allow-interfaces=eth0/allow-interfaces=eth0,wlan0/g' /etc/avahi/avahi-daemon.conf
+sed -i '/\(^\|#\)entries-per-entry-group-max=/c\entries-per-entry-group-max=128' /etc/avahi/avahi-daemon.conf
 echo '{ "cgroup-parent": "docker-engine.slice" }' > /etc/docker/daemon.json
 mkdir -p /etc/nginx/ssl
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "embassy-os",
-  "version": "0.3.2",
+  "version": "0.3.2.1",
   "author": "Start9 Labs, Inc",
   "homepage": "https://start9.com/",
   "scripts": {

frontend/patchdb-ui-seed.json

@@ -2,7 +2,7 @@
   "name": null,
   "auto-check-updates": true,
   "pkg-order": [],
-  "ack-welcome": "0.3.2",
+  "ack-welcome": "0.3.2.1",
   "marketplace": {
     "selected-id": null,
     "known-hosts": {}

frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html

@@ -11,6 +11,24 @@
 
 <ion-content class="ion-padding">
   <h2>This release</h2>
+  <h4>0.3.2~1</h4>
+  <p class="note-padding">
+    View the complete
+    <a
+      href="https://github.com/Start9Labs/embassy-os/releases/tag/v0.3.2.1"
+      target="_blank"
+      noreferrer
+      >release notes</a
+    >
+    for more details.
+  </p>
+  <h6>Highlights</h6>
+  <ul class="spaced-list">
+    <li>Bugfix for LAN URLs</li>
+  </ul>
+
+  <br />
+  <h2>Previous releases in this series</h2>
   <h4>0.3.2</h4>
   <p class="note-padding">
     View the complete

frontend/projects/ui/src/app/services/api/api.fixures.ts

@@ -20,9 +20,10 @@ export module Mock {
     updated: true,
   }
   export const MarketplaceEos: RR.GetMarketplaceEOSRes = {
-    version: '0.3.2',
+    version: '0.3.2.1',
     headline: 'Our biggest release ever.',
     'release-notes': {
+      '0.3.2.1': 'Some **Markdown** release _notes_ for 0.3.2.1',
       '0.3.2': 'Some **Markdown** release _notes_ for 0.3.2',
       '0.3.1': 'Some **Markdown** release _notes_ for 0.3.1',
       '0.3.0': 'Some **Markdown** release _notes_ from a prior version',

frontend/projects/ui/src/app/services/api/mock-patch.ts

@@ -33,7 +33,7 @@ export const mockPatchData: DataModel = {
   },
   'server-info': {
     id: 'abcdefgh',
-    version: '0.3.2',
+    version: '0.3.2.1',
     'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(),
     'lan-address': 'https://embassy-abcdefgh.local',
     'tor-address': 'http://myveryownspecialtoraddress.onion',

index.html

@@ -1,15 +1,36 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title></title>
+    <title>Embassy | Initializing</title>
     <style>
-    body {
+      body {
-      background: #181818;
+        background: #333333;
+        font-family:'Montserrat';
+        color:#F4F4F5;
+        text-align: center;
+        font-size: 20PX;
+      }
+      .header-title {
+        padding-top: 6rem;
+      }
+      .header-title span {
+        position: relative;
+      }
+      .header-title span:before {
+        content: "";
+        position: absolute;
+        top: 100%;
+        width: 100%;
+        left: 0;
+        height: 3px;
+        border-radius: 2px;
+        background: linear-gradient(130deg,#EE6570,#FF4961,#993E4A);
     }
     </style>
   </head>
   <body>
-    <h2 style="color: #e0e0e0; text-align: center; padding-top: 20px;">embassyOS is initializing...</h2>
+    <h2 class="header-title"><span>embassyOS Initializing</span></h2>
-    <p style="color: #e0e0e0; text-align: center;">This process can take up to several minutes to complete. Please wait to refresh the page.</p>
+    <p style="padding: 20px;">This process can take up to several minutes to complete.</p>
+    <p>Please wait to refresh the page until you hear a chime from your device.</p>
   </body>
 </html>

system-images/compat/Cargo.lock

@@ -978,7 +978,7 @@ dependencies = [
 
 [[package]]
 name = "embassy-os"
-version = "0.3.2"
+version = "0.3.2-rev.1"
 dependencies = [
  "aes",
  "async-stream",