hans/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Add Forgejo machine to git deployment

Browse source 
This deployment is the old `actions-runners` deployment, renamed.
This commit is contained in:
Nicolas Jeannerod 2024-11-18 11:44:35 +01:00
parent 47bca471da
commit 2ffab40687
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
3 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
infra/README.org
View file

@ -13,15 +13,20 @@ to see the available deployments. Given a deployment (eg. ~actions-runners~), ru
nixops4 apply <deployment> nixops4 apply <deployment>
#+end_src #+end_src
* Deployments
- ~git~ :: Machines hosting our Git infrastructure, eg. Forgejo and its actions
runners
* Procolix machines * Procolix machines
These machines are hosted on the Procolix Proxmox instance, to which These machines are hosted on the Procolix Proxmox instance, to which
non-Procolix members of the project do not have access. They host our stable non-Procolix members of the project do not have access. They host our stable
infrastructure. infrastructure.
| Machine | Description | Deployment | | Machine | Description | Deployment |
|---------+------------------------+-----------------| |---------+------------------------+------------|
| vm02116 | Forgejo | /none/ | | vm02116 | Forgejo | ~git~ |
| vm02179 | Forgejo actions runner | actions-runners | | vm02179 | Forgejo actions runner | ~git~ |
| vm02186 | Forgejo actions runner | actions-runners | | vm02186 | Forgejo actions runner | ~git~ |
| vm02187 | Wiki | /none/ | | vm02187 | Wiki | /none/ |

20
infra/flake-part.nix
View file

@ -1,12 +1,30 @@
{ inputs, ... }: { inputs, ... }:
{ {
nixops4Deployments.actions-runners = nixops4Deployments.git =
{ providers, ... }: { providers, ... }:
{ {
providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local; providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
resources = { resources = {
vm02116 = {
type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
ssh = {
host = "185.206.232.34";
opts = "";
hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILriawl1za2jbxzelkL5v8KPmcvuj7xVBgwFxuM/zhYr";
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02116/configuration.nix
./vm02116/forgejo.nix
./vm02116/hardware-configuration.nix
];
};
};
vm02179 = { vm02179 = {
type = providers.local.exec; type = providers.local.exec;
imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ]; imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];

10
infra/vm02116/configuration.nix
View file

@ -178,6 +178,11 @@
}; };
}; };
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEElREJN0AC7lbp+5X204pQ5r030IbgCllsIxyU3iiKY"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJg5TlS1NGCRZwMjDgBkXeFUXqooqRlM8fJdBAQ4buPg"
];
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -223,11 +228,6 @@
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
system.copySystemConfiguration = true;
# This option defines the first version of NixOS you have installed on this particular machine, # This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
# #