Commit Graph

483 Commits

Author SHA1 Message Date
lassulus
9fca1e7f43 move clanCore into nixosModules, add secrets generate command 2023-08-29 16:28:50 +02:00
lassulus
5e2e95e9c7 clan-cli: add zerotier subcommand 2023-08-29 16:16:11 +02:00
Mic92
754bfee3fd Merge pull request 'clan template: reduce autogenerate code to a minimum' (#207) from Mic92-simplify-template into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/207
2023-08-29 13:54:06 +00:00
Jörg Thalheim
98a379d4fa clan-cli: fix build if lassulus does an impure build 2023-08-29 13:54:06 +00:00
Jörg Thalheim
a4e182debf clan template: reduce autogenerate code to a minimum 2023-08-29 13:54:06 +00:00
clan-bot
bf19e51c9f Merge pull request 'new-clan: drop unused import code' (#205) from Mic92-main into main 2023-08-29 12:16:29 +00:00
Jörg Thalheim
8ca8816d71 new-clan: drop unused import code 2023-08-29 14:15:45 +02:00
clan-bot
9701ce3a7f Merge pull request 'clan-cli: fix nixpkgs symlink location' (#204) from Mic92-main into main 2023-08-29 11:23:07 +00:00
Jörg Thalheim
a0467dd259 clan-cli: fix nixpkgs symlink location 2023-08-29 13:12:56 +02:00
clan-bot
1602dde04a Merge pull request 'Automatic flake update - 2023-08-28T00:00+00:00' (#202) from flake-update-2023-08-28 into main 2023-08-28 00:03:19 +00:00
Clan Merge Bot
6bd7ec5974 update flake lock - 2023-08-28T00:00+00:00
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/91a22f76cd1716f9d0149e8a5c68424bb691de15' (2023-08-21)
  → 'github:NixOS/nixpkgs/5690c4271f2998c304a45c91a0aeb8fb69feaea7' (2023-08-25)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/1b7b3a32d65dbcd69c217d7735fdf0a6b2184f45' (2023-08-22)
  → 'github:Mic92/sops-nix/0618c8f0ed5255ad74ee08d1618841ff5af85c86' (2023-08-27)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/e2761d701581d8dcc4e0e88aecfde317ddf6f0cd' (2023-08-20)
  → 'github:numtide/treefmt-nix/843e1e1b01ac7c9e858368fffd1692cbbdbe4a0e' (2023-08-25)
2023-08-28 00:00:13 +00:00
clan-bot
edad9fd62a Merge pull request 'clan-cli: Fixed CORS issue. UI: Readded id as tableData property' (#201) from Qubasa-Qubasa-main into main 2023-08-27 13:12:09 +00:00
Luis-Hebendanz
ce19e5602a clan-cli: Fixed CORS issue. UI: Readded id as tableData property 2023-08-27 15:10:15 +02:00
clan-bot
ab90244486 Merge pull request 'ruff: enable upgrade rule checks' (#200) from Mic92-main into main 2023-08-27 08:53:49 +00:00
Jörg Thalheim
b7212b9988 ruff: also enforce variable naming rules 2023-08-27 10:51:47 +02:00
Jörg Thalheim
9913a95cc2 ruff: enable upgrade rule checks 2023-08-27 10:46:53 +02:00
clan-bot
612d7afde0 Merge pull request 'pytest: report slow tests and set a 30 timeout' (#199) from Mic92-main into main 2023-08-27 08:43:19 +00:00
Jörg Thalheim
bac0942033 pytest: report slow tests and set a 30 timeout 2023-08-27 10:41:32 +02:00
clan-bot
e3f9a5bb64 Merge pull request 'ui: drop non-flake fallback' (#198) from Mic92-main into main 2023-08-27 08:29:21 +00:00
Jörg Thalheim
75f79abcc6 ui: drop non-flake fallback
I don't think nix-build gets regulally tested and I don't see how it would work without having clanPkgs available
2023-08-27 10:27:34 +02:00
clan-bot
91e7cdb3e9 Merge pull request 'fix uneccessary clan-cli rebuilds by not relying on self' (#197) from Mic92-main into main 2023-08-27 08:22:42 +00:00
Jörg Thalheim
4735586dac fix uneccessary clan-cli rebuilds by not relying on self 2023-08-27 10:21:02 +02:00
clan-bot
b1823edfff Merge pull request 'reduce impure tests to just instantiate the template' (#196) from Mic92-main into main 2023-08-27 08:18:19 +00:00
Jörg Thalheim
c9adf12e72 reduce impure tests to just instantiate the template 2023-08-27 10:11:45 +02:00
clan-bot
1f1708f17e Merge pull request 'rename checks-integration -> checks-impure' (#195) from Mic92-main into main 2023-08-27 08:01:43 +00:00
Jörg Thalheim
4cc40865f5 rename checks-integration -> checks-impure
I think we should not use this for all integration tests
2023-08-27 10:00:22 +02:00
clan-bot
0a5af93a10 Merge pull request 'tests: rewrite port allocation function' (#194) from Mic92-main into main 2023-08-27 07:47:23 +00:00
Jörg Thalheim
9cc6a14d73 run pytest in parallel 2023-08-27 09:45:15 +02:00
Jörg Thalheim
81d02bb218 tests: rewrite port allocation function 2023-08-27 09:34:36 +02:00
clan-bot
11dd70bf43 Merge pull request 'checks-integration: init' (#193) from DavHau-main into main 2023-08-26 22:25:51 +00:00
DavHau
7928e953fa checks-integration: init 2023-08-27 00:24:19 +02:00
clan-bot
df628ffd96 Merge pull request 'templates/new-clan: auto load all machines from ./machines' (#192) from DavHau-main into main 2023-08-26 21:42:13 +00:00
DavHau
b3f08712c5 templates/new-clan: auto load all machines from ./machines 2023-08-26 23:40:29 +02:00
clan-bot
c018301d1c Merge pull request 'clan-config: use pinned nixpkgs + fix test flake' (#191) from DavHau-main into main 2023-08-26 21:35:13 +00:00
DavHau
b55ceec40c clan-config: use pinned nixpkgs + fix test flake 2023-08-26 23:33:32 +02:00
clan-bot
97d8d128b6 Merge pull request 'consistent naming & strucutre' (#190) from chore/refactor into main 2023-08-26 13:56:24 +00:00
Johannes Kirschbauer
592cf867e5 fix some minor errors 2023-08-26 15:55:03 +02:00
Johannes Kirschbauer
337f6e4600 fix import error 2023-08-26 15:50:48 +02:00
Johannes Kirschbauer
87cce983e9 consistent naming & strucutre 2023-08-26 15:46:10 +02:00
clan-bot
720719d5f9 Merge pull request 'webui: fixes for machines endpoint' (#189) from DavHau-main into main 2023-08-26 12:19:07 +00:00
DavHau
8c7ee25dc9 webui: fixes for machines endpoint
- fix machines settings file location
- raise 404 if machine doesn't exist
- improve machine api test
2023-08-26 14:17:25 +02:00
clan-bot
2b2584a0ba Merge pull request 'ui: add documentation on how to upload assets' (#187) from Mic92-static-assets into main 2023-08-26 10:45:13 +00:00
Jörg Thalheim
aabe80d168 ui: add documentation on how to upload assets 2023-08-26 12:43:39 +02:00
clan-bot
8f5d9f714b Merge pull request 'clan-cli: add README' (#186) from Mic92-static-assets into main 2023-08-26 10:39:46 +00:00
Jörg Thalheim
b1f11851fb clan-cli: add README 2023-08-26 12:38:11 +02:00
clan-bot
65fc505e06 Merge pull request 'integrate static assets into webui command' (#185) from Mic92-static-assets into main 2023-08-26 10:27:51 +00:00
Jörg Thalheim
9ae14a4f7d integrate static assets into webui command 2023-08-26 12:24:57 +02:00
clan-bot
79b02dffab Merge pull request 'replace environment variable with nixpkgs directory' (#183) from Mic92-main into main 2023-08-26 09:47:58 +00:00
Jörg Thalheim
672e760e2a replace mock_env with monkeypatch 2023-08-26 11:45:09 +02:00
Jörg Thalheim
fb7c77690a replace environment variable with nixpkgs directory
In this directory we generate all the files that we need to load nixpkgs.
This seems more robust than all those environment variables that may or not may be set.
2023-08-26 11:45:09 +02:00