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

Cleanup and consolidate remaining configurations (#23)

Browse source
This commit is contained in:
Nicolas Jeannerod 2024-11-21 12:14:22 +01:00
parent d2638845d0 5bc7f954bd
commit da25f9221a
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
9 changed files with 51 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
infra/flake-part.nix
View file

@ -17,11 +17,7 @@
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02116/configuration.nix
./vm02116/forgejo.nix
./vm02116/hardware-configuration.nix
];
imports = [ ./vm02116 ];
};
};
@ -35,11 +31,7 @@
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02179/configuration.nix
./vm02179/hardware-configuration.nix
./vm02179/gitea-runner.nix
];
imports = [ ./vm02179 ];
};
};
@ -53,11 +45,7 @@
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02186/procolix-configuration.nix
./vm02186/hardware-configuration.nix
./vm02186/gitea-runner.nix
];
imports = [ ./vm02186 ];
};
};
};
@ -79,10 +67,7 @@
};
nixpkgs = inputs.nixpkgs;
nixos.module = {
imports = [
./vm02187/configuration.nix
./vm02187/hardware-configuration.nix
];
imports = [ ./vm02187 ];
};
};
};

15
infra/vm02116/configuration.nix → infra/vm02116/default.nix
View file

@ -1,5 +1,8 @@
{
imports = [ ../common ];
imports = [
../common
./forgejo.nix
];
procolix.vm = {
name = "vm02116";
@ -12,4 +15,14 @@
## two options can safely be removed.
boot.initrd.availableKernelModules = [ "xen_blkfront" ];
services.xe-guest-utilities.enable = true;
fileSystems."/" = {
device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2CE2-1173";
fsType = "vfat";
};
}

11
infra/vm02116/hardware-configuration.nix
View file

@ -1,11 +0,0 @@
{
fileSystems."/" = {
device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2CE2-1173";
fsType = "vfat";
};
}

9
infra/vm02179/configuration.nix
View file

@ -1,9 +0,0 @@
{
imports = [ ../common ];
procolix.vm = {
name = "vm02179";
ip4 = "185.206.232.179";
ip6 = "2a00:51c0:12:1201::179";
};
}

11
infra/vm02179/hardware-configuration.nix → infra/vm02179/default.nix
View file

@ -1,4 +1,15 @@
{
imports = [
../common
./gitea-runner.nix
];
procolix.vm = {
name = "vm02179";
ip4 = "185.206.232.179";
ip6 = "2a00:51c0:12:1201::179";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241";
fsType = "ext4";

11
infra/vm02186/hardware-configuration.nix → infra/vm02186/default.nix
View file

@ -1,4 +1,15 @@
{
imports = [
../common
./gitea-runner.nix
];
procolix.vm = {
name = "vm02186";
ip4 = "185.206.232.186";
ip6 = "2a00:51c0:12:1201::186";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/833ac0f9-ad8c-45ae-a9bf-5844e378c44a";
fsType = "ext4";

9
infra/vm02186/procolix-configuration.nix
View file

@ -1,9 +0,0 @@
{
imports = [ ../common ];
procolix.vm = {
name = "vm02186";
ip4 = "185.206.232.186";
ip6 = "2a00:51c0:12:1201::186";
};
}

11
infra/vm02187/hardware-configuration.nix → infra/vm02187/default.nix
View file

@ -1,4 +1,15 @@
{
imports = [
../common
./wiki.nix
];
procolix.vm = {
name = "vm02187";
ip4 = "185.206.232.187";
ip6 = "2a00:51c0:12:1201::187";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
fsType = "ext4";

8
infra/vm02187/configuration.nix → infra/vm02187/wiki.nix
View file

@ -1,14 +1,6 @@
{ pkgs, ... }:
{
imports = [ ../common ];
procolix.vm = {
name = "vm02187";
ip4 = "185.206.232.187";
ip6 = "2a00:51c0:12:1201::187";
};
services.phpfpm.pools.mediawiki.phpOptions = ''
upload_max_filesize = 1024M;
post_max_size = 1024M;