flake.lock

@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714038124,
+        "lastModified": 1713973535,
-        "narHash": "sha256-QfWxEMZwwzXtOic6eiUQI4fuUiuXP9dsSWrCf8r0/x8=",
+        "narHash": "sha256-ifsz3a0wBsxuhYZBSbpplLrCfKAIo625v3hWf4Ks61s=",
         "owner": "atuinsh",
         "repo": "atuin",
-        "rev": "fc5522f45ef0735fb3b492329f95770203d21a7f",
+        "rev": "38ea7706a0ed2929838804db69bda2a53763c97c",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714103775,
+        "lastModified": 1714008123,
-        "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=",
+        "narHash": "sha256-zpJNUuOcVL3Yi60VPvpNhs77uIK1D0Ri2eeHcfdz8yg=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "285e26465a0bae510897ca04da26ce6307c652b4",
+        "rev": "db1150487c7cde696cf5c4bbb599b37b885ca592",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1714121587,
+        "lastModified": 1714012795,
-        "narHash": "sha256-mXwE5H5JJxi1c2c8nwjiyMRGy9UYgNPSJ2caJDxbGgk=",
+        "narHash": "sha256-UCst+RoX67NhDgfCcJwOk94ZEjDg09wh1i0gs83Nrvc=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "40463aaa81fc44a2908716ca79d29c16c5fef81b",
+        "rev": "bf2ab188e525dd20cdd9448e270fd442cea56949",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714114763,
+        "lastModified": 1713730154,
-        "narHash": "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM=",
+        "narHash": "sha256-LHwfc+Mexlqewfjm2onPz74ZMRf/n+e7aAuYz08qPUE=",
         "owner": "elkowar",
         "repo": "eww",
-        "rev": "2c8811512460ce6cc75e021d8d081813647699dc",
+        "rev": "acf57a8396d19cd160786223b04b950509e46a4b",
         "type": "github"
       },
       "original": {
@@ -603,11 +603,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714042918,
+        "lastModified": 1713992342,
-        "narHash": "sha256-4AItZA3EQIiSNAxliuYEJumw/LaVfrMv84gYyrs0r3U=",
+        "narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0c5704eceefcb7bb238a958f532a86e3b59d76db",
+        "rev": "2f072c127c041eec36621b8e38a531fe0fe07961",
         "type": "github"
       },
       "original": {
@@ -627,11 +627,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1714072181,
+        "lastModified": 1713463636,
-        "narHash": "sha256-MOxTGzM8lgq8uo6zAy6e4ZUdzUpF/eSQPBXeH5G5BtE=",
+        "narHash": "sha256-IPdnR0Rs7XoffnCn6rExYDlft/GHD/UFgQ11lTVEK48=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "ac28e21ac336dbe01b1f1bcab01fd31db3855e40",
+        "rev": "6a4f822a817180be03fcdceb654088d002c9ec5e",
         "type": "github"
       },
       "original": {
@@ -775,11 +775,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1713995372,
+        "lastModified": 1713828541,
-        "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
+        "narHash": "sha256-KtvQeE12MSkCOhvVmnmcZCjnx7t31zWin2XVSDOwBDE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
+        "rev": "b500489fd3cf653eafc075f9362423ad5cdd8676",
         "type": "github"
       },
       "original": {
@@ -823,11 +823,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1714076141,
+        "lastModified": 1713895582,
-        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
+        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
+        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
         "type": "github"
       },
       "original": {
@@ -955,11 +955,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714097613,
+        "lastModified": 1714011248,
-        "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=",
+        "narHash": "sha256-vKk9IOxZJ52Ao3uIRIjHRYYe+IpVOY6NzwToSxaO1J0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd",
+        "rev": "9a2a11479b94afaf1ecc46384b27abda0d3d5f9d",
         "type": "github"
       },
       "original": {
@@ -1058,11 +1058,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714058656,
+        "lastModified": 1711963903,
-        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
+        "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
+        "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
         "type": "github"
       },
       "original": {

flake.nix

@@ -341,7 +341,6 @@
                 pkgs.sops
                 ssh-to-age
                 taplo
-                yj
 
                 inputs'.disko.packages.disko
               ];

machines/neo/matrix-sliding-sync/default.nix

