Commit Graph

  • 6a220d1a0b Merge pull request 'Removed workflow' (#308) from Qubasa-Qubasa-main into main clan-bot 2023-09-19 13:48:52 +00:00
  • ad2218cca9 UI: Renamed ui from my-app to clan-ui Luis-Hebendanz 2023-09-19 15:46:15 +02:00
  • 4a0949f5dc Merge pull request 'clan-cli/update: also use correct flake attr for generating secret' (#307) from Mic92-deploy-fix into main clan-bot 2023-09-19 13:32:18 +00:00
  • 63b6b14109 Merge branch 'main' of git.clan.lol:clan/clan-core into Qubasa-main Luis-Hebendanz 2023-09-19 15:30:25 +02:00
  • 3cb916d50f clan-cli/update: also use correct flake attr for generating secret Jörg Thalheim 2023-09-19 14:46:46 +02:00
  • 07d5b2bf1c Merge pull request 'docs: fixes in quickstart and secrets-management' (#303) from DavHau-dave into main clan-bot 2023-09-19 13:15:48 +00:00
  • c11f73c4d0 clan config: fix settings file location DavHau 2023-09-19 11:53:10 +02:00
  • 9b6fafcb2d clan config: re-enable clan config DavHau 2023-09-19 11:29:59 +02:00
  • 76ee9893f2 docs/secrets-management: machine -> machines DavHau 2023-09-19 11:04:33 +02:00
  • dfa3b2acaa quickstart: fixes DavHau 2023-09-19 11:04:07 +02:00
  • 175119b72c Merge pull request 'clan-cli/update: use correct flake attr when deploying' (#306) from Mic92-deploy-fix into main clan-bot 2023-09-19 12:24:23 +00:00
  • de069af7a3 Merge branch 'main' into Mic92-deploy-fix Mic92 2023-09-19 12:23:40 +00:00
  • 2931b08b46 clan-cli/update: use correct flake attr when deploying Jörg Thalheim 2023-09-19 14:15:15 +02:00
  • 06bb3c52bf Merge pull request 'Automatic flake update - 2023-09-18T00:00+00:00' (#301) from flake-update-2023-09-18 into main clan-bot 2023-09-19 11:34:50 +00:00
  • e66d61bb69 update flake lock - 2023-09-18T00:00+00:00 Clan Merge Bot 2023-09-18 00:00:13 +00:00
  • 4c95896e1a Merge pull request 'devShell: use rm -f to clean up old pre-commit file' (#304) from Mic92-vm-api into main clan-bot 2023-09-19 11:30:53 +00:00
  • 81bc0d7ea4 devShell: use rm -f to clean up old pre-commit file Jörg Thalheim 2023-09-19 13:19:24 +02:00
  • 90718da5b4 Merge pull request 'use experimental flags everywhere' (#298) from Mic92-vm-api into main clan-bot 2023-09-19 11:16:30 +00:00
  • e753b9a87f try to fix ci by pinning nix-fast-build Jörg Thalheim 2023-09-19 13:02:11 +02:00
  • f6a7e42e38 cli: rename admin create to create Jörg Thalheim 2023-09-15 16:36:09 +02:00
  • 164f95723d pytest: add impure marker Jörg Thalheim 2023-09-15 16:42:58 +02:00
  • d41cca2e28 add clan_core path helper function Jörg Thalheim 2023-09-15 16:34:16 +02:00
  • a65413c98e use experimental flags everywhere Jörg Thalheim 2023-09-15 16:22:05 +02:00
  • 4a1dcc1639 Merge pull request 'add join clan page' (#300) from feat/join-ui into main clan-bot 2023-09-16 14:31:33 +00:00
  • 18714d6657 reformat Johannes Kirschbauer 2023-09-16 16:28:19 +02:00
  • 3db0285a3b merge conflicts Johannes Kirschbauer 2023-09-16 16:24:02 +02:00
  • 1bcff16b66 add join clan page Johannes Kirschbauer 2023-09-16 16:21:33 +02:00
  • 8dc70659d4 Merge pull request 'extend dev CORS flag to include methods' (#299) from cors into main Mic92 2023-09-16 08:59:52 +00:00
  • 32b2e4c084 extend dev CORS flag to include methods Jörg Thalheim 2023-09-16 10:56:39 +02:00
  • 447d071ea3 Merge pull request 'vm api' (#292) from vm-api into main Mic92 2023-09-15 14:02:40 +00:00
  • a29f301f84 add vms Jörg Thalheim 2023-09-14 16:57:19 +02:00
  • b46c40482a Merge pull request 'nix_build: add experimental flags' (#297) from nix-build into main Mic92 2023-09-15 13:55:37 +00:00
  • 8a96254100 nix_build: add experimental flags Jörg Thalheim 2023-09-15 14:21:15 +02:00
  • 5dc72b092b Merge pull request 'secrets: add password-store & deploy command' (#263) from lassulus-pass-secrets into main Mic92 2023-09-15 12:17:07 +00:00
  • 8d29d0e69c clan-cli: get deploymentAddress from clan.networking lassulus 2023-09-14 16:57:38 +02:00
  • 0132abc547 secrets: use CLAN_DIR instead of clanCore.clanDir for fact storage lassulus 2023-09-14 15:22:13 +02:00
  • 6b7301cefb clanCore secrets: document custom store lassulus 2023-09-14 14:15:51 +02:00
  • a59e8478fa clan-cli nix_build_machine: don't create result link lassulus 2023-09-14 13:51:13 +02:00
  • c5c2a848c7 secrets pass: append openssh to PATH so we use systems openssh first lassulus 2023-09-14 13:49:57 +02:00
  • c5786614bf clan-cli secrets: deploy -> upload lassulus 2023-09-14 13:49:20 +02:00
  • 55fc055549 clan_cli/nix: convert path to string lassulus 2023-09-14 10:42:04 +02:00
  • acf1c0b87a lib jsonschema: add path lassulus 2023-09-14 10:37:16 +02:00
  • c487280ba9 clan-cli machines update: generate and deploy secrets lassulus 2023-09-13 23:19:39 +02:00
  • 0e3f8bb3f9 clan-cli nix_build_machine: cast flake_url to str lassulus 2023-09-13 23:18:54 +02:00
  • 23c979f8db secrets deploy/generate: use nix_build_machine lassulus 2023-09-13 23:18:05 +02:00
  • 6153a9ee71 clanCore.secrets: set default and add generate/deploy composite lassulus 2023-09-13 23:16:56 +02:00
  • 3b0701f275 deploy: use nix-flake-archive instead of rsync to upload Jörg Thalheim 2023-09-13 20:33:51 +02:00
  • ac13c5b76b clan-cli secrets: add deploy subcommand lassulus 2023-09-11 21:44:39 +02:00
  • 285041026d clanCore sops: add dummy deployScript lassulus 2023-09-11 21:42:45 +02:00
  • 798e85ee8a clan secrets generate: use get_clan_flake_toplevel lassulus 2023-09-09 15:38:28 +02:00
  • 5285423479 secrets: add password-store implementation lassulus 2023-09-06 16:09:43 +02:00
  • 3f6fa0eeca clanCore secrets: add secretStore option lassulus 2023-09-06 16:08:36 +02:00
  • a043368ed6 Merge pull request 'nix_eval: add --json by default' (#296) from Mic92-foo into main clan-bot 2023-09-15 11:53:03 +00:00
  • 9b7b6996d6 nix_eval: add --json by default Jörg Thalheim 2023-09-15 13:44:04 +02:00
  • 39271fe2dc Merge pull request 'add ipdb to python breakpoint()' (#295) from Mic92-ipdb-breakpoint into main clan-bot 2023-09-15 11:46:57 +00:00
  • a8ba56de63 add ipdb to python breakpoint() Jörg Thalheim 2023-09-15 13:44:47 +02:00
  • 1d1056b6fa Merge pull request 'cli: rename clan_flake to test_flake' (#294) from Mic92-test_flake into main clan-bot 2023-09-15 10:38:09 +00:00
  • 87f0b090ef cli: rename clan_flake to test_flake Jörg Thalheim 2023-09-15 12:31:18 +02:00
  • 54ac8b6269 Merge pull request 'drop useless test_update test' (#291) from Mic92-clan-fixture into main clan-bot 2023-09-14 15:28:25 +00:00
  • 2697ad54b7 drop useless test_update test Jörg Thalheim 2023-09-14 17:25:46 +02:00
  • 28bc5fa058 Merge pull request 'rename machine_flake back to clan_flake' (#290) from Mic92-clan-fixture into main clan-bot 2023-09-14 15:07:56 +00:00
  • 02f421546c rename machine_flake back to clan_flake Jörg Thalheim 2023-09-14 17:04:04 +02:00
  • f9a5362245 Merge pull request 'drop clan_flake fixture' (#289) from Mic92-clan-fixture into main clan-bot 2023-09-14 15:00:29 +00:00
  • 2048ffccb0 drop clan_flake fixture Jörg Thalheim 2023-09-14 16:57:04 +02:00
  • 85f46d69b9 Merge pull request 'move machine_flake fixture to its own file' (#288) from Mic92-flake-archive into main clan-bot 2023-09-14 14:52:15 +00:00
  • 4905e0cecd move machine_flake fixture to its own file Jörg Thalheim 2023-09-14 16:33:40 +02:00
  • 667ada75f5 Merge pull request 'gitignore: use absolute paths' (#287) from Mic92-flake-archive into main clan-bot 2023-09-14 14:29:10 +00:00
  • 837ebda70d gitignore: use absolute paths Jörg Thalheim 2023-09-14 16:28:01 +02:00
  • e6fabdcda5 Merge pull request 'Removed workflow' (#286) from Qubasa-main into main Qubasa 2023-09-14 13:28:11 +00:00
  • fb583a7b34 Removed workflow Luis-Hebendanz 2023-09-14 15:27:53 +02:00
  • 2c80f6feac Removed workflow Luis-Hebendanz 2023-09-14 15:27:53 +02:00
  • b6232899b0 Merge pull request 'Qubasa-main' (#285) from Qubasa-main into main Qubasa 2023-09-14 12:58:24 +00:00
  • ddc5528e05 Fixed push perms error Luis-Hebendanz 2023-09-14 14:57:41 +02:00
  • bcdee2c2a2 Changed to on_push and force Luis-Hebendanz 2023-09-14 14:46:52 +02:00
  • e8e5375600 Merge pull request 'Added assets CI' (#284) from Qubasa-main into main Qubasa 2023-09-14 12:38:54 +00:00
  • c948e645c2 update ui-assets.nix ui_assets[bot] 2023-09-14 12:37:24 +00:00
  • 989f9e20e9 Changed to on_push Luis-Hebendanz 2023-09-14 14:36:18 +02:00
  • e6733bcb6b Added assets CI Luis-Hebendanz 2023-09-14 14:34:40 +02:00
  • 93f501bfbe Merge pull request 'rename test_api_machines test to be consistent with the rest' (#279) from Mic92-flake-archive into main clan-bot 2023-09-14 11:05:29 +00:00
  • 451ecbb691 rename test_api_machines test to be consistent with the rest Jörg Thalheim 2023-09-14 13:02:45 +02:00
  • a66fe90b79 Merge pull request 'update: use run_local command to print executed command' (#278) from Mic92-flake-archive into main clan-bot 2023-09-14 09:23:18 +00:00
  • 2d934d527a update: use run_local command to print executed command Jörg Thalheim 2023-09-14 11:20:27 +02:00
  • b97db58316 deploy: use nix-flake-archive instead of rsync to upload Jörg Thalheim 2023-09-13 20:33:51 +02:00
  • e4e888251e Merge pull request 'nix_build_machine: escape json' (#277) from Mic92-main into main clan-bot 2023-09-13 14:42:42 +00:00
  • 3d071396d0 nix_build_machine: escape json Jörg Thalheim 2023-09-13 16:40:26 +02:00
  • b59298c8db Merge pull request 'add nix_build_machine function' (#275) from Mic92-nix_build_machine into main clan-bot 2023-09-13 14:06:00 +00:00
  • 825caeb63a add nix_build_machine function Jörg Thalheim 2023-09-13 16:01:03 +02:00
  • 0f1c3fcabd Merge pull request 'replace pre-commit hook with hook in pre-create' (#274) from Mic92-pre-commit into main clan-bot 2023-09-13 13:54:57 +00:00
  • f63cfb4462 replace pre-commit hook with hook in pre-create Jörg Thalheim 2023-09-13 15:48:34 +02:00
  • 61367a1f63 Merge pull request 'replace ci script with nix-ci-build' (#268) from nix-ci-build into main Mic92 2023-09-13 11:10:54 +00:00
  • a11a62cd4e replace ci script with nix-ci-build Jörg Thalheim 2023-09-13 11:23:08 +02:00
  • 41a29b5464 Merge pull request 'Fixed nix flake check failure' (#270) from Qubasa-main into main Qubasa 2023-09-13 10:32:41 +00:00
  • 70fe2db135 Fixed nix flake check failure Luis-Hebendanz 2023-09-13 12:24:49 +02:00
  • b16cd35370 Merge pull request 'add missing secrets instruction' (#267) from Mic92-main into main clan-bot 2023-09-13 09:22:47 +00:00
  • 2f9413d2e9 docs/secrets: more consistent formatting Jörg Thalheim 2023-09-13 11:21:19 +02:00
  • 7eac9f6ed9 add missing secrets instruction Jörg Thalheim 2023-09-13 11:19:32 +02:00
  • 28fc8e4592 Merge pull request 'add secrets documentation' (#266) from Mic92-main into main clan-bot 2023-09-13 09:17:14 +00:00
  • 4256f3045f add secrets documentation Jörg Thalheim 2023-09-13 11:15:06 +02:00
  • 7a8eb3500e Merge pull request 'add edit flag to secret cli' (#265) from Mic92-main into main clan-bot 2023-09-13 08:55:19 +00:00
  • 17af763ad1 add edit flag to secret cli Jörg Thalheim 2023-09-13 10:51:50 +02:00