Integration/0.2.13 (#324)

* updates to 8.10.4, adjusts dependencies, adds license info feature * add toJSON * add licesne info to services * remove mocks * adds license info to available show * prepare upgrade messaging * better welcome message * update backend versioning to 0.2.13 * add version migration file * update ui build scripts * update eos image * update eos image with embassy * add migration files * update welcome page * explicity add migration files Co-authored-by: Keagan McClelland <keagan.mcclelland@gmail.com> Co-authored-by: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
2026-03-26 02:11:53 +00:00 · 2021-05-19 11:46:37 -06:00
parent 7509c3a91e
commit 8f9111ce3d
34 changed files with 1867 additions and 1433 deletions
--- a/agent/config/settings.yml
+++ b/agent/config/settings.yml
@@ -33,5 +33,5 @@ database:
  database: "start9_agent.sqlite3"
  poolsize: "_env:YESOD_SQLITE_POOLSIZE:10"

-app-mgr-version-spec: "=0.2.12"
+app-mgr-version-spec: "=0.2.13"
 #analytics: UA-YOURCODE
--- a/agent/migrations/0.2.12::0.2.13
+++ b/agent/migrations/0.2.12::0.2.13
@@ -0,0 +1 @@
+SELECT TRUE;
--- a/agent/package.yaml
+++ b/agent/package.yaml
@@ -1,5 +1,5 @@
 name: ambassador-agent
-version: 0.2.12
+version: 0.2.13

 default-extensions:
  - NoImplicitPrelude
@@ -182,3 +182,4 @@ executables:
        condition: flag(library-only)
      - condition: false
        other-modules: Paths_ambassador_agent
+extra-source-files: ./migrations/*
--- a/agent/src/Handler/Apps.hs
+++ b/agent/src/Handler/Apps.hs
@@ -154,8 +154,7 @@ getAvailableAppsLogic :: ( Has (Reader AgentCtx) sig m
 getAvailableAppsLogic = do
    jobCache <- asks appBackgroundJobs >>= liftIO . readTVarIO
    let installCache = inspect SInstalling jobCache
-    (Reg.AppManifestRes apps, serverApps) <- LAsync.concurrently Reg.getAppManifest
-                                                                 (AppMgr2.list [AppMgr2.flags|-s -d|])
+    (Reg.AppIndexRes apps, serverApps) <- LAsync.concurrently Reg.getAppIndex (AppMgr2.list [AppMgr2.flags|-s -d|])
    let remapped = remapAppMgrInfo jobCache serverApps
    pure $ foreach apps $ \app@StoreApp { storeAppId } ->
        let installing =
@@ -183,8 +182,9 @@ getAvailableAppByIdLogic appId = do
    let storeAppId' = storeAppId
    jobCache <- asks appBackgroundJobs >>= liftIO . readTVarIO
    let installCache = inspect SInstalling jobCache
-    (Reg.AppManifestRes storeApps, serverApps) <- LAsync.concurrently Reg.getAppManifest
-                                                                      (AppMgr2.list [AppMgr2.flags|-s -d|])
+    ((Reg.AppIndexRes storeApps, serverApps), AppManifest.AppManifest { appManifestLicenseName, appManifestLicenseLink }) <-
+        LAsync.concurrently (LAsync.concurrently Reg.getAppIndex (AppMgr2.list [AppMgr2.flags|-s -d|]))
+                            (Reg.getAppManifest appId)
    StoreApp {..} <- pure (find ((== appId) . storeAppId) storeApps) `orThrowM` NotFoundE "appId" (show appId)
    let remapped = remapAppMgrInfo jobCache serverApps
    let installingInfo =
@@ -213,6 +213,8 @@ getAvailableAppByIdLogic appId = do
                                                       appId
                                                       storeAppTitle
                                                       (storeIconUrl appId (storeAppVersionInfoVersion $ extract storeAppVersions))
+        , appAvailableFullLicenseName            = appManifestLicenseName
+        , appAvailableFullLicenseLink            = appManifestLicenseLink
        , appAvailableFullInstallInfo            = installingInfo
        , appAvailableFullVersionLatest          = storeAppVersionInfoVersion latest
        , appAvailableFullDescriptionShort       = storeAppDescriptionShort
@@ -303,6 +305,8 @@ getInstalledAppByIdLogic appId = do
            backupTime <- lift $ LAsync.wait backupTime'
            hoistMaybe $ HM.lookup appId installCache <&> \(StoreApp {..}, StoreAppVersionInfo {..}) -> AppInstalledFull
                { appInstalledFullBase = AppBase appId storeAppTitle (iconUrl appId storeAppVersionInfoVersion)
+                , appInstalledFullLicenseName            = Nothing
+                , appInstalledFullLicenseLink            = Nothing
                , appInstalledFullStatus                 = AppStatusTmp Installing
                , appInstalledFullVersionInstalled       = storeAppVersionInfoVersion
                , appInstalledFullInstructions           = Nothing
@@ -319,7 +323,7 @@ getInstalledAppByIdLogic appId = do
                }
    serverApps <- AppMgr2.list [AppMgr2.flags|-s -d|]
    let remapped = remapAppMgrInfo jobCache serverApps
-    appManifestFetchCached <- cached Reg.getAppManifest
+    appManifestFetchCached <- cached Reg.getAppIndex
    let
        installed = do
            (status, version, AppMgr2.InfoRes {..}) <- hoistMaybe (HM.lookup appId remapped)
@@ -333,7 +337,7 @@ getInstalledAppByIdLogic appId = do
                        fromInstalled = (AppMgr2.infoResTitle &&& AppMgr2.infoResVersion)
                            <$> hoistMaybe (HM.lookup depId serverApps)
                    let fromStore = do
-                            Reg.AppManifestRes res <- lift appManifestFetchCached
+                            Reg.AppIndexRes res <- lift appManifestFetchCached
                            (storeAppTitle &&& storeAppVersionInfoVersion . extract . storeAppVersions)
                                <$> hoistMaybe (find ((== depId) . storeAppId) res)
                    (title, v) <- fromInstalled <|> fromStore
@@ -354,6 +358,8 @@ getInstalledAppByIdLogic appId = do
                    guard (not . null $ lanConfs)
                    pure $ LanAddress . (".onion" `Text.replace` ".local") . unTorAddress $ addrBase
            pure AppInstalledFull { appInstalledFullBase = AppBase appId infoResTitle (iconUrl appId version)
+                                  , appInstalledFullLicenseName            = AppManifest.appManifestLicenseName manifest
+                                  , appInstalledFullLicenseLink            = AppManifest.appManifestLicenseLink manifest
                                  , appInstalledFullStatus                 = status
                                  , appInstalledFullVersionInstalled       = version
                                  , appInstalledFullInstructions           = instructions
@@ -675,7 +681,7 @@ getAvailableAppVersionInfoLogic :: ( Has (Reader AgentCtx) sig m
                                -> m AppVersionInfo
 getAvailableAppVersionInfoLogic appId appVersionSpec = do
    jobCache                  <- asks appBackgroundJobs >>= liftIO . readTVarIO
-    Reg.AppManifestRes storeApps <- Reg.getAppManifest
+    Reg.AppIndexRes storeApps <- Reg.getAppIndex
    let titles =
            (storeAppTitle &&& storeAppVersionInfoVersion . extract . storeAppVersions) <$> indexBy storeAppId storeApps
    StoreApp {..} <- find ((== appId) . storeAppId) storeApps `orThrowPure` NotFoundE "appId" (show appId)
--- a/agent/src/Handler/Icons.hs
+++ b/agent/src/Handler/Icons.hs
@@ -14,6 +14,13 @@ import           Network.HTTP.Simple
 import           System.FilePath.Posix
 import           Yesod.Core

+import           Control.Carrier.Reader  hiding ( asks )
+import           Control.Concurrent.STM         ( modifyTVar
+                                                , readTVarIO
+                                                )
+import           Control.Effect.Labelled        ( runLabelled )
+import           Crypto.Hash.Conduit            ( hashFile )
+import qualified Data.HashMap.Strict           as HM
 import           Foundation
 import           Lib.Algebra.State.RegistryUrl
 import           Lib.Error
@@ -21,16 +28,9 @@ import qualified Lib.External.Registry         as Reg
 import           Lib.IconCache
 import           Lib.SystemPaths         hiding ( (</>) )
 import           Lib.Types.Core
+import           Lib.Types.Emver
 import           Lib.Types.ServerApp
 import           Settings
-import           Control.Carrier.Reader  hiding ( asks )
-import           Control.Effect.Labelled        ( runLabelled )
-import qualified Data.HashMap.Strict           as HM
-import           Control.Concurrent.STM         ( modifyTVar
-                                                , readTVarIO
-                                                )
-import           Crypto.Hash.Conduit            ( hashFile )
-import           Lib.Types.Emver

 iconUrl :: AppId -> Version -> Text
 iconUrl appId version = (foldMap (T.cons '/') . fst . renderRoute . AppIconR $ appId) <> "?" <> show version
@@ -63,7 +63,7 @@ getAppIconR appId = handleS9ErrT $ do
    lift $ respondSource (parseContentType path) $ CB.sourceFile path .| awaitForever sendChunkBS
    where
        fetchIcon = do
-            url <- find ((== appId) . storeAppId) . Reg.storeApps <$> Reg.getAppManifest >>= \case
+            url <- find ((== appId) . storeAppId) . Reg.storeApps <$> Reg.getAppIndex >>= \case
                Nothing -> throwError $ NotFoundE "icon" (show appId)
                Just x  -> pure . toS $ storeAppIconUrl x
            bp <- getAbsoluteLocationFor iconBasePath
@@ -84,7 +84,7 @@ getAvailableAppIconR :: AppId -> Handler TypedContent
 getAvailableAppIconR appId = handleS9ErrT $ do
    s   <- getsYesod appSettings
    url <- do
-        find ((== appId) . storeAppId) . Reg.storeApps <$> interp s Reg.getAppManifest >>= \case
+        find ((== appId) . storeAppId) . Reg.storeApps <$> interp s Reg.getAppIndex >>= \case
            Nothing -> throwE $ NotFoundE "icon" (show appId)
            Just x  -> pure . toS $ storeAppIconUrl x
    req <- case parseRequest url of
--- a/agent/src/Handler/Types/Apps.hs
+++ b/agent/src/Handler/Types/Apps.hs
@@ -74,6 +74,8 @@ instance FromJSON InstallNewAppReq where

 data AppAvailableFull = AppAvailableFull
    { appAvailableFullBase                   :: AppBase
+    , appAvailableFullLicenseName            :: Maybe Text
+    , appAvailableFullLicenseLink            :: Maybe Text
    , appAvailableFullInstallInfo            :: Maybe (Version, AppStatus)
    , appAvailableFullVersionLatest          :: Version
    , appAvailableFullDescriptionShort       :: Text
@@ -88,7 +90,9 @@ instance ToJSON AppAvailableFull where
    toJSON AppAvailableFull {..} = mergeTo
        (toJSON appAvailableFullBase)
        (object
-            [ "versionInstalled" .= fmap fst appAvailableFullInstallInfo
+            [ "licenseName" .= appAvailableFullLicenseName
+            , "licenseLink" .= appAvailableFullLicenseLink
+            , "versionInstalled" .= fmap fst appAvailableFullInstallInfo
            , "status" .= fmap snd appAvailableFullInstallInfo
            , "versionLatest" .= appAvailableFullVersionLatest
            , "descriptionShort" .= appAvailableFullDescriptionShort
@@ -131,6 +135,8 @@ instance ToJSON (AppDependencyRequirement Keep) where
 -- mute violations downstream of version for installing apps
 data AppInstalledFull = AppInstalledFull
    { appInstalledFullBase                   :: AppBase
+    , appInstalledFullLicenseName            :: Maybe Text
+    , appInstalledFullLicenseLink            :: Maybe Text
    , appInstalledFullStatus                 :: AppStatus
    , appInstalledFullVersionInstalled       :: Version
    , appInstalledFullTorAddress             :: Maybe TorAddress
@@ -156,6 +162,8 @@ instance ToJSON AppInstalledFull where
        , "lanUi" .= appInstalledFullLanUi
        , "id" .= appBaseId appInstalledFullBase
        , "title" .= appBaseTitle appInstalledFullBase
+        , "licenseName" .= appInstalledFullLicenseName
+        , "licenseLink" .= appInstalledFullLicenseLink
        , "iconURL" .= appBaseIconUrl appInstalledFullBase
        , "versionInstalled" .= appInstalledFullVersionInstalled
        , "status" .= appInstalledFullStatus
--- a/agent/src/Lib/External/AppManifest.hs
+++ b/agent/src/Lib/External/AppManifest.hs
@@ -78,6 +78,8 @@ data AppManifest where
     AppManifest ::{ appManifestId :: AppId
                    , appManifestVersion :: Version
                    , appManifestTitle :: Text
+                    , appManifestLicenseName :: Maybe Text
+                    , appManifestLicenseLink :: Maybe Text
                    , appManifestDescShort :: Text
                    , appManifestDescLong :: Text
                    , appManifestReleaseNotes :: Text
@@ -109,6 +111,8 @@ instance FromJSON AppManifest where
        appManifestId             <- o .: "id"
        appManifestVersion        <- o .: "version"
        appManifestTitle          <- o .: "title"
+        appManifestLicenseName    <- o .:? "license-info" >>= traverse (.: "license")
+        appManifestLicenseLink    <- o .:? "license-info" >>= traverse (.: "url")
        appManifestDescShort      <- o .: "description" >>= (.: "short")
        appManifestDescLong       <- o .: "description" >>= (.: "long")
        appManifestReleaseNotes   <- o .: "release-notes"
--- a/agent/src/Lib/External/Registry.hs
+++ b/agent/src/Lib/External/Registry.hs
@@ -13,8 +13,8 @@ import           Startlude.ByteStream    hiding ( count )

 import           Conduit
 import           Control.Algebra
-import           Control.Effect.Lift
 import           Control.Effect.Error
+import           Control.Effect.Lift
 import           Control.Effect.Reader.Labelled
 import           Control.Monad.Fail             ( fail )
 import           Control.Monad.Trans.Resource
@@ -30,15 +30,17 @@ import           System.Directory
 import           System.Process

 import           Constants
+import qualified Data.Aeson.Types               ( parseEither )
+import           Data.Time.ISO8601              ( parseISO8601 )
 import           Lib.Algebra.State.RegistryUrl
 import           Lib.Error
+import           Lib.External.AppManifest
 import           Lib.SystemPaths
 import           Lib.Types.Core
 import           Lib.Types.Emver
 import           Lib.Types.ServerApp
-import           Data.Time.ISO8601              ( parseISO8601 )

-newtype AppManifestRes = AppManifestRes
+newtype AppIndexRes = AppIndexRes
    { storeApps :: [StoreApp] } deriving (Eq, Show)

 newtype RegistryVersionForSpecRes = RegistryVersionForSpecRes
@@ -85,8 +87,8 @@ getLifelineBinary avs = do
    liftIO $ runConduitRes $ httpSource request getResponseBody .| sinkFile (toS lifelineTarget)
    liftIO $ void $ readProcessWithExitCode "chmod" ["700", toS lifelineTarget] ""

-getAppManifest :: (MonadIO m, Has (Error S9Error) sig m, Has RegistryUrl sig m) => m AppManifestRes
-getAppManifest = do
+getAppIndex :: (MonadIO m, Has (Error S9Error) sig m, Has RegistryUrl sig m) => m AppIndexRes
+getAppIndex = do
    manifestPath <- registryManifestUrl
    req          <- liftIO $ fmap setUserAgent . parseRequestThrow $ toS manifestPath
    val          <- (liftIO . try @SomeException) (httpBS req) >>= \case
@@ -96,22 +98,29 @@ getAppManifest = do
        Left  e -> throwError $ RegistryParseE manifestPath . toS $ e
        Right a -> pure a

+getAppManifest :: (MonadIO m, Has (Error S9Error) sig m, Has RegistryUrl sig m) => AppId -> m AppManifest
+getAppManifest appId = do
+    let path = "/apps/manifest/" <> unAppId appId
+    v <- registryRequest path
+    case Data.Aeson.Types.parseEither parseJSON v of
+        Left  e -> throwError $ RegistryParseE path . toS $ e
+        Right a -> pure a

 getStoreAppInfo :: (MonadIO m, Has RegistryUrl sig m, Has (Error S9Error) sig m) => AppId -> m (Maybe StoreApp)
-getStoreAppInfo name = find ((== name) . storeAppId) . storeApps <$> getAppManifest
+getStoreAppInfo name = find ((== name) . storeAppId) . storeApps <$> getAppIndex

-parseBsManifest :: Has RegistryUrl sig m => ByteString -> m (Either String AppManifestRes)
+parseBsManifest :: Has RegistryUrl sig m => ByteString -> m (Either String AppIndexRes)
 parseBsManifest bs = do
    parseRegistryRes' <- parseRegistryRes
    pure $ parseEither parseRegistryRes' . fromJust . decodeThrow $ bs

-parseRegistryRes :: Has RegistryUrl sig m => m (Value -> Parser AppManifestRes)
+parseRegistryRes :: Has RegistryUrl sig m => m (Value -> Parser AppIndexRes)
 parseRegistryRes = do
    parseAppData' <- parseAppData
    pure $ withObject "app registry response" $ \obj -> do
        let keyVals       = HM.toList obj
        let mManifestApps = fmap (\(k, v) -> parseMaybe (parseAppData' (AppId k)) v) keyVals
-        pure . AppManifestRes . catMaybes $ mManifestApps
+        pure . AppIndexRes . catMaybes $ mManifestApps

 registryUrl :: (Has RegistryUrl sig m) => m Text
 registryUrl = maybe "https://registry.start9labs.com:443" show <$> getRegistryUrl
--- a/agent/src/Lib/Synchronizers.hs
+++ b/agent/src/Lib/Synchronizers.hs
@@ -98,12 +98,12 @@ parseKernelVersion = do
    pure $ KernelVersion (Version (major', minor', patch', 0)) arch

 synchronizer :: Synchronizer
-synchronizer = sync_0_2_12
+synchronizer = sync_0_2_13
 {-# INLINE synchronizer #-}

-sync_0_2_12 :: Synchronizer
-sync_0_2_12 = Synchronizer
-    "0.2.12"
+sync_0_2_13 :: Synchronizer
+sync_0_2_13 = Synchronizer
+    "0.2.13"
    [ syncCreateAgentTmp
    , syncCreateSshDir
    , syncRemoveAvahiSystemdDependency
--- a/agent/src/Startlude/ByteStream.hs
+++ b/agent/src/Startlude/ByteStream.hs
@@ -1,13 +1,7 @@
 -- {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 module Startlude.ByteStream
-    ( module Startlude.ByteStream
-    , module BS
-    )
-where
+    ( module BS
+    ) where

-import           Data.ByteString.Streaming     as BS
+import           Streaming.ByteString          as BS
                                         hiding ( ByteString )
-import           Data.ByteString.Streaming     as X
-                                                ( ByteString )
-
-type ByteStream m = X.ByteString m
--- a/agent/src/Startlude/ByteStream/Char8.hs
+++ b/agent/src/Startlude/ByteStream/Char8.hs
@@ -1,7 +1,5 @@
 module Startlude.ByteStream.Char8
    ( module X
-    )
-where
+    ) where

-import           Data.ByteString.Streaming.Char8
-                                               as X
+import           Streaming.ByteString.Char8    as X
--- a/agent/stack.yaml
+++ b/agent/stack.yaml
@@ -1,10 +1,10 @@
-resolver: nightly-2020-09-29
+resolver: lts-17.10

 packages:
  - .

 extra-deps:
-  - aeson-1.4.7.1
+  # - aeson-1.4.7.1
  - aeson-flatten-0.1.0.2
  - exinst-0.8
  - fused-effects-1.1.0.0
@@ -12,13 +12,14 @@ extra-deps:
  - git-embed-0.1.0
  - json-stream-0.4.2.4
  - protolude-0.3.0
+  - streaming-bytestring-0.1.7
  - streaming-conduit-0.1.2.2
  - streaming-utils-0.2.0.0
  # to avoid the ridiculous bug where stat64 is not found (only affects development)
-  - git: https://github.com/ProofOfKeags/persistent.git
-    commit: 3b52b13d9ce79cdef14bb1c37cc527657a529462
-    subdirs:
-      - persistent-sqlite
+  # - git: https://github.com/ProofOfKeags/persistent.git
+  # commit: 3b52b13d9ce79cdef14bb1c37cc527657a529462
+  # subdirs:
+  # - persistent-sqlite

 ghc-options:
  "$locals": -fwrite-ide-info
--- a/appmgr/Cargo.lock
+++ b/appmgr/Cargo.lock
@@ -41,7 +41,7 @@ checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"

 [[package]]
 name = "appmgr"
-version = "0.2.12"
+version = "0.2.13"
 dependencies = [
 "async-trait",
 "avahi-sys",
--- a/appmgr/Cargo.toml
+++ b/appmgr/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Aiden McClelland <me@drbonez.dev>"]
 edition = "2018"
 name = "appmgr"
-version = "0.2.12"
+version = "0.2.13"

 [lib]
 name = "appmgrlib"
--- a/appmgr/src/version/mod.rs
+++ b/appmgr/src/version/mod.rs
@@ -29,8 +29,9 @@ mod v0_2_9;
 mod v0_2_10;
 mod v0_2_11;
 mod v0_2_12;
+mod v0_2_13;

-pub use v0_2_12::Version as Current;
+pub use v0_2_13::Version as Current;

 #[derive(serde::Serialize, serde::Deserialize)]
 #[serde(untagged)]
@@ -55,6 +56,7 @@ enum Version {
    V0_2_10(Wrapper<v0_2_10::Version>),
    V0_2_11(Wrapper<v0_2_11::Version>),
    V0_2_12(Wrapper<v0_2_12::Version>),
+    V0_2_13(Wrapper<v0_2_13::Version>),
    Other(emver::Version),
 }

@@ -169,6 +171,7 @@ pub async fn init() -> Result<(), failure::Error> {
            Version::V0_2_10(v) => v.0.migrate_to(&Current::new()).await?,
            Version::V0_2_11(v) => v.0.migrate_to(&Current::new()).await?,
            Version::V0_2_12(v) => v.0.migrate_to(&Current::new()).await?,
+            Version::V0_2_13(v) => v.0.migrate_to(&Current::new()).await?,
            Version::Other(_) => (),
            // TODO find some way to automate this?
        }
@@ -262,6 +265,7 @@ pub async fn self_update(requirement: emver::VersionRange) -> Result<(), Error>
        Version::V0_2_10(v) => Current::new().migrate_to(&v.0).await?,
        Version::V0_2_11(v) => Current::new().migrate_to(&v.0).await?,
        Version::V0_2_12(v) => Current::new().migrate_to(&v.0).await?,
+        Version::V0_2_13(v) => Current::new().migrate_to(&v.0).await?,
        Version::Other(_) => (),
        // TODO find some way to automate this?
    };
--- a/appmgr/src/version/v0_2_13.rs
+++ b/appmgr/src/version/v0_2_13.rs
@@ -0,0 +1,21 @@
+use super::*;
+
+const V0_2_13: emver::Version = emver::Version::new(0, 2, 13, 0);
+
+pub struct Version;
+#[async_trait]
+impl VersionT for Version {
+    type Previous = v0_2_12::Version;
+    fn new() -> Self {
+        Version
+    }
+    fn semver(&self) -> &'static emver::Version {
+        &V0_2_13
+    }
+    async fn up(&self) -> Result<(), Error> {
+        Ok(())
+    }
+    async fn down(&self) -> Result<(), Error> {
+        Ok(())
+    }
+}
--- a/assets/eos.png
+++ b/assets/eos.png
--- a/ui/build-send-alpha.sh
+++ b/ui/build-send-alpha.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+set -e
+
+echo "turn off mocks"
+echo "$( jq '.useMocks = false' use-mocks.json )" > use-mocks.json
+echo "$( jq '.skipStartupAlerts = false' use-mocks.json )" > use-mocks.json
+
+echo "FILTER: rm -rf www"
+rm -rf www
+
+echo "FILTER: ionic build"
+npm run build-prod
+
+echo "FILTER: cp client-manifest.yaml www"
+cp client-manifest.yaml www
+
+echo "FILTER: git hash"
+touch git-hash.txt
+git log | head -n1 > git-hash.txt
+mv git-hash.txt www
+
+echo "FILTER: removing mock icons"
+rm -rf www/assets/img/service-icons
+
+echo "FILTER: tar -zcvf ambassador-ui.tar.gz www"
+tar -zcvf ambassador-ui.tar.gz www
+
+SHA_SUM=$(sha1sum ambassador-ui.tar.gz)
+echo "${SHA_SUM}"
+
+echo "Set version"
+VERSION=$(jq ".version" package.json)
+echo "${VERSION}"
+
+echo "FILTER: mkdir alpha-reg"
+ssh root@alpha-registry.start9labs.com "mkdir -p /var/www/html/resources/sys/ambassador-ui.tar.gz/${VERSION}"
+
+echo "FILTER: scp ambassador-ui.tar.gz"
+scp ambassador-ui.tar.gz root@alpha-registry.start9labs.com:/var/www/html/resources/sys/ambassador-ui.tar.gz/${VERSION}/ambassador-ui.tar.gz
+
+echo "FILTER: fin"
--- a/ui/client-manifest.yaml
+++ b/ui/client-manifest.yaml
@@ -1,6 +1,6 @@
 manifest-version: 0
 app-id: start9-ambassador
-app-version: 0.2.12
+app-version: 0.2.13
 uri-rewrites:
    - =/api -> http://{{start9-ambassador}}:5959/authenticate
    - /api/ -> http://{{start9-ambassador}}:5959/
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "embassy-ui",
-  "version": "0.2.12",
+  "version": "0.2.13",
  "description": "GUI for EmbassyOS",
  "author": "Start9 Labs",
  "homepage": "https://github.com/Start9Labs/embassy-ui",
--- a/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -1,27 +1,17 @@
 <ion-header>
  <ion-toolbar>
    <ion-title >
-      <ion-label style="font-size: 20px;" class="ion-text-wrap">Welcome to 0.2.12!</ion-label>
+      <ion-label style="font-size: 20px;" class="ion-text-wrap">Welcome to 0.2.13!</ion-label>
    </ion-title>
  </ion-toolbar>
 </ion-header>

 <ion-content class="ion-padding">
  <div style="display: flex; flex-direction: column; justify-content: space-between; height: 100%">
-    <h2>Highlights</h2>
+    <h2>Highlights: 0.2.13</h2>
    <div class="main-content">
-      <p>This release includes several bugfixes to resolve:</p>
-      <ol>
-        <li>Faster file upload/download ability</li>
-        <li>More robust support for .local addresses</li>
-        <li>Refreshing error messages during configuration changes</li>
-        <li>Starting services with uninstalled optional dependencies</li>
-        <li>Uninstalling services with optional dependencies</li>
-        <li>Redirecting to HTTPS when navigating to LAN address</li>
-        <li>Displaying warning messages during concurrent upgrades of dependent services</li>
-        <li>Allowing larger file uploads</li>
-        <li>Patching a security fix for Tor</li>
-      </ol>
+      <p>At long last, Matrix has arrived!</p>
+      <p>This release also enables displaying Service license information and contains utilities to facilitate the next major release of EmbassyOS.</p>
    </div>

    <div class="close-button">
--- a/ui/src/app/models/app-types.ts
+++ b/ui/src/app/models/app-types.ts
@@ -18,9 +18,11 @@ export interface AppAvailablePreview extends BaseApp {
 }

 export type AppAvailableFull =
-  AppAvailablePreview  &
-  { descriptionLong: string
+  AppAvailablePreview  & {
+    descriptionLong: string
    versions: string[]
+    licenseName?: string // @TODO required for 0.3.0
+    licenseLink?: string // @TODO required for 0.3.0
  } &
  AppAvailableVersionSpecificInfo

@@ -45,6 +47,8 @@ export interface AppInstalledPreview extends BaseApp {
 }

 export interface AppInstalledFull extends AppInstalledPreview {
+  licenseName?: string // @TODO required for 0.3.0
+  licenseLink?: string // @TODO required for 0.3.0
  instructions: string | null
  lastBackup: string | null
  configuredRequirements: AppDependency[] | null // null if not yet configured
--- a/ui/src/app/pages/apps-routes/app-available-list/app-available-list.page.html
+++ b/ui/src/app/pages/apps-routes/app-available-list/app-available-list.page.html
@@ -21,6 +21,26 @@
      <ion-text class="ion-text-wrap" color="danger">{{ error }}</ion-text>
    </ion-item>

+    <ion-card *ngIf="v1Status.status === 'instructions'" [href]="'https://start9.com/eos-' + v1Status.version" target="_blank" class="instructions-card">
+      <ion-card-header>
+        <ion-card-subtitle>Coming Soon...</ion-card-subtitle>
+        <ion-card-title>EmbassyOS Version {{ v1Status.version }}</ion-card-title>
+      </ion-card-header>
+      <ion-card-content>
+        <b>Get ready. View the update instructions.</b>
+      </ion-card-content>
+    </ion-card>
+
+    <ion-card *ngIf="v1Status.status === 'available'" [href]="'https://start9.com/eos-' + v1Status.version" target="_blank" class="available-card">
+      <ion-card-header>
+        <ion-card-subtitle>Now Available...</ion-card-subtitle>
+        <ion-card-title>EmbassyOS Version {{ v1Status.version }}</ion-card-title>
+      </ion-card-header>
+      <ion-card-content>
+        <b>View the update instructions.</b>
+      </ion-card-content>
+    </ion-card>
+
    <ion-card *ngFor="let app of apps" style="margin: 10px 10px;" [routerLink]="[app.id]">
      <ion-item style="--inner-border-width: 0 0 .4px 0; --border-color: #525252;" *ngIf="{ installing: (app.subject.status | async) === 'INSTALLING', installComparison: app.subject | compareInstalledAndLatest | async } as l">
        <ion-avatar style="margin-top: 8px;" slot="start">
--- a/ui/src/app/pages/apps-routes/app-available-list/app-available-list.page.scss
+++ b/ui/src/app/pages/apps-routes/app-available-list/app-available-list.page.scss
@@ -4,3 +4,13 @@
  font-family: 'Open Sans';
  padding: 1px 0px 1.5px 0px;
 }
+
+.instructions-card {
+  --background: linear-gradient(45deg, #101010 16%, var(--ion-color-medium) 150%);
+  margin: 16px 10px;
+}
+
+.available-card {
+  --background: linear-gradient(45deg, #101010 16%, var(--ion-color-danger) 150%);
+  margin: 16px 10px;
+}
--- a/ui/src/app/pages/apps-routes/app-available-list/app-available-list.page.ts
+++ b/ui/src/app/pages/apps-routes/app-available-list/app-available-list.page.ts
@@ -8,6 +8,7 @@ import { Subscription, BehaviorSubject, combineLatest } from 'rxjs'
 import { take } from 'rxjs/operators'
 import { markAsLoadingDuringP } from 'src/app/services/loader.service'
 import { OsUpdateService } from 'src/app/services/os-update.service'
+import { V1Status } from 'src/app/services/api/api-types'

@Component({
  selector: 'app-available-list',
@@ -20,6 +21,7 @@ export class AppAvailableListPage {
  installedAppDeltaSubscription: Subscription
  apps: PropertySubjectId<AppAvailablePreview>[] = []
  appsInstalled: PropertySubjectId<AppInstalledPreview>[] = []
+  v1Status: V1Status = { status: 'nothing', version: '' }

  constructor (
    private readonly apiService: ApiService,
@@ -35,6 +37,7 @@ export class AppAvailableListPage {

    markAsLoadingDuringP(this.$loading$, Promise.all([
      this.getApps(),
+      this.checkV1Status(),
      this.osUpdateService.checkWhenNotAvailable$().toPromise(), // checks for an os update, banner component renders conditionally
      pauseFor(600),
    ]))
@@ -44,6 +47,14 @@ export class AppAvailableListPage {
    this.appModel.getContents().forEach(appInstalled => this.mergeInstalledProps(appInstalled.id))
  }

+  async checkV1Status () {
+    try {
+      this.v1Status = await this.apiService.checkV1Status()
+    } catch (e) {
+      console.error(e)
+    }
+  }
+
  mergeInstalledProps (appInstalledId: string) {
    const appAvailable  = this.apps.find(app => app.id === appInstalledId)
    if (!appAvailable) return
--- a/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.html
+++ b/ui/src/app/pages/apps-routes/app-available-show/app-available-show.page.html
@@ -17,6 +17,8 @@
    versionInstalled: $app$.versionInstalled | async,
    versionViewing: $app$.versionViewing | async,
    descriptionLong: $app$.descriptionLong | async,
+    licenseName: $app$.licenseName | async,
+    licenseLink: $app$.licenseLink | async,
    serviceRequirements: $app$.serviceRequirements | async,
    iconURL: $app$.iconURL | async,
    releaseNotes: $app$.releaseNotes | async
@@ -112,9 +114,14 @@
        <dependency-list [$loading$]="$dependenciesLoading$" [hostApp]="$app$ | peekProperties" [dependencies]="vars.serviceRequirements"></dependency-list>
      </ng-container>
      <ion-item-divider></ion-item-divider>
+      <ion-item *ngIf="vars.licenseLink" lines="none" button [href]="vars.licenseLink" target="_blank">
+        <ion-icon slot="start" name="newspaper-outline"></ion-icon>
+        <ion-label>License</ion-label>
+        <ion-note slot="end">{{ vars.licenseName }}</ion-note>
+      </ion-item>
      <ion-item lines="none" button (click)="presentAlertVersions()">
-        <ion-icon color="medium" slot="start" name="file-tray-stacked-outline"></ion-icon>
-        <ion-label color="medium">Other versions</ion-label>
+        <ion-icon slot="start" name="file-tray-stacked-outline"></ion-icon>
+        <ion-label>Other versions</ion-label>
      </ion-item>
    </ion-item-group>
  </ng-container>
--- a/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.html
+++ b/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.html
@@ -15,6 +15,8 @@
     torAddress: app.torAddress | async,
     status: app.status | async,
     versionInstalled: app.versionInstalled | async,
+     licenseName: app.licenseName | async,
+     licenseLink: app.licenseLink | async,
     configuredRequirements: app.configuredRequirements | async,
     lastBackup: app.lastBackup | async,
     hasFetchedFull: app.hasFetchedFull | async,
@@ -157,6 +159,12 @@
          <ion-icon slot="start" name="storefront-outline" color="primary"></ion-icon>
          <ion-label><ion-text color="primary">Marketplace Listing</ion-text></ion-label>
        </ion-item>
+        <!-- license -->
+        <ion-item *ngIf="vars.licenseLink" lines="none" button [href]="vars.licenseLink" target="_blank">
+          <ion-icon slot="start" name="newspaper-outline" color="primary"></ion-icon>
+          <ion-label><ion-text color="primary">License</ion-text></ion-label>
+          <ion-note slot="end">{{ vars.licenseName }}</ion-note>
+        </ion-item>

        <!-- dependencies -->
        <ng-container *ngIf="vars.configuredRequirements && vars.configuredRequirements.length">
--- a/ui/src/app/services/api/api-types.ts
+++ b/ui/src/app/services/api/api-types.ts
@@ -37,3 +37,7 @@ export interface ApiAppConfig {

 export type Unit = { never?: never; } // hack for the unit typ

+export type V1Status = {
+  status: 'nothing' | 'instructions' | 'available'
+  version: string
+}
--- a/ui/src/app/services/api/api.service.ts
+++ b/ui/src/app/services/api/api.service.ts
@@ -2,7 +2,7 @@ import { Rules } from '../../models/app-model'
 import { AppAvailablePreview, AppAvailableFull, AppInstalledPreview, AppInstalledFull, DependentBreakage, AppAvailableVersionSpecificInfo, ServiceAction } from '../../models/app-types'
 import { S9Notification, SSHFingerprint, ServerMetrics, DiskInfo } from '../../models/server-model'
 import { Subject, Observable } from 'rxjs'
-import { Unit, ApiServer, ApiAppInstalledFull, ApiAppConfig, ApiAppAvailableFull, ApiAppInstalledPreview } from './api-types'
+import { Unit, ApiServer, ApiAppInstalledFull, ApiAppConfig, ApiAppAvailableFull, ApiAppInstalledPreview, V1Status } from './api-types'
 import { AppMetrics, AppMetricsVersioned } from 'src/app/util/metrics.util'
 import { ConfigSpec } from 'src/app/app-config/config-types'

@@ -64,6 +64,7 @@ export abstract class ApiService {
  abstract ejectExternalDisk (logicalName: string): Promise<Unit>
  abstract serviceAction (appId: string, serviceAction: ServiceAction): Promise<ReqRes.ServiceActionResponse>
  abstract refreshLAN (): Promise<Unit>
+  abstract checkV1Status (): Promise<V1Status>
 }

 export function isRpcFailure<Error, Result> (arg: { error: Error } | { result: Result }): arg is { error: Error } {
--- a/ui/src/app/services/api/live-api.service.ts
+++ b/ui/src/app/services/api/live-api.service.ts
@@ -4,7 +4,7 @@ import { AppModel, AppStatus } from '../../models/app-model'
 import { AppAvailablePreview, AppAvailableFull, AppInstalledFull, AppInstalledPreview, DependentBreakage, AppAvailableVersionSpecificInfo, ServiceAction } from '../../models/app-types'
 import { S9Notification, SSHFingerprint, ServerModel, DiskInfo } from '../../models/server-model'
 import { ApiService, ReqRes } from './api.service'
-import { ApiAppInstalledPreview, ApiServer, Unit } from './api-types'
+import { ApiAppInstalledPreview, ApiServer, Unit, V1Status } from './api-types'
 import { HttpErrorResponse } from '@angular/common/http'
 import { isUnauthorized } from 'src/app/util/web.util'
 import { Replace } from 'src/app/util/types.util'
@@ -305,6 +305,10 @@ export class LiveApiService extends ApiService {
    return this.authRequest({ method: Method.POST, url: '/network/lan/reset' })
  }

+  async checkV1Status (): Promise<V1Status> {
+    return this.http.request({ method: Method.GET, url: 'https://registry.start9labs.com/sys/status' })
+  }
+
  private async authRequest<T> (opts: HttpOptions, overrides: Partial<{ version: string }> = { }): Promise<T> {
    if (!this.authenticatedRequestsEnabled) throw new Error(`Authenticated requests are not enabled. Do you need to login?`)

--- a/ui/src/app/services/api/mock-api.service.ts
+++ b/ui/src/app/services/api/mock-api.service.ts
@@ -4,7 +4,7 @@ import { AppAvailablePreview, AppAvailableFull, AppInstalledPreview, AppInstalle
 import { S9Notification, SSHFingerprint, ServerStatus, ServerModel, DiskInfo } from '../../models/server-model'
 import { pauseFor } from '../../util/misc.util'
 import { ApiService, ReqRes } from './api.service'
-import { ApiAppInstalledFull, ApiAppInstalledPreview, ApiServer, Unit as EmptyResponse, Unit } from './api-types'
+import { ApiAppInstalledFull, ApiAppInstalledPreview, ApiServer, Unit as EmptyResponse, Unit, V1Status } from './api-types'
 import { AppMetrics, AppMetricsVersioned, parseMetricsPermissive } from 'src/app/util/metrics.util'
 import { mockApiAppAvailableFull, mockApiAppAvailableVersionInfo, mockApiAppInstalledFull, mockAppDependentBreakages, toInstalledPreview } from './mock-app-fixures'
 import { ConfigService } from '../config.service'
@@ -273,6 +273,13 @@ export class MockApiService extends ApiService {
    return mockRefreshLAN()
  }

+  async checkV1Status (): Promise<V1Status> {
+    return {
+      status: 'instructions',
+      version: '1.0.0',
+    }
+  }
+
  private hasUI (app: ApiAppInstalledPreview): boolean {
    return app.lanUi || app.torUi
  }
@@ -355,7 +362,7 @@ async function mockGetServerLogs (): Promise<ReqRes.GetServerLogsRes> {

 async function mockGetAppMetrics (): Promise<ReqRes.GetAppMetricsRes> {
  await pauseFor(1000)
-  return mockApiAppMetricsV1
+  return mockApiAppMetricsV1 as ReqRes.GetAppMetricsRes
 }

 async function mockGetAvailableAppVersionInfo (): Promise<ReqRes.GetAppAvailableVersionInfoRes> {
@@ -492,7 +499,7 @@ const mockApiNotifications: ReqRes.GetNotificationsRes = [
 const mockApiServer: () => ReqRes.GetServerRes = () => ({
  serverId: 'start9-mockxyzab',
  name: 'Embassy:12345678',
-  versionInstalled: '0.2.12',
+  versionInstalled: '0.2.13',
  versionLatest: '0.2.13',
  status: ServerStatus.RUNNING,
  alternativeRegistryUrl: 'beta-registry.start9labs.com',
--- a/ui/src/app/services/api/mock-app-fixures.ts
+++ b/ui/src/app/services/api/mock-app-fixures.ts
@@ -54,6 +54,8 @@ export const bitcoinI: ApiAppInstalledFull = {
  versionInstalled: '0.18.1',
  lanAddress: undefined,
  title: 'Bitcoin Core',
+  licenseName: 'MIT',
+  licenseLink: 'https://github.com/bitcoin/bitcoin/blob/master/COPYING',
  torAddress: '4acth47i6kxnvkewtm6q7ib2s3ufpo5sqbsnzjpbi7utijcltosqemad.onion',
  startAlert: 'Bitcoind could take a loooooong time to start. Please be patient.',
  status: AppStatus.STOPPED,
@@ -147,6 +149,8 @@ export const bitcoinA: AppAvailableFull = {
  id: 'bitcoind',
  versionLatest: '0.19.1.1',
  versionInstalled: '0.19.0',
+  licenseName: 'MIT',
+  licenseLink: 'https://github.com/bitcoin/bitcoin/blob/master/COPYING',
  status: AppStatus.UNKNOWN,
  title: 'Bitcoin Core',
  descriptionShort: 'Bitcoin is an innovative payment network and new kind of money.',
--- a/ui/src/app/services/startup-alerts.notifier.ts
+++ b/ui/src/app/services/startup-alerts.notifier.ts
@@ -5,6 +5,7 @@ import { WizardBaker } from '../components/install-wizard/prebaked-wizards'
 import { OSWelcomePage } from '../modals/os-welcome/os-welcome.page'
 import { S9Server } from '../models/server-model'
 import { displayEmver } from '../pipes/emver.pipe'
+import { V1Status } from './api/api-types'
 import { ApiService, ReqRes } from './api/api.service'
 import { ConfigService } from './config.service'
 import { Emver } from './emver.service'
@@ -36,6 +37,13 @@ export class StartupAlertsNotifier {
      display: vl => this.displayOsUpdateCheck(vl),
      hasRun: this.config.skipStartupAlerts,
    }
+    const v1StatusUpdate: Check<V1Status> = {
+      name: 'v1Status',
+      shouldRun: s => this.shouldRunOsUpdateCheck(s),
+      check: () => this.v1StatusCheck(),
+      display: s => this.displayV1Check(s),
+      hasRun: this.config.skipStartupAlerts,
+    }
    const apps: Check<boolean> = {
      name: 'apps',
      shouldRun: s => this.shouldRunAppsCheck(s),
@@ -43,7 +51,7 @@ export class StartupAlertsNotifier {
      display: () => this.displayAppsCheck(),
      hasRun: this.config.skipStartupAlerts,
    }
-    this.checks = [welcome, osUpdate, apps]
+    this.checks = [welcome, osUpdate, v1StatusUpdate, apps]
  }

  // This takes our three checks and filters down to those that should run.
@@ -85,6 +93,10 @@ export class StartupAlertsNotifier {
    return server.autoCheckUpdates
  }

+  private async v1StatusCheck (): Promise<V1Status> {
+    return this.apiService.checkV1Status()
+  }
+
  private async osUpdateCheck (s: Readonly<S9Server>): Promise<ReqRes.GetVersionLatestRes | undefined> {
    const res = await this.apiService.getVersionLatest()
    return this.osUpdateService.updateIsAvailable(s.versionInstalled, res) ? res : undefined
@@ -131,6 +143,33 @@ export class StartupAlertsNotifier {
    return true
  }

+  private async displayV1Check (s: V1Status): Promise<boolean> {
+    return new Promise(async resolve => {
+      if (s.status !== 'available') return resolve(true)
+      const alert = await this.alertCtrl.create({
+        backdropDismiss: true,
+        header: `EmbassyOS ${s.version} Now Available!`,
+        message: `Version ${s.version} introduces SSD support and a whole lot more.`,
+        buttons: [
+          {
+            text: 'Cancel',
+            role: 'cancel',
+            handler: () => resolve(true),
+          },
+          {
+            text: 'View Instructions',
+            handler: () => {
+              window.open(`https://start9.com/eos-${s.version}`, '_blank')
+              resolve(false)
+            },
+          },
+        ],
+      })
+
+      await alert.present()
+    })
+  }
+
  private async displayAppsCheck (): Promise<boolean> {
    return new Promise(async resolve => {
      const alert = await this.alertCtrl.create({