@@ -8,7 +8,7 @@
     environmentFile = config.sops.secrets.matrix-sliding-sync-env.path;
 
     settings = {
-      SYNCV3_SERVER = "http://127.0.0.1:8008";
+      SYNCV3_SERVER = "https://matrix.boskma.frl";
       SYNCV3_BINDADDR = "0.0.0.0:8009";
     };
   };

machines/odin/configuration.nix

@@ -15,7 +15,6 @@
     ./storage.nix
     ./network.nix
     ./virtualisation.nix
-    ./promtail
     ../../users/erwin
     ../../users/root
   ];
@@ -106,12 +105,6 @@
     lvm = {
       enable = true;
     };
-    prometheus.exporters = {
-      node = {
-        enable = true;
-        enabledCollectors = [ "systemd" ];
-      };
-    };
   };
 
   system.stateVersion = "24.05";

machines/odin/promtail/default.nix

@@ -1,33 +0,0 @@
-{
-  services.promtail = {
-    enable = true;
-    configuration = {
-      clients = [ { url = "http://saga:3100/loki/api/v1/push"; } ];
-      positions = {
-        filename = "/tmp/positions.yaml";
-      };
-      scrape_configs = [
-        {
-          job_name = "journal";
-          journal = {
-            labels = {
-              host = "odin";
-              job = "systemd-journal";
-            };
-            max_age = "12h";
-          };
-          relabel_configs = [
-            {
-              source_labels = [ "__journal__systemd_unit" ];
-              target_label = "unit";
-            }
-          ];
-        }
-      ];
-      server = {
-        grpc_listen_port = 0;
-        http_listen_port = 28183;
-      };
-    };
-  };
-}

machines/odin/virtualisation.nix

@@ -106,8 +106,6 @@
           "oidc.client.id" = "incus";
           "oidc.issuer" = "https://id.datarift.nl/realms/datarift";
           "core.https_address" = ":8443";
-          "loki.api.url" = "http://saga:3100";
-          "loki.instance" = "incus";
         };
       };
     };

machines/saga/configuration.nix

@@ -12,9 +12,7 @@
     ../../users/erwin
 
     ./grafana
-    ./loki
     ./prometheus
-    ./promtail
   ];
 
   eboskma = {

machines/saga/loki/default.nix

@@ -1,68 +0,0 @@
-let
-  dataDir = "/var/lib/loki";
-in
-{
-  services.loki = {
-    enable = true;
-    configuration = {
-      auth_enabled = false;
-
-      server.http_listen_port = 3100;
-
-      ingester = {
-        lifecycler = {
-          address = "0.0.0.0";
-          ring = {
-            kvstore.store = "inmemory";
-            replication_factor = 1;
-          };
-          final_sleep = "0s";
-        };
-        chunk_idle_period = "1h";
-        max_chunk_age = "1h";
-        chunk_target_size = 1024 * 1024; # 1 MiB
-        chunk_retain_period = "30s";
-      };
-
-      schema_config = {
-        configs = [
-          {
-            from = "2024-01-01";
-            store = "tsdb";
-            object_store = "filesystem";
-            schema = "v13";
-            index = {
-              prefix = "_index";
-              period = "24h";
-            };
-          }
-        ];
-      };
-
-      storage_config = {
-        filesystem.directory = "${dataDir}/chunks";
-
-        tsdb_shipper = {
-          active_index_directory = "${dataDir}/tsdb-shipper-active";
-          cache_location = "${dataDir}/tsdb-shipper-cache";
-          cache_ttl = "24h";
-        };
-      };
-
-      limits_config = {
-        reject_old_samples = true;
-        reject_old_samples_max_age = "168h"; # 1 week
-      };
-
-      table_manager = {
-        retention_deletes_enabled = false;
-        retention_period = "0s";
-      };
-
-      compactor = {
-        working_directory = dataDir;
-        compactor_ring.kvstore.store = "inmemory";
-      };
-    };
-  };
-}

machines/saga/promtail/default.nix

@@ -1,33 +0,0 @@
-{
-  services.promtail = {
-    enable = true;
-    configuration = {
-      clients = [ { url = "http://127.0.0.1:3100/loki/api/v1/push"; } ];
-      positions = {
-        filename = "/tmp/positions.yaml";
-      };
-      scrape_configs = [
-        {
-          job_name = "journal";
-          journal = {
-            labels = {
-              host = "saga";
-              job = "systemd-journal";
-            };
-            max_age = "12h";
-          };
-          relabel_configs = [
-            {
-              source_labels = [ "__journal__systemd_unit" ];
-              target_label = "unit";
-            }
-          ];
-        }
-      ];
-      server = {
-        grpc_listen_port = 0;
-        http_listen_port = 28183;
-      };
-    };
-  };
-}

pkgs/incus-ui/default.nix

@@ -5,7 +5,6 @@
   fetchYarnDeps,
   nodejs,
   prefetch-yarn-deps,
-  fixup-yarn-lock,
   yarn,
   gnused,
   rsync,
@@ -13,18 +12,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "incus-ui";
-  version = "0.8";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lxd-ui";
     rev = finalAttrs.version;
-    hash = "sha256-oD/GPm84oFXHcZ8vTUzNgQinrHwNuvpeVjsrp8ibIZY=";
+    # hash = "sha256-52MRf7bk8Un9wqz00+JjDmuJgPKYhgAhIbMbcAuf8W8=";
+    hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-hRZ0vbksxnUv4XMrbhP2PI94UYYzwrydJHSx+uf+MbI=";
+    hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o=";
   };
 
   patches = [
@@ -39,18 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     nodejs
     prefetch-yarn-deps
-    fixup-yarn-lock
     yarn
   ];
 
   configurePhase = ''
     runHook preConfigure
 
