Discontinue two old actions runners

This commit is contained in:
Nicolas Jeannerod 2024-12-16 13:06:35 +01:00
parent 732760bc0c
commit f1f0611bbc
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
4 changed files with 39 additions and 32 deletions

View file

@ -18,6 +18,7 @@ nixops4 apply <deployment>
- ~git~ :: Machines hosting our Git infrastructure, eg. Forgejo and its actions - ~git~ :: Machines hosting our Git infrastructure, eg. Forgejo and its actions
runners runners
- ~web~ :: Machines hosting our online content, eg. the website or the wiki - ~web~ :: Machines hosting our online content, eg. the website or the wiki
- ~other~ :: Machines without a specific purpose
* Procolix machines * Procolix machines
@ -27,7 +28,7 @@ infrastructure.
| Machine | Description | Deployment | | Machine | Description | Deployment |
|---------+------------------------+------------| |---------+------------------------+------------|
| vm02116 | Forgejo | ~git~ | | vm02116 | Forgejo | ~git~ |
| vm02179 | Forgejo actions runner | ~git~ | | vm02179 | /unused/ | ~other~ |
| vm02186 | Forgejo actions runner | ~git~ | | vm02186 | /unused/ | ~other~ |
| vm02187 | Wiki | ~web~ | | vm02187 | Wiki | ~web~ |

View file

@ -24,7 +24,41 @@
]; ];
}; };
}; };
};
};
nixops4Deployments.web =
{ providers, ... }:
{
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = {
vm02187 = {
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.187";
opts = "";
hostPublicKey = self.keys.systems.vm02187;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02187
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02187; }
];
};
};
};
};
nixops4Deployments.other =
{ providers, ... }:
{
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = {
vm02179 = { vm02179 = {
type = providers.local.exec; type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ]; imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
@ -62,30 +96,4 @@
}; };
}; };
}; };
nixops4Deployments.web =
{ providers, ... }:
{
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = {
vm02187 = {
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.187";
opts = "";
hostPublicKey = self.keys.systems.vm02187;
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02187
self.nixosModules.ageSecrets
{ fediversity.hostPublicKey = self.keys.systems.vm02187; }
];
};
};
};
};
} }

View file

@ -1,7 +1,6 @@
{ {
imports = [ imports = [
../common ../common
./gitea-runner.nix
]; ];
procolix.vm = { procolix.vm = {

View file

@ -1,7 +1,6 @@
{ {
imports = [ imports = [
../common ../common
./gitea-runner.nix
]; ];
procolix.vm = { procolix.vm = {