Commit Graph

3765 Commits

Author SHA1 Message Date
Aos Dabbagh
1e96f59ecd fix(installer): Fix language check case
When attempting to follow the docs on the installer, this error comes
up:
```
$ clan flash --flake git+https://git.clan.lol/clan/clan-core \
             --ssh-pubkey ~/.ssh/id_ed25519.pub \
             --keymap us \
             --language en_US.utf-8 \
             --dry-run flash-installer

ERROR: Language 'en_US.utf-8' is not a valid language. Run 'clan flash --list-languages' to see a list of possible languages.
```

I only decided to clean up the docs, but I'm also okay with just
downcasing the locales in `list_possible_languages()`.
2024-08-21 08:15:49 +00:00
clan-bot
13d4e5c7f3 Merge pull request 'Revert "Merge pull request 'clanModules: Init nginx module. matrix-synapse: don't assume domain names' (#1906) from Qubasa/clan-core:Qubasa-new-main into main"' (#1941) from Mic92-main into main 2024-08-21 08:14:07 +00:00
Jörg Thalheim
3c04199447 Revert "Merge pull request 'clanModules: Init nginx module. matrix-synapse: don't assume domain names' (#1906) from Qubasa/clan-core:Qubasa-new-main into main"
This reverts commit 88d3223ac0, reversing
changes made to f8c20fcbe1.

Apparently this breaks assumptions about matrix: https://git.clan.lol/clan/clan-core/pulls/1906#issuecomment-13184
2024-08-21 10:03:13 +02:00
clan-bot
fa9bcbede2 Merge pull request 'clanModules/mumble: prefer str instead of string' (#1939) from kenji/clan-core:mumble-str into main 2024-08-20 13:22:24 +00:00
a-kenji
3c916fc4ad clanModules/mumble: prefer str instead of string 2024-08-20 15:15:19 +02:00
clan-bot
45b586dbc6 Merge pull request 'Automatic flake update - nixos-images - 2024-08-20T14:47+02:00' (#1934) from flake-update-nixos-images-2024-08-20 into main 2024-08-20 13:00:08 +00:00
clan-bot
952d5761df Merge pull request 'Automatic flake update - nixpkgs - 2024-08-20T14:47+02:00' (#1935) from flake-update-nixpkgs-2024-08-20 into main 2024-08-20 13:00:08 +00:00
clan-bot
c2e55fbc4f Merge pull request 'Automatic flake update - sops-nix - 2024-08-20T14:47+02:00' (#1936) from flake-update-sops-nix-2024-08-20 into main 2024-08-20 12:59:55 +00:00
clan-bot
f0bc3631a2 Merge pull request 'Automatic flake update - treefmt-nix - 2024-08-20T14:47+02:00' (#1937) from flake-update-treefmt-nix-2024-08-20 into main 2024-08-20 12:59:55 +00:00
Clan Merge Bot
5cc5757455 update flake lock - treefmt-nix - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/4a6d7dccf80a1aa2d04cfaa88d9e5511542a2486' (2024-08-14)
  → 'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a' (2024-08-16)
2024-08-20 14:47:44 +02:00
Clan Merge Bot
70496ed60e update flake lock - sops-nix - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9' (2024-08-05)
  → 'github:Mic92/sops-nix/be0eec2d27563590194a9206f551a6f73d52fa34' (2024-08-12)
2024-08-20 14:47:41 +02:00
Clan Merge Bot
0021784a8a update flake lock - nixpkgs - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/03bd12dcf88b6aabc047fbf909bda4c7e344416c' (2024-08-15)
  → 'github:NixOS/nixpkgs/d2fa2514f041934a6aa261c66dc44829251cffd3' (2024-08-20)
2024-08-20 14:47:38 +02:00
Clan Merge Bot
79440aceaa update flake lock - nixos-images - 2024-08-20T14:47+02:00
Flake lock file updates:

• Updated input 'nixos-images':
    'github:nix-community/nixos-images/617f2cb56213d10574bc6fdb390f6e7f5b551d7e' (2024-08-08)
  → 'github:nix-community/nixos-images/b733f0680a42cc01d6ad53896fb5ca40a66d5e79' (2024-08-19)
2024-08-20 14:47:36 +02:00
kenji
acfa6e2105 Merge pull request 'facts: fix typo' (#1909) from kenji/clan-core:fix-typos into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1909
2024-08-20 11:44:29 +00:00
a-kenji
255a2f5800 facts: fix typo 2024-08-20 11:44:29 +00:00
clan-bot
52e8bc163a Merge pull request 'API/show_block_devices: add option for remote devices' (#1903) from hsjobeki/clan-core:hsjobeki-main into main 2024-08-20 10:10:48 +00:00
Johannes Kirschbauer
db0ebcabf0 init: Set/get single disk 2024-08-20 12:05:22 +02:00
kenji
4f34e136be Merge pull request 'state: remove /home from default state folders' (#1886) from kenji/clan-core:remove-home-from-state into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1886
Reviewed-by: lassulus <clanlol@lassul.us>
2024-08-20 10:02:12 +00:00
a-kenji
c3a491a8d9 state: remove /home from default state folders
Home should not always be set by default.
In the UI we can suggest it, but it catches a lot of state you might not
want to back up.

The default has been moved to be automatically set by vm's in `vm.nix`.
2024-08-20 10:02:12 +00:00
Johannes Kirschbauer
f55e772137 Fix: types 2024-08-20 11:33:23 +02:00
Johannes Kirschbauer
cabdbe5ecd Clan-app: connection check & show remote devices 2024-08-20 09:53:15 +02:00
Johannes Kirschbauer
76ca85ac73 API/show_block_devices: add option for remote devices 2024-08-20 09:53:15 +02:00
clan-bot
88d3223ac0 Merge pull request 'clanModules: Init nginx module. matrix-synapse: don't assume domain names' (#1906) from Qubasa/clan-core:Qubasa-new-main into main 2024-08-19 10:59:16 +00:00
Qubasa
4bf31c2cf6 clanModules: Add acme secret prompt for nginx 2024-08-19 12:53:15 +02:00
Qubasa
e4821a33cb clanModules: Init vaultwarden, the bitwarden server 2024-08-19 12:00:35 +02:00
Qubasa
efd0a0f056 clanModules: Init nginx module. matrix-synapse: don't assume domain names 2024-08-19 12:00:35 +02:00
clan-bot
f8c20fcbe1 Merge pull request 'golem: add golem-provider clan module' (#1890) from DavHau/clan-core:DavHau-dave into main 2024-08-19 09:55:54 +00:00
DavHau
57a19550a0 golem: add golem-provider clan module 2024-08-19 11:50:04 +02:00
clan-bot
f6a6743dcd Merge pull request 'Classgen: fix dict type conversion for trivial dicts' (#1905) from hsjobeki/clan-core:class into main 2024-08-19 06:58:49 +00:00
Johannes Kirschbauer
4139435832 Classgen: fix dict type conversion for trivial dicts 2024-08-19 08:48:31 +02:00
kenji
b61f9de05c Merge pull request 'vars: fix using vars module with multiple machines' (#1891) from kenji/clan-core:fix-vars-multiple-machines into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1891
2024-08-17 14:00:56 +00:00
a-kenji
63b5417c3d vars: fix using vars module with multiple machines
This filters the secrets to only include the secrets managed under `per-machine` and `shared`,
otherwise new deployments will fail, when using the vars module for multiple machines:

```
[vyr] /nix/store/[…]sops-install-secrets: failed to decrypt '/nix/store/[…]/sops/vars/per-machine/draper/garage/admin_token/secret': Error getting data key: 0 successful groups required, got 0
```

This doesn't fix all the edge cases with this approach.
We get a similar error if we deploy shared vars that are not
encrypted for our machine key. This needs to be addressed when
implementing the shared vars functionality.
2024-08-17 14:00:56 +00:00
clan-bot
28b588b36f Merge pull request 'zerotierone: fix with recent nixpkgs update' (#1902) from zerotierone into main 2024-08-16 09:08:18 +00:00
Jörg Thalheim
f3b63232cd bcachefs: use unstable for zfs 2024-08-16 11:04:42 +02:00
Jörg Thalheim
ca4f347598 bump nixpkgs 2024-08-16 11:04:42 +02:00
Jörg Thalheim
466c7cb8bd zerotierone: use our own upgraded zerotierone package in nixos module 2024-08-16 11:04:42 +02:00
Jörg Thalheim
237f762490 zerotierone: fix build against rust 1.80 2024-08-16 10:54:48 +02:00
clan-bot
22ef162d55 Merge pull request 'fix group settings not applied correctly' (#1901) from group-secrets into main 2024-08-15 21:00:54 +00:00
Mic92
14ce2039b0 Merge pull request 'feat(flake): make systems overridable' (#1893) from zimbatm/clan-core:overridable-flake-systems into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1893
2024-08-15 20:53:44 +00:00
Jörg Thalheim
3b40ff8156 fix group settings not applied correctly 2024-08-15 22:52:53 +02:00
zimbatm
4fa4af12dc feat(flake): make systems overridable
Clan users might want to use the flake on different architectures.

This allows them to override the systems input with a new value.
2024-08-15 20:03:56 +02:00
clan-bot
f132038bcd Merge pull request 'fix remaining places not using captured_output' (#1900) from Mic92-flake-update-2024-08-12 into main 2024-08-15 18:00:53 +00:00
Jörg Thalheim
609b208d91 fix remaining places not using captured_output 2024-08-15 19:57:08 +02:00
clan-bot
78643953ad Merge pull request 'use capture_output fixture in more places' (#1899) from Mic92-flake-update-2024-08-12 into main 2024-08-15 17:25:57 +00:00
Jörg Thalheim
223b97d665 use capture in more places 2024-08-15 19:20:01 +02:00
Jörg Thalheim
5f99604f0e remove unused fixture 2024-08-15 19:13:20 +02:00
clan-bot
9a7341872c Merge pull request 'add fixture to capture output more fragile' (#1898) from Mic92-flake-update-2024-08-12 into main 2024-08-15 16:52:37 +00:00
Jörg Thalheim
e51905545d add fixture to capture output in tests less fragile
Now we always remove previous output before capturing.
2024-08-15 18:45:03 +02:00
clan-bot
95f63a8efc Merge pull request 'Mic92-flake-update-2024-08-12' (#1897) from Mic92-flake-update-2024-08-12 into main 2024-08-15 16:06:39 +00:00
Jörg Thalheim
6d764b35f7 test_history_cli: clear capsys before reading from program 2024-08-15 17:59:11 +02:00