-    ${gnused}/bin/sed -e "s/devlxd/guestapi/g" \
+    ${gnused}/bin/sed -i "s/LXD/Incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
-                      -e "s/dev\/lxd/dev\/incus/g" \
+    ${gnused}/bin/sed -i "s/devlxd/guestapi/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
-                      -e "s/LXD/Incus/g" \
+    ${gnused}/bin/sed -i "s/dev\/lxd/dev\/incus/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
-                      -e "s/Lxd/Incus_/g" \
+    ${gnused}/bin/sed -i "s/lxd_/incus_/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
-                      -e "s/lxd/incus/g" -i src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
+    ${gnused}/bin/sed -i "s/\"lxd\"/\"incus\"/g" src/*/*.ts* src/*/*/*.ts* src/*/*/*/*.ts*
 
     export HOME=$(mktemp -d)
     yarn config --offline set yarn-offline-mirror "$offlineCache"

pkgs/incus-ui/ui-canonical-0001-Branding.patch

@@ -1,7 +1,7 @@
-From a8ffa74e0da8a565020fb1ebebd58f23235f19ff Mon Sep 17 00:00:00 2001
+From 530478927deddecbcc49efd01cad10ed49f0ca26 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
 Date: Wed, 22 Nov 2023 22:59:56 +0000
-Subject: [PATCH 1/8] Branding
+Subject: [PATCH 1/6] Branding
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,16 +9,14 @@ Content-Transfer-Encoding: 8bit
 Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
 ---
  index.html                          |   2 +-
- public/assets/img/favicon-32x32.png | Bin 1361 -> 2506 bytes
  public/assets/img/incus-logo.svg    | 129 ++++++++++++++++++++++++++++
  public/assets/img/lxd-logo.svg      |  34 --------
  src/components/Logo.tsx             |   6 +-
  src/pages/login/Login.tsx           |   1 -
- src/sass/_pattern_icon.scss         |  11 ---
  src/sass/_pattern_navigation.scss   |   8 +-
- src/sass/styles.scss                |   5 --
+ src/sass/styles.scss                |   4 -
  src/util/title.tsx                  |   2 +-
- 10 files changed, 138 insertions(+), 60 deletions(-)
+ 9 files changed, 138 insertions(+), 48 deletions(-)
  create mode 100644 public/assets/img/incus-logo.svg
  delete mode 100644 public/assets/img/lxd-logo.svg
 
@@ -212,7 +210,7 @@ index 272ef59..0000000
 -</svg>
 \ No newline at end of file
 diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
-index cf7faa8..b1b06d2 100644
+index bcaf07e..92a0a5a 100644
 --- a/src/components/Logo.tsx
 +++ b/src/components/Logo.tsx
 @@ -15,11 +15,11 @@ const Logo: FC = () => {
@@ -231,36 +229,17 @@ index cf7faa8..b1b06d2 100644
    );
  };
 diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
-index c283cd5..9307844 100644
+index 608f7a0..130198e 100644
 --- a/src/pages/login/Login.tsx
 +++ b/src/pages/login/Login.tsx
-@@ -23,7 +23,6 @@ const Login: FC = () => {
+@@ -24,7 +24,6 @@ const Login: FC = () => {
-   return (
      <CustomLayout>
-       <div className="empty-state login">
+       <Row className="empty-state">
--        <Icon name="containers" className="empty-state-icon lxd-icon" />
+         <Col size={6} className="col-start-large-4">
-         <h1 className="p-heading--4 u-sv-2">Login</h1>
+-          <Icon name="containers" className="empty-state-icon lxd-icon" />
-         {hasOidc && (
+           <h1 className="p-heading--4 u-sv-2">Login</h1>
-           <>
+           {hasOidc && (
-diff --git a/src/sass/_pattern_icon.scss b/src/sass/_pattern_icon.scss
+             <>
-index 21254c8..f6da7f9 100644
---- a/src/sass/_pattern_icon.scss
-+++ b/src/sass/_pattern_icon.scss
-@@ -1,14 +1,3 @@
--@mixin lxdui-icon-sidebar-collapse() {
--  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 16 16' width='16px' height='16px' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M 0 7.743 L 6.742 14.485 L 7.899 13.329 L 2.311 7.743 L 7.899 2.157 L 6.742 1 L 0 7.743 Z M 7.899 7.743 L 14.642 14.485 L 15.797 13.329 L 10.21 7.743 L 15.797 2.157 L 14.642 1 L 7.899 7.743 Z' fill='%23FFF' style=''/%3E%3C/svg%3E");
--}
--
--@mixin lxdui-p-icon {
--  .p-icon--sidebar-toggle {
--    @extend %icon;
--    @include lxdui-icon-sidebar-collapse;
--  }
--}
--
- .p-icon--info--notification {
-   @extend %icon;
-   @include vf-icon-info-coloured-themed;
 diff --git a/src/sass/_pattern_navigation.scss b/src/sass/_pattern_navigation.scss
 index 92236ef..1373ab0 100644
 --- a/src/sass/_pattern_navigation.scss
@@ -299,18 +278,10 @@ index 92236ef..1373ab0 100644
    }
  }
 diff --git a/src/sass/styles.scss b/src/sass/styles.scss
-index 34d155d..1f37774 100644
+index 43f63ae..7aa17ac 100644
 --- a/src/sass/styles.scss
 +++ b/src/sass/styles.scss
-@@ -4,7 +4,6 @@
+@@ -146,10 +146,6 @@ body {
- @import "vanilla-framework/scss/build";
- @import "./breakpoints";
- @import "pattern_icon";
--@include lxdui-p-icon;
- @include vf-p-icon-add-canvas;
- @include vf-p-icon-applications;
- @include vf-p-icon-begin-downloading;
-@@ -148,10 +147,6 @@ body {
    @include vf-icon-external-link($color-link);
  }
  
@@ -322,10 +293,10 @@ index 34d155d..1f37774 100644
    display: inline-block;
    min-width: 8.5rem;
 diff --git a/src/util/title.tsx b/src/util/title.tsx
-index 3ef659b..879efb9 100644
+index 8a80a11..6b69387 100644
 --- a/src/util/title.tsx
 +++ b/src/util/title.tsx
-@@ -6,6 +6,6 @@ export const setTitle = (): void => {
+@@ -6,6 +6,6 @@ export const setTitle = () => {
  
    useEffect(() => {
      const host = settings?.config?.["user.ui_title"] ?? location.hostname;

pkgs/incus-ui/ui-canonical-0002-Update-navigation.patch

@@ -1,7 +1,7 @@
-From 4a477c328eada5d3b3dfee39b6949dc97c36f813 Mon Sep 17 00:00:00 2001
+From 9f44a025b61024f47c8eabcf9a0f25af0d2585da Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
 Date: Wed, 22 Nov 2023 23:02:27 +0000
-Subject: [PATCH 2/8] Update navigation
+Subject: [PATCH 2/6] Update navigation
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,29 +14,29 @@ Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
-index 147676a..64a97d3 100644
+index d2321da..f79deeb 100644
 --- a/src/components/Navigation.tsx
 +++ b/src/components/Navigation.tsx
-@@ -261,7 +261,7 @@ const Navigation: FC = () => {
+@@ -286,7 +286,7 @@ const Navigation: FC = () => {
                    <li className="p-side-navigation__item">
                      <a
                        className="p-side-navigation__link"
 -                      href="https://discourse.ubuntu.com/c/lxd/126"
 +                      href="https://discuss.linuxcontainers.org"
                        target="_blank"
-                       rel="noopener noreferrer"
+                       rel="noreferrer"
                        title="Discussion"
-@@ -276,7 +276,7 @@ const Navigation: FC = () => {
+@@ -301,7 +301,7 @@ const Navigation: FC = () => {
                    <li className="p-side-navigation__item">
                      <a
                        className="p-side-navigation__link"
 -                      href="https://github.com/canonical/lxd-ui/issues/new"
 +                      href="https://github.com/zabbly/incus/issues/new"
                        target="_blank"
-                       rel="noopener noreferrer"
+                       rel="noreferrer"
                        title="Report a bug"
 diff --git a/src/components/NoMatch.tsx b/src/components/NoMatch.tsx
-index a088c54..65216fa 100644
+index 8d5270c..bd9e515 100644
 --- a/src/components/NoMatch.tsx
 +++ b/src/components/NoMatch.tsx
 @@ -13,7 +13,7 @@ const NoMatch: FC = () => {
@@ -46,21 +46,21 @@ index a088c54..65216fa 100644
 -              href="https://github.com/canonical/lxd-ui/issues/new"
 +              href="https://github.com/zabbly/incus/issues/new"
                target="_blank"
-               rel="noopener noreferrer"
+               rel="noreferrer"
                title="Report a bug"
 diff --git a/src/context/useDocs.tsx b/src/context/useDocs.tsx
-index 900688f..be3e593 100644
+index 454d98c..90a0de9 100644
 --- a/src/context/useDocs.tsx
 +++ b/src/context/useDocs.tsx
 @@ -1,7 +1,7 @@
- import { useSupportedFeatures } from "./useSupportedFeatures";
+ import { useSettings } from "context/useSettings";
  
  export const useDocs = (): string => {
 -  const remoteBase = "https://documentation.ubuntu.com/lxd/en/latest";
 +  const remoteBase = "/documentation";
    const localBase = "/documentation";
  
-   const { hasLocalDocumentation } = useSupportedFeatures();
+   const { data: settings } = useSettings();
 -- 
 2.34.1
 

pkgs/incus-ui/ui-canonical-0003-Update-certificate-generation.patch

@@ -1,7 +1,7 @@
-From 767dff6c01f0c8195f4044beb3059533a814212a Mon Sep 17 00:00:00 2001
+From fc42d29bfc591a2f3a31cb7355ac5a6fb2f64614 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
 Date: Wed, 22 Nov 2023 23:03:33 +0000
-Subject: [PATCH 3/8] Update certificate generation
+Subject: [PATCH 3/6] Update certificate generation
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
  4 files changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/src/pages/login/BrowserImport.tsx b/src/pages/login/BrowserImport.tsx
-index cc9c87a..d8ff1a4 100644
+index f3cbcae..5d11d80 100644
 --- a/src/pages/login/BrowserImport.tsx
 +++ b/src/pages/login/BrowserImport.tsx
 @@ -25,7 +25,7 @@ const BrowserImport: FC<Props> = ({ sendPfx }) => {
@@ -92,7 +92,7 @@ index cc9c87a..d8ff1a4 100644
                </li>
              </ul>
 diff --git a/src/pages/login/CertificateAdd.tsx b/src/pages/login/CertificateAdd.tsx
-index 0e86797..9d227e5 100644
+index e539588..05ed677 100644
 --- a/src/pages/login/CertificateAdd.tsx
 +++ b/src/pages/login/CertificateAdd.tsx
 @@ -52,7 +52,7 @@ const CertificateAdd: FC = () => {
@@ -114,7 +114,7 @@ index 0e86797..9d227e5 100644
                  </Col>
                </Row>
 diff --git a/src/pages/login/CertificateGenerate.tsx b/src/pages/login/CertificateGenerate.tsx
-index 2ea99de..39dce9f 100644
+index e8ce222..3c23645 100644
 --- a/src/pages/login/CertificateGenerate.tsx
 +++ b/src/pages/login/CertificateGenerate.tsx
 @@ -82,7 +82,7 @@ const CertificateGenerate: FC = () => {
@@ -146,7 +146,7 @@ index 2ea99de..39dce9f 100644
                        onClick={() =>
                          downloadText(
 -                          `lxd-ui-${location.hostname}.crt`,
-+                          `incus-ui.crt`,
++                          `incus-ui-${location.hostname}.crt`,
                            certs.crt,
                          )
                        }
@@ -155,7 +155,7 @@ index 2ea99de..39dce9f 100644
                          ? () =>
                              downloadBase64(
 -                              `lxd-ui-${location.hostname}.pfx`,
-+                              `incus-ui.pfx`,
++                              `incus-ui-${location.hostname}.pfx`,
                                certs.pfx,
                              )
                          : undefined

pkgs/incus-ui/ui-canonical-0004-Remove-external-links.patch

@@ -1,7 +1,7 @@
-From 5e04b21d7e49cc36115687ba8806cacf2fb03512 Mon Sep 17 00:00:00 2001
+From 7d9a5b8d9bbf2408dc8334e34db9f487a691c0b3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
 Date: Wed, 22 Nov 2023 23:12:29 +0000
-Subject: [PATCH 4/8] Remove external links
+Subject: [PATCH 4/6] Remove external links
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
  1 file changed, 11 deletions(-)
 
 diff --git a/src/pages/storage/UploadCustomImageHint.tsx b/src/pages/storage/UploadCustomImageHint.tsx
-index dcad010..eedb1a3 100644
+index 128c658..22c9a1f 100644
 --- a/src/pages/storage/UploadCustomImageHint.tsx
 +++ b/src/pages/storage/UploadCustomImageHint.tsx
 @@ -9,17 +9,6 @@ const UploadCustomImageHint: FC = () => {
@@ -24,7 +24,7 @@ index dcad010..eedb1a3 100644
 -              className="p-notification__action"
 -              href="https://ubuntu.com/tutorials/how-to-install-a-windows-11-vm-using-lxd#1-overview"
 -              target="_blank"
--              rel="noopener noreferrer"
+-              rel="noreferrer"
 -            >
 -              Windows ISO images
 -              <Icon className="external-link-icon" name="external-link" />

pkgs/incus-ui/ui-canonical-0005-Remove-Canonical-image-servers.patch

@@ -1,21 +1,21 @@
-From e36304b2f02f3bb6bb9bc80482afc9b36df2d3c1 Mon Sep 17 00:00:00 2001
+From 98fcec984025deeb3a93cdd1618e3d47abb0d0cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
 Date: Wed, 22 Nov 2023 23:16:13 +0000
-Subject: [PATCH 5/8] Remove Canonical image servers
+Subject: [PATCH 5/6] Remove Canonical image servers
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
 ---
- src/pages/images/ImageSelector.tsx | 51 ++++++------------------------
+ src/pages/images/ImageSelector.tsx | 34 +++++++++---------------------
- 1 file changed, 10 insertions(+), 41 deletions(-)
+ 1 file changed, 10 insertions(+), 24 deletions(-)
 
 diff --git a/src/pages/images/ImageSelector.tsx b/src/pages/images/ImageSelector.tsx
-index ca10169..2123eb4 100644
+index f026ec3..91333be 100644
 --- a/src/pages/images/ImageSelector.tsx
 +++ b/src/pages/images/ImageSelector.tsx
-@@ -33,16 +33,9 @@ interface Props {
+@@ -33,13 +33,9 @@ interface Props {
    onClose: () => void;
  }
  
@@ -26,16 +26,13 @@ index ca10169..2123eb4 100644
 -const minimalJson =
 -  "https://cloud-images.ubuntu.com/minimal/releases/streams/v1/com.ubuntu.cloud:released:download.json";
 -const minimalServer = "https://cloud-images.ubuntu.com/minimal/releases/";
--
--const imagesLxdJson = "https://images.lxd.canonical.com/streams/v1/images.json";
--const imagesLxdServer = "https://images.lxd.canonical.com/";
 +const linuxContainersJson =
 +  "https://images.linuxcontainers.org/streams/v1/images.json";
 +const linuxContainersServer = "https://images.linuxcontainers.org";
  
  const ANY = "any";
  const CONTAINER = "container";
-@@ -75,33 +68,17 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
+@@ -72,14 +68,9 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
  
    const { data: settings, isLoading: isSettingsLoading } = useSettings();
  
@@ -52,39 +49,28 @@ index ca10169..2123eb4 100644
 +    queryFn: () => loadImages(linuxContainersJson, linuxContainersServer),
    });
  
--  const { data: imagesLxdImages = [], isLoading: isImagesLxdLoading } =
--    useQuery({
--      queryKey: [queryKeys.images, imagesLxdServer],
--      queryFn: () => loadImages(imagesLxdJson, imagesLxdServer),
--    });
--
    const { data: localImages = [], isLoading: isLocalImageLoading } = useQuery({
-     queryKey: [queryKeys.images, project],
+@@ -87,8 +78,7 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
      queryFn: () => fetchImageList(project ?? ""),
    });
  
 -  const isLoading =
--    isCiLoading ||
+-    isCiLoading || isMinimalLoading || isLocalImageLoading || isSettingsLoading;
--    isMinimalLoading ||
--    isImagesLxdLoading ||
--    isLocalImageLoading ||
--    isSettingsLoading;
 +  const isLoading = isLciLoading || isLocalImageLoading || isSettingsLoading;
    const archSupported = getArchitectureAliases(
      settings?.environment?.architectures ?? [],
    );
-@@ -110,9 +87,7 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
+@@ -97,8 +87,7 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
      : localImages
          .filter((image) => !image.cached)
          .map(localLxdToRemoteImage)
--        .concat([...canonicalImages].reverse().sort(byLtsFirst))
 -        .concat([...minimalImages].reverse().sort(byLtsFirst))
--        .concat([...imagesLxdImages])
+-        .concat([...canonicalImages].reverse().sort(byLtsFirst))
 +        .concat(linuxContainerImages)
          .filter((image) => archSupported.includes(image.arch));
  
    const archAll = [...new Set(images.map((item) => item.arch))]
-@@ -213,14 +188,8 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
+@@ -199,11 +188,8 @@ const ImageSelector: FC<Props> = ({ onSelect, onClose }) => {
          if (item.created_at) {
            return "Local";
          }
@@ -93,14 +79,11 @@ index ca10169..2123eb4 100644
 -        }
 -        if (item.server === minimalServer) {
 -          return "Ubuntu Minimal";
--        }
--        if (item.server === imagesLxdServer) {
--          return "LXD Images";
 +        if (item.server === linuxContainersServer) {
 +          return "Linux Containers";
          }
-         return "Custom";
        };
+ 
 -- 
 2.34.1
 

pkgs/incus-ui/ui-canonical-0006-Remove-version-check.patch

@@ -1,7 +1,7 @@
-From 9929fa50a7631de81f1d16895f67612555b6c9af Mon Sep 17 00:00:00 2001
+From 02a3fdbde4c5bb60ca12f99f2141f0754f665b1e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
 Date: Fri, 16 Feb 2024 17:32:51 +0000
-Subject: [PATCH 6/8] Remove version check
+Subject: [PATCH 6/6] Remove version check
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/src/components/Version.tsx b/src/components/Version.tsx
-index a9b0741..24bd540 100644
+index acb4c59..9c1d968 100644
 --- a/src/components/Version.tsx
 +++ b/src/components/Version.tsx
 @@ -14,9 +14,7 @@ const Version: FC = () => {

pkgs/incus-ui/ui-canonical-0007-Improve-openfga.patch

@@ -1,32 +0,0 @@
-From 22fc5a8ae2726d0f3dfdbef2f1e228f7dcd3162f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
-Date: Thu, 28 Mar 2024 15:54:43 +0000
-Subject: [PATCH 7/8] Improve OpenFGA support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This makes a few changes to better work with OpenFGA:
- - Don't expect a clear 404 on a non-existing object
-
-Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
----
- src/util/helpers.tsx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx
-index 2825a67..a5e8680 100644
---- a/src/util/helpers.tsx
-+++ b/src/util/helpers.tsx
-@@ -171,7 +171,7 @@ export const checkDuplicateName = (
-   const signal = deduplicateController.signal;
-   return fetch(`/1.0/${target}/${candidate}?project=${project}`, {
-     signal,
--  }).then((response) => response.status === 404);
-+  }).then((response) => response.status === 404 || response.status === 403);
- };
- 
- export const getUrlParam = (paramName: string, url?: string): string | null => {
--- 
-2.34.1
-