forked from fediversity/fediversity
Compare commits
7 commits
c37f0ac03a
...
5a72f1bd2c
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a72f1bd2c | |||
| 5f3f96573f | |||
| 8091eb7292 | |||
| ef50336139 | |||
| 0f38077b7b | |||
| fbdbd5fe3b | |||
| 3b719cea53 |
4 changed files with 10 additions and 14 deletions
|
|
@ -43,7 +43,7 @@ jobs:
|
||||||
runs-on: native
|
runs-on: native
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- run: nix-build -A tests.panel
|
- run: nix-build panel -A tests
|
||||||
|
|
||||||
check-deployment-basic:
|
check-deployment-basic:
|
||||||
runs-on: native
|
runs-on: native
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ let
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
inherit (import sources.flake-inputs) import-flake;
|
inherit (import sources.flake-inputs) import-flake;
|
||||||
inherit ((import-flake { src = ./.; }).inputs) nixops4;
|
inherit ((import-flake { src = ./.; }).inputs) nixops4;
|
||||||
panel = import ./panel { inherit sources system; };
|
|
||||||
pre-commit-check =
|
pre-commit-check =
|
||||||
(import "${git-hooks}/nix" {
|
(import "${git-hooks}/nix" {
|
||||||
inherit nixpkgs system;
|
inherit nixpkgs system;
|
||||||
|
|
@ -72,7 +71,6 @@ in
|
||||||
|
|
||||||
tests = {
|
tests = {
|
||||||
inherit pre-commit-check;
|
inherit pre-commit-check;
|
||||||
panel = panel.tests;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# re-export inputs so they can be overridden granularly
|
# re-export inputs so they can be overridden granularly
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,9 @@
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
system,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
checks = {
|
|
||||||
panel = (import ./. { inherit sources system; }).tests.panel.basic;
|
|
||||||
};
|
|
||||||
formatter = pkgs.nixfmt-rfc-style;
|
formatter = pkgs.nixfmt-rfc-style;
|
||||||
|
|
||||||
pre-commit.settings.hooks =
|
pre-commit.settings.hooks =
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,14 @@
|
||||||
# Infra
|
# Infra
|
||||||
|
|
||||||
This directory contains the definition of [the VMs](../machines/machines.md) that host our
|
This directory contains the definition of [the VMs](machines.md) that host our
|
||||||
infrastructure.
|
infrastructure.
|
||||||
|
|
||||||
## Provisioning VMs with an initial configuration
|
## Provisioning VMs with an initial configuration
|
||||||
|
|
||||||
> NOTE[Niols]: This is still very manual and clunky. Two things will happen:
|
NOTE[Niols]: This is very manual and clunky. Two things will happen. In the near
|
||||||
> 1. In the near future, I will improve the provisioning script to make this a bit less clunky.
|
future, I will improve the provisioning script to make this a bit less clunky.
|
||||||
> 2. In the far future, NixOps4 will be able to communicate with Proxmox directly and everything will become much cleaner.
|
In the far future, NixOps4 will be able to communicate with Proxmox directly and
|
||||||
|
everything will become much cleaner.
|
||||||
|
|
||||||
1. Choose names for your VMs. It is recommended to choose `fediXXX`, with `XXX`
|
1. Choose names for your VMs. It is recommended to choose `fediXXX`, with `XXX`
|
||||||
above 100. For instance, `fedi117`.
|
above 100. For instance, `fedi117`.
|
||||||
|
|
@ -24,7 +25,8 @@ infrastructure.
|
||||||
Those files need to exist during provisioning, but their content matters only
|
Those files need to exist during provisioning, but their content matters only
|
||||||
when updating the machines' configuration.
|
when updating the machines' configuration.
|
||||||
|
|
||||||
> FIXME: Remove this step by making the provisioning script not fail with the public key does not exist yet.
|
FIXME: Remove this step by making the provisioning script not fail with the
|
||||||
|
public key does not exist yet.
|
||||||
|
|
||||||
3. Run the provisioning script:
|
3. Run the provisioning script:
|
||||||
```
|
```
|
||||||
|
|
@ -42,7 +44,7 @@ infrastructure.
|
||||||
ssh fedi117.abundos.eu 'sudo cat /etc/ssh/ssh_host_ed25519_key.pub' > keys/systems/fedi117.pub
|
ssh fedi117.abundos.eu 'sudo cat /etc/ssh/ssh_host_ed25519_key.pub' > keys/systems/fedi117.pub
|
||||||
```
|
```
|
||||||
|
|
||||||
> FIXME: Make the provisioning script do that for us.
|
FIXME: Make the provisioning script do that for us.
|
||||||
|
|
||||||
7. Regenerate the list of machines:
|
7. Regenerate the list of machines:
|
||||||
```
|
```
|
||||||
|
|
@ -54,7 +56,7 @@ infrastructure.
|
||||||
just enough for it to boot and be reachable. Go on to the next section to
|
just enough for it to boot and be reachable. Go on to the next section to
|
||||||
update the machine and put an actual configuration.
|
update the machine and put an actual configuration.
|
||||||
|
|
||||||
> FIXME: Figure out why the full configuration isn't on the machine at this
|
FIXME: Figure out why the full configuration isn't on the machine at this
|
||||||
point and fix it.
|
point and fix it.
|
||||||
|
|
||||||
## Updating existing VM configurations
|
## Updating existing VM configurations
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue