Clan Merge Bot
|
e66d61bb69
|
update flake lock - 2023-09-18T00:00+00:00
Flake lock file updates:
• Updated input 'disko':
'github:nix-community/disko/be98cffef02e5ebf438ea80b34b86e669c48eff1' (2023-09-12)
→ 'github:nix-community/disko/9ab96378f8cf602d5f3ce5a32f2c339509288d8e' (2023-09-17)
• Updated input 'floco':
'github:aakropotkin/floco/1e84b4b16bba5746e1195fa3a4d8addaaf2d9ef4' (2023-08-03)
→ 'github:aakropotkin/floco/d16bd444ab9d29a6640f52ee4e43a66528e07515' (2023-09-16)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11)
→ 'github:NixOS/nixpkgs/ace5093e36ab1e95cb9463863491bee90d5a4183' (2023-09-15)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/b8d3a059f5487d6767d07c3716386753e3132d9f' (2023-09-04)
→ 'github:numtide/treefmt-nix/7a49c388d7a6b63bb551b1ddedfa4efab8f400d8' (2023-09-12)
|
2023-09-19 13:32:51 +02:00 |
|
clan-bot
|
4c95896e1a
|
Merge pull request 'devShell: use rm -f to clean up old pre-commit file' (#304) from Mic92-vm-api into main
|
2023-09-19 11:30:53 +00:00 |
|
Jörg Thalheim
|
81bc0d7ea4
|
devShell: use rm -f to clean up old pre-commit file
|
2023-09-19 13:20:12 +02:00 |
|
clan-bot
|
90718da5b4
|
Merge pull request 'use experimental flags everywhere' (#298) from Mic92-vm-api into main
|
2023-09-19 11:16:30 +00:00 |
|
Jörg Thalheim
|
e753b9a87f
|
try to fix ci by pinning nix-fast-build
|
2023-09-19 13:14:44 +02:00 |
|
Jörg Thalheim
|
f6a7e42e38
|
cli: rename admin create to create
|
2023-09-19 13:12:10 +02:00 |
|
Jörg Thalheim
|
164f95723d
|
pytest: add impure marker
|
2023-09-19 13:12:10 +02:00 |
|
Jörg Thalheim
|
d41cca2e28
|
add clan_core path helper function
|
2023-09-19 13:12:10 +02:00 |
|
Jörg Thalheim
|
a65413c98e
|
use experimental flags everywhere
|
2023-09-19 13:12:10 +02:00 |
|
clan-bot
|
4a1dcc1639
|
Merge pull request 'add join clan page' (#300) from feat/join-ui into main
|
2023-09-16 14:31:33 +00:00 |
|
Johannes Kirschbauer
|
18714d6657
|
reformat
|
2023-09-16 16:28:36 +02:00 |
|
Johannes Kirschbauer
|
3db0285a3b
|
merge conflicts
|
2023-09-16 16:24:02 +02:00 |
|
Johannes Kirschbauer
|
1bcff16b66
|
add join clan page
|
2023-09-16 16:21:33 +02:00 |
|
Mic92
|
8dc70659d4
|
Merge pull request 'extend dev CORS flag to include methods' (#299) from cors into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/299
|
2023-09-16 08:59:52 +00:00 |
|
Jörg Thalheim
|
32b2e4c084
|
extend dev CORS flag to include methods
|
2023-09-16 10:57:12 +02:00 |
|
Mic92
|
447d071ea3
|
Merge pull request 'vm api' (#292) from vm-api into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/292
|
2023-09-15 14:02:40 +00:00 |
|
Jörg Thalheim
|
a29f301f84
|
add vms
|
2023-09-15 14:02:40 +00:00 |
|
Mic92
|
b46c40482a
|
Merge pull request 'nix_build: add experimental flags' (#297) from nix-build into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/297
|
2023-09-15 13:55:37 +00:00 |
|
Jörg Thalheim
|
8a96254100
|
nix_build: add experimental flags
|
2023-09-15 14:30:17 +02:00 |
|
Mic92
|
5dc72b092b
|
Merge pull request 'secrets: add password-store & deploy command' (#263) from lassulus-pass-secrets into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/263
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
8d29d0e69c
|
clan-cli: get deploymentAddress from clan.networking
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
0132abc547
|
secrets: use CLAN_DIR instead of clanCore.clanDir for fact storage
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
6b7301cefb
|
clanCore secrets: document custom store
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
a59e8478fa
|
clan-cli nix_build_machine: don't create result link
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
c5c2a848c7
|
secrets pass: append openssh to PATH so we use systems openssh first
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
c5786614bf
|
clan-cli secrets: deploy -> upload
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
55fc055549
|
clan_cli/nix: convert path to string
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
acf1c0b87a
|
lib jsonschema: add path
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
c487280ba9
|
clan-cli machines update: generate and deploy secrets
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
0e3f8bb3f9
|
clan-cli nix_build_machine: cast flake_url to str
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
23c979f8db
|
secrets deploy/generate: use nix_build_machine
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
6153a9ee71
|
clanCore.secrets: set default and add generate/deploy composite
|
2023-09-15 12:17:07 +00:00 |
|
Jörg Thalheim
|
3b0701f275
|
deploy: use nix-flake-archive instead of rsync to upload
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
ac13c5b76b
|
clan-cli secrets: add deploy subcommand
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
285041026d
|
clanCore sops: add dummy deployScript
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
798e85ee8a
|
clan secrets generate: use get_clan_flake_toplevel
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
5285423479
|
secrets: add password-store implementation
|
2023-09-15 12:17:07 +00:00 |
|
lassulus
|
3f6fa0eeca
|
clanCore secrets: add secretStore option
|
2023-09-15 12:17:07 +00:00 |
|
clan-bot
|
a043368ed6
|
Merge pull request 'nix_eval: add --json by default' (#296) from Mic92-foo into main
|
2023-09-15 11:53:03 +00:00 |
|
Jörg Thalheim
|
9b7b6996d6
|
nix_eval: add --json by default
|
2023-09-15 13:50:31 +02:00 |
|
clan-bot
|
39271fe2dc
|
Merge pull request 'add ipdb to python breakpoint()' (#295) from Mic92-ipdb-breakpoint into main
|
2023-09-15 11:46:57 +00:00 |
|
Jörg Thalheim
|
a8ba56de63
|
add ipdb to python breakpoint()
|
2023-09-15 13:45:01 +02:00 |
|
clan-bot
|
1d1056b6fa
|
Merge pull request 'cli: rename clan_flake to test_flake' (#294) from Mic92-test_flake into main
|
2023-09-15 10:38:09 +00:00 |
|
Jörg Thalheim
|
87f0b090ef
|
cli: rename clan_flake to test_flake
|
2023-09-15 12:36:16 +02:00 |
|
clan-bot
|
54ac8b6269
|
Merge pull request 'drop useless test_update test' (#291) from Mic92-clan-fixture into main
|
2023-09-14 15:28:25 +00:00 |
|
Jörg Thalheim
|
2697ad54b7
|
drop useless test_update test
This test was not finished by me?
Now it's going to be broken by lassulus.
|
2023-09-14 17:25:48 +02:00 |
|
clan-bot
|
28bc5fa058
|
Merge pull request 'rename machine_flake back to clan_flake' (#290) from Mic92-clan-fixture into main
|
2023-09-14 15:07:56 +00:00 |
|
Jörg Thalheim
|
02f421546c
|
rename machine_flake back to clan_flake
|
2023-09-14 17:06:07 +02:00 |
|
clan-bot
|
f9a5362245
|
Merge pull request 'drop clan_flake fixture' (#289) from Mic92-clan-fixture into main
|
2023-09-14 15:00:29 +00:00 |
|
Jörg Thalheim
|
2048ffccb0
|
drop clan_flake fixture
|
2023-09-14 16:57:48 +02:00 |
|