diff --git a/_service b/_service
index 6b7143b..ba28b8a 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
https://github.com/kanidm/kanidm.git
@PARENT_TAG@~git@TAG_OFFSET@.%h
git
- 1.1.0-alpha.11
+ 1.1.0-alpha.12
v*
v(\d+\.\d+\.\d+)-alpha\.(\d+)
\1~alpha\2
diff --git a/_servicedata b/_servicedata
index 67e887a..1150da5 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/kanidm/kanidm.git
- d3a2a6b39a23ecc0f05b09068d1f9c7e19a31995
\ No newline at end of file
+ bcdbb1837adc8e18064b93cb0bc3ed15c27e7702
\ No newline at end of file
diff --git a/cargo_config b/cargo_config
index 3da8798..ff8f3ff 100644
--- a/cargo_config
+++ b/cargo_config
@@ -3,7 +3,7 @@ replace-with = "vendored-sources"
[source."https://github.com/QnnOkabayashi/tracing-forest.git"]
git = "https://github.com/QnnOkabayashi/tracing-forest.git"
-rev = "48d78f7294ceee47a22eee5c80964143c4fb3fe1"
+rev = "77daf8c8abf010b87d45ece2bf656983c6f8cecb"
replace-with = "vendored-sources"
[source.vendored-sources]
diff --git a/kanidm-1.1.0~alpha11~git0.d3a2a6b.tar.zst b/kanidm-1.1.0~alpha11~git0.d3a2a6b.tar.zst
deleted file mode 100644
index 5ffa5eb..0000000
--- a/kanidm-1.1.0~alpha11~git0.d3a2a6b.tar.zst
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9372a4963b880faf471dfd4e52903ade85c08ce53efa5398600fbfa02e23e8bc
-size 4467097
diff --git a/kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst b/kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst
new file mode 100644
index 0000000..fa693f3
--- /dev/null
+++ b/kanidm-1.1.0~alpha12~git0.bcdbb18.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:013da24c499564fd7d3bf9453d844d96e9667ae84283e93ec7d17af58e0fc5b7
+size 5133219
diff --git a/kanidm.changes b/kanidm.changes
index a538892..61e5d82 100644
--- a/kanidm.changes
+++ b/kanidm.changes
@@ -1,3 +1,188 @@
+-------------------------------------------------------------------
+Mon May 01 01:18:44 UTC 2023 - william.brown@suse.com
+
+- Update to version 1.1.0~alpha12~git0.bcdbb18:
+ * Release 1.1.0-alpha.12 (#1588)
+ * chore(deps): bump tokio-util from 0.7.7 to 0.7.8 (#1587)
+ * chore(deps): bump reqwest from 0.11.16 to 0.11.17 (#1586)
+ * chore(deps): bump tokio from 1.27.0 to 1.28.0 (#1585)
+ * chore(deps): bump uuid from 1.3.1 to 1.3.2 (#1584)
+ * chore(deps): bump clap from 3.2.23 to 3.2.25 (#1583)
+ * chore(deps-dev): bump coverage from 7.2.3 to 7.2.5 in /pykanidm (#1582)
+ * Correctly prevent start up when https sockets in use (#1579)
+ * Filter rdns and dns for ldap filters (#1576)
+ * use sccache, merge "test" actions into "build", remove homebrew caching (#1578)
+ * Cleanup incorrect log errors of denied entries (#1577)
+ * 20230424 clippppppppppppyyyyyyyy (#1574)
+ * Add exclusive process lock to Kanidm to prevent accidental duplicate commands. (#1575)
+ * more more more unixd build fixes (#1573)
+ * chore(deps-dev): bump mkdocs-material from 9.1.7 to 9.1.8 in /pykanidm (#1572)
+ * chore(deps): bump openssl from 0.10.51 to 0.10.52 (#1571)
+ * chore(deps): bump openssl-sys from 0.9.86 to 0.9.87 (#1570)
+ * chore(deps-dev): bump ruff from 0.0.262 to 0.0.263 in /pykanidm (#1569)
+ * more-merge unixd commands (#1568)
+ * Consolidate unix tools (#1566)
+ * 1553 pam remote or local detection (#1565)
+ * chore(deps): bump openssl from 0.10.50 to 0.10.51 (#1563)
+ * Improve user experince of refreshing with intent tokens during cred update (#1556)
+ * chore(deps): bump tracing-subscriber from 0.3.16 to 0.3.17 (#1562)
+ * chore(deps): bump regex from 1.7.3 to 1.8.1 (#1561)
+ * chore(deps): bump libc from 0.2.141 to 0.2.142 (#1560)
+ * chore(deps-dev): bump ruff from 0.0.261 to 0.0.262 in /pykanidm (#1559)
+ * chore(deps-dev): bump mkdocs-material from 9.1.6 to 9.1.7 in /pykanidm (#1558)
+ * chore(deps): bump actions/upload-artifact from 1 to 3 (#1557)
+ * Fix incompatible future warnings by removing older crates (#1554)
+ * 20230330 oauth2 refresh tokens (#1502)
+ * Sorting documentation builds (#1551)
+ * Add troubleshooting step for pam home dirs (#1550)
+ * AuthSession non empty vec part 2 (#1543)
+ * chore(deps): bump openssl from 0.10.49 to 0.10.50 (#1548)
+ * chore(deps): bump serde from 1.0.159 to 1.0.160 (#1547)
+ * chore(deps): bump syn from 2.0.13 to 2.0.15 (#1546)
+ * chore(deps): bump serde_json from 1.0.95 to 1.0.96 (#1545)
+ * chore(deps-dev): bump pytest from 7.3.0 to 7.3.1 in /pykanidm (#1544)
+ * chore(deps): bump h2 from 0.3.15 to 0.3.17 (#1540)
+ * Improve unicode control character detection (#1539)
+ * chore(deps-dev): bump mkdocstrings-python in /pykanidm (#1533)
+ * chore(deps-dev): bump mypy from 1.0.1 to 1.2.0 in /pykanidm (#1532)
+ * chore(deps): bump filetime from 0.2.20 to 0.2.21 (#1529)
+ * chore(deps-dev): bump mkdocstrings from 0.20.0 to 0.21.2 in /pykanidm (#1536)
+ * chore(deps-dev): bump mkdocs-material from 9.1.5 to 9.1.6 in /pykanidm (#1535)
+ * chore(deps-dev): bump ruff from 0.0.260 to 0.0.261 in /pykanidm (#1534)
+ * chore(deps-dev): bump coverage from 7.2.2 to 7.2.3 in /pykanidm (#1530)
+ * chore(deps): bump uuid from 1.3.0 to 1.3.1 (#1531)
+ * chore(deps): bump syn from 2.0.12 to 2.0.13 (#1527)
+ * chore(deps): bump dialoguer from 0.10.3 to 0.10.4 (#1526)
+ * chore(deps-dev): bump pytest from 7.2.2 to 7.3.0 in /pykanidm (#1528)
+ * chore(deps): bump libc from 0.2.140 to 0.2.141 (#1525)
+ * chore(deps): bump fernet from 0.2.0 to 0.2.1 (#1524)
+ * Authsession non empty vec (#1522)
+ * chore(deps-dev): bump ruff from 0.0.259 to 0.0.260 in /pykanidm (#1506)
+ * chore(deps-dev): bump mkdocs-material from 9.1.4 to 9.1.5 in /pykanidm (#1510)
+ * chore(deps): bump serde from 1.0.158 to 1.0.159 (#1515)
+ * chore(deps): bump openssl from 0.10.48 to 0.10.49 (#1513)
+ * chore(deps): bump tokio from 1.26.0 to 1.27.0 (#1505)
+ * chore(deps): bump openssl-sys from 0.9.83 to 0.9.84 (#1507)
+ * chore(deps): bump futures from 0.3.27 to 0.3.28 (#1509)
+ * chore(deps): bump reqwest from 0.11.15 to 0.11.16 (#1517)
+ * chore(deps-dev): bump black from 23.1.0 to 23.3.0 in /pykanidm (#1514)
+ * changing from merge to squash (#1521)
+ * chore(deps): bump proc-macro2 from 1.0.54 to 1.0.56
+ * fixing up auto-merge (#1519)
+ * chore(deps): bump syn from 2.0.10 to 2.0.12 (#1511)
+ * chore(deps-dev): bump types-toml from 0.10.8.5 to 0.10.8.6 in /pykanidm (#1504)
+ * chore(deps): bump serde_json from 1.0.94 to 1.0.95 (#1516)
+ * chore(deps): bump ldap3_proto from 0.3.1 to 0.3.2 (#1518)
+ * chore(deps): bump syn from 1.0.109 to 2.0.10 (#1499)
+ * Be non empty vec (#1501)
+ * 1496 ldap basedn config (#1500)
+ * chore(deps): bump proc-macro2 from 1.0.52 to 1.0.54 (#1494)
+ * chore(deps): bump regex from 1.7.1 to 1.7.3 (#1491)
+ * chore(deps): bump pydantic from 1.10.6 to 1.10.7 in /pykanidm (#1492)
+ * chore(deps-dev): bump mkdocs-material from 9.1.3 to 9.1.4 in /pykanidm (#1487)
+ * chore(deps): bump async-trait from 0.1.67 to 0.1.68 (#1488)
+ * Improve string validation (#1497)
+ * chore(deps): bump reqwest from 0.11.14 to 0.11.15 (#1493)
+ * chore(deps-dev): bump ruff from 0.0.257 to 0.0.259 in /pykanidm (#1489)
+ * chore(deps): bump serde from 1.0.157 to 1.0.158 (#1490)
+ * Adding an auto-merger for dependabot updates (#1486)
+ * Make examples in ldap chapter consistent (#1495)
+ * 1115 priv (reauth, sudo) mode (#1479)
+ * chore(deps): bump openssl from 0.10.47 to 0.10.48 (#1484)
+ * Server daemon logging and exit codes (#1475)
+ * Fix path-relative links in documentation (#1478)
+ * chore(deps): bump openssl from 0.10.45 to 0.10.47 (#1471)
+ * chore(deps): bump serde from 1.0.155 to 1.0.157 (#1473)
+ * chore(deps-dev): bump mkdocs-material from 9.1.2 to 9.1.3 in /pykanidm (#1468)
+ * chore(deps-dev): bump pylint-pydantic from 0.1.7 to 0.1.8 in /pykanidm (#1469)
+ * chore(deps-dev): bump coverage from 7.2.1 to 7.2.2 in /pykanidm (#1463)
+ * chore(deps-dev): bump ruff from 0.0.254 to 0.0.257 in /pykanidm (#1466)
+ * chore(deps): bump async-trait from 0.1.66 to 0.1.67 (#1461)
+ * chore(deps): bump whoami from 1.3.0 to 1.4.0 (#1460)
+ * chore(deps): bump zxcvbn from 2.2.1 to 2.2.2 (#1464)
+ * chore(deps): bump openssl-sys from 0.9.80 to 0.9.82 (#1470)
+ * chore(deps-dev): bump pytest-asyncio from 0.20.3 to 0.21.0 in /pykanidm (#1459)
+ * Add unixd exit code (#1453)
+ * Unixd daemon improvement (#1454)
+ * chore(deps): bump walkdir from 2.3.2 to 2.3.3 (#1458)
+ * checks for a minimum number of arguments (#1452)
+ * chore(deps): bump chrono from 0.4.23 to 0.4.24 (#1444)
+ * chore(deps): bump futures from 0.3.26 to 0.3.27 (#1447)
+ * chore(deps): bump paste from 1.0.11 to 1.0.12 (#1449)
+ * chore(deps-dev): bump mkdocs-material from 9.1.1 to 9.1.2 in /pykanidm (#1450)
+ * chore(deps): bump csv from 1.2.0 to 1.2.1 (#1443)
+ * chore(deps): bump libc from 0.2.139 to 0.2.140 (#1442)
+ * chore(deps): bump serde from 1.0.152 to 1.0.155 (#1446)
+ * chore(deps): bump pydantic from 1.10.5 to 1.10.6 in /pykanidm (#1448)
+ * Image fixes in the build (#1441)
+ * Fix RADIUS docker image file permissions (#1439)
+ * User auth token session display implementation (#1415)
+ * RADIUS container fixes (#1424)
+ * Update book - OAuth2 integration step (#1437)
+ * chore(deps): bump async-trait from 0.1.64 to 0.1.66 (#1433)
+ * Hopefully fix exp issues by making it a stable part of the access token. (#1434)
+ * chore(deps): bump base64 from 0.13.1 to 0.21.0 (#1350)
+ * chore(deps): bump serde_json from 1.0.93 to 1.0.94 (#1427)
+ * chore(deps-dev): bump pytest from 7.2.1 to 7.2.2 in /pykanidm (#1431)
+ * chore(deps-dev): bump pylint-pydantic from 0.1.6 to 0.1.7 in /pykanidm (#1430)
+ * chore(deps-dev): bump ruff from 0.0.253 to 0.0.254 in /pykanidm (#1429)
+ * chore(deps-dev): bump mkdocs-material from 9.0.15 to 9.1.1 in /pykanidm (#1428)
+ * Openssl build fix (#1422)
+ * 1399 some async cleanup (#1421)
+ * Web UI: Sort group memberships of profile (#1410)
+ * Update the dev docs to flow nicer (#1420)
+ * chore(deps): bump dyn-clone from 1.0.10 to 1.0.11 (#1417)
+ * chore(deps): bump tokio from 1.25.0 to 1.26.0 (#1418)
+ * chore(deps-dev): bump coverage from 7.1.0 to 7.2.1 in /pykanidm (#1405)
+ * chore(deps-dev): bump ruff from 0.0.230 to 0.0.253 in /pykanidm (#1419)
+ * 1399 cleanup cli docs (#1413)
+ * 1399 cleanup reorg (#1412)
+ * 1399 cleanup (#1409)
+ * Version output for 4 unix_int tools (#1408)
+ * Windows build fixes (#1388)
+ * chore(deps): bump num_enum from 0.5.10 to 0.5.11 (#1404)
+ * chore(deps-dev): bump types-toml from 0.10.8.4 to 0.10.8.5 in /pykanidm (#1407)
+ * chore(deps): bump syn from 1.0.107 to 1.0.109 (#1406)
+ * chore(deps-dev): bump mkdocs-material from 9.0.13 to 9.0.15 in /pykanidm (#1403)
+ * Mention my Recursing of the Passport (#1402)
+ * Start to add reauth capabilities (#1398)
+ * Add Recursive Logos (#1401)
+ * Prevent invalidation of api tokens (#1397)
+ * chore(deps): bump tokio-util from 0.7.4 to 0.7.7 (#1378)
+ * chore(deps): bump web-sys from 0.3.60 to 0.3.61 (#1362)
+ * chore(deps): bump filetime from 0.2.19 to 0.2.20 (#1375)
+ * chore(deps): bump pydantic from 1.10.4 to 1.10.5 in /pykanidm (#1392)
+ * chore(deps-dev): bump mkdocs-material from 9.0.12 to 9.0.13 in /pykanidm (#1394)
+ * chore(deps): bump num_enum from 0.5.9 to 0.5.10 (#1391)
+ * chore(deps-dev): bump types-toml from 0.10.8.3 to 0.10.8.4 in /pykanidm (#1395)
+ * chore(deps-dev): bump mypy from 1.0.0 to 1.0.1 in /pykanidm (#1390)
+ * chore(deps): bump csv from 1.1.6 to 1.2.0 (#1393)
+ * chore(deps): bump base64urlsafedata from 0.1.2 to 0.1.3 (#1389)
+ * 20230220 passkey cleanup (#1396)
+ * 1115 store credential ids per session (#1386)
+ * Reduce the number of cow cells in idm (#1385)
+ * 1355 docker builds (#1384)
+ * chore(deps): bump proc-macro2 from 1.0.50 to 1.0.51 (#1369)
+ * Improve some small behaviours of login and key management (#1383)
+ * 967 oauth2 implicit search (#1382)
+ * chore(deps): bump wasm-bindgen-test from 0.3.33 to 0.3.34 (#1364)
+ * chore(deps): bump serde_json from 1.0.91 to 1.0.93 (#1376)
+ * chore(deps-dev): bump black from 22.12.0 to 23.1.0 in /pykanidm (#1367)
+ * chore(deps-dev): bump pylint-pydantic from 0.1.5 to 0.1.6 in /pykanidm (#1351)
+ * chore(deps-dev): bump coverage from 7.0.5 to 7.1.0 in /pykanidm (#1352)
+ * 20230130 hackweek replication (#1358)
+ * Improve some diagnostic messages in console (#1381)
+ * chore(deps): bump docker/build-push-action from 3 to 4 (#1360)
+ * chore(deps): bump aiohttp from 3.8.3 to 3.8.4 in /pykanidm (#1377)
+ * chore(deps-dev): bump mypy from 0.991 to 1.0.0 in /pykanidm (#1380)
+ * chore(deps): bump uuid from 1.2.2 to 1.3.0 (#1368)
+ * chore(deps-dev): bump mkdocs-material from 9.0.6 to 9.0.12 in /pykanidm (#1379)
+ * chore(deps-dev): bump types-toml from 0.10.8.1 to 0.10.8.3 in /pykanidm (#1374)
+ * chore(deps): bump cryptography from 39.0.0 to 39.0.1 in /pykanidm (#1371)
+ * Update release docs to prevent forgetting a release step (#1370)
+ * 1355 docker builds (#1357)
+ * Update to 12 dev (#1356)
+
-------------------------------------------------------------------
Fri Apr 14 00:02:31 UTC 2023 - William Brown
diff --git a/kanidm.spec b/kanidm.spec
index 507c2fb..ba661f1 100644
--- a/kanidm.spec
+++ b/kanidm.spec
@@ -19,7 +19,7 @@
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2
Name: kanidm
-Version: 1.1.0~alpha11~git0.d3a2a6b
+Version: 1.1.0~alpha12~git0.bcdbb18
Release: 0
Summary: A identity management service and clients.
License: ( Apache-2.0 OR BSL-1.0 ) AND ( Apache-2.0 OR ISC OR MIT ) AND ( Apache-2.0 OR MIT ) AND ( Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT ) AND ( CC0-1.0 OR Apache-2.0 ) AND ( MIT OR Apache-2.0 OR Zlib ) AND ( Unlicense OR MIT ) AND ( Zlib OR Apache-2.0 OR MIT ) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT AND MPL-2.0 AND MPL-2.0+
@@ -135,13 +135,11 @@ install -D -d -m 0755 %{buildroot}%{_datadir}/kanidm/ui/pkg/external
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidmd %{buildroot}%{_sbindir}/kanidmd
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm %{buildroot}%{_bindir}/kanidm
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_cache_clear %{buildroot}%{_sbindir}/kanidm_cache_clear
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_cache_invalidate %{buildroot}%{_sbindir}/kanidm_cache_invalidate
+install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm-unix %{buildroot}%{_sbindir}/kanidm-unix
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_ssh_authorizedkeys %{buildroot}%{_sbindir}/kanidm_ssh_authorizedkeys
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_ssh_authorizedkeys_direct %{buildroot}%{_sbindir}/kanidm_ssh_authorizedkeys_direct
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_unixd %{buildroot}%{_sbindir}/kanidm_unixd
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_unixd_tasks %{buildroot}%{_sbindir}/kanidm_unixd_tasks
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/kanidm_unixd_status %{buildroot}%{_bindir}/kanidm_unixd_status
install -m 0644 %{_builddir}/%{name}-%{version}/target/release/libnss_kanidm.so %{buildroot}%{_libdir}/libnss_kanidm.so.2
%if 0%{?suse_version} > 1549
install -m 0644 %{_builddir}/%{name}-%{version}/target/release/libpam_kanidm.so %{buildroot}/%{_pam_moduledir}/pam_kanidm.so
@@ -157,31 +155,25 @@ install -m 0640 %{_builddir}/%{name}-%{version}/examples/server.toml %{buildroot
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidmd %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidmd
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_ssh_authorizedkeys_direct %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys_direct
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_cache_clear %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_cache_clear
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_cache_invalidate %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_cache_invalidate
+install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_unix %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_unix
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_ssh_authorizedkeys %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/_kanidm_unixd_status %{buildroot}%{_sysconfdir}/zsh_completion.d/_kanidm_unixd_status
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidmd.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidmd.sh
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm.sh
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_ssh_authorizedkeys_direct.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys_direct.sh
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_cache_clear.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_cache_clear.sh
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_cache_invalidate.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_cache_invalidate.sh
+install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_unix.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_unix.sh
install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_ssh_authorizedkeys.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys.sh
-install -m 0755 %{_builddir}/%{name}-%{version}/target/release/build/completions/kanidm_unixd_status.bash %{buildroot}%{_sysconfdir}/bash_completion.d/kanidm_unixd_status.sh
-# rm %{_builddir}/%{name}-%{version}/kanidm_book/src/DEVELOPER_README.md
-# cp %{_builddir}/%{name}-%{version}/DEVELOPER_README.md %{_builddir}/%{name}-%{version}/kanidm_book/src/DEVELOPER_README.md
-cp -r %{_builddir}/%{name}-%{version}/kanidm_book/src/ %{buildroot}%{_datadir}/kanidm/docs/
+cp -r %{_builddir}/%{name}-%{version}/book/src/ %{buildroot}%{_datadir}/kanidm/docs/
## TODO: Add /usr/share/kanidm/ui/pkg
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/style.css %{buildroot}%{_datadir}/kanidm/ui/pkg/style.css
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/kanidmd_web_ui.js %{buildroot}%{_datadir}/kanidm/ui/pkg/kanidmd_web_ui.js
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm %{buildroot}%{_datadir}/kanidm/ui/pkg/kanidmd_web_ui_bg.wasm
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/package.json %{buildroot}%{_datadir}/kanidm/ui/pkg/package.json
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/external/bootstrap.min.css %{buildroot}%{_datadir}/kanidm/ui/pkg/external/bootstrap.min.css
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/external/bootstrap.bundle.min.js %{buildroot}%{_datadir}/kanidm/ui/pkg/external/bootstrap.bundle.min.js
-install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/external/confetti.js %{buildroot}%{_datadir}/kanidm/ui/pkg/external/confetti.js
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/style.css %{buildroot}%{_datadir}/kanidm/ui/pkg/style.css
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/kanidmd_web_ui.js %{buildroot}%{_datadir}/kanidm/ui/pkg/kanidmd_web_ui.js
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/kanidmd_web_ui_bg.wasm %{buildroot}%{_datadir}/kanidm/ui/pkg/kanidmd_web_ui_bg.wasm
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/package.json %{buildroot}%{_datadir}/kanidm/ui/pkg/package.json
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/external/bootstrap.min.css %{buildroot}%{_datadir}/kanidm/ui/pkg/external/bootstrap.min.css
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/external/bootstrap.bundle.min.js %{buildroot}%{_datadir}/kanidm/ui/pkg/external/bootstrap.bundle.min.js
+install -m 0644 %{_builddir}/%{name}-%{version}/server/web_ui/pkg/external/confetti.js %{buildroot}%{_datadir}/kanidm/ui/pkg/external/confetti.js
## End install
@@ -281,27 +273,21 @@ install -m 0644 %{_builddir}/%{name}-%{version}/kanidmd_web_ui/pkg/external/conf
%else
/%_lib/security/pam_kanidm.so
%endif
-%{_sbindir}/kanidm_cache_clear
-%{_sbindir}/kanidm_cache_invalidate
+%{_sbindir}/kanidm-unix
%{_sbindir}/kanidm_ssh_authorizedkeys
%{_sbindir}/kanidm_ssh_authorizedkeys_direct
%{_sbindir}/kanidm_unixd
%{_sbindir}/kanidm_unixd_tasks
-%{_bindir}/kanidm_unixd_status
%{_unitdir}/kanidm-unixd.service
%{_unitdir}/kanidm-unixd-tasks.service
%dir %{_sysconfdir}/zsh_completion.d
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys_direct
-%{_sysconfdir}/zsh_completion.d/_kanidm_cache_clear
-%{_sysconfdir}/zsh_completion.d/_kanidm_cache_invalidate
%{_sysconfdir}/zsh_completion.d/_kanidm_ssh_authorizedkeys
-%{_sysconfdir}/zsh_completion.d/_kanidm_unixd_status
+%{_sysconfdir}/zsh_completion.d/_kanidm_unix
%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys_direct.sh
-%{_sysconfdir}/bash_completion.d/kanidm_cache_clear.sh
-%{_sysconfdir}/bash_completion.d/kanidm_cache_invalidate.sh
%{_sysconfdir}/bash_completion.d/kanidm_ssh_authorizedkeys.sh
-%{_sysconfdir}/bash_completion.d/kanidm_unixd_status.sh
+%{_sysconfdir}/bash_completion.d/kanidm_unix.sh
%files docs
%dir %{_datadir}/kanidm
diff --git a/vendor.tar.zst b/vendor.tar.zst
index 7d4872f..0beb52f 100644
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a456ff8b0dfc552fa54e508c7f351462702659cce8d03d8dd16aa22a4bea1317
-size 77273961
+oid sha256:7977e5a912a9425c5a1004451ac1686a48d58eb54de110de7699074267ae776a
+size 75233448