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

Add Forgejo machine to the infra/ directory

Browse source
This commit is contained in:
Nicolas Jeannerod 2024-11-18 12:11:32 +01:00
parent 771708c557
commit c2f820b85d
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
4 changed files with 51 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
infra/README.org
View file

@ -21,5 +21,6 @@ infrastructure.
| Machine | Description | Deployment | | Machine | Description | Deployment |
|---------+------------------------+-----------------| |---------+------------------------+-----------------|
| vm02116 | Forgejo | /none/ |
| vm02179 | Forgejo actions runner | actions-runners | | vm02179 | Forgejo actions runner | actions-runners |
| vm02186 | Forgejo actions runner | actions-runners | | vm02186 | Forgejo actions runner | actions-runners |

19
forgejo/configuration.nix → infra/vm02116/configuration.nix
View file

@ -2,11 +2,11 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
# This will install and configure Forgejo # This will install and configure Forgejo
./forgejo.nix ./forgejo.nix
@ -53,7 +53,10 @@
address = "2a00:51c0:12:1201::1"; address = "2a00:51c0:12:1201::1";
interface = "eth0"; interface = "eth0";
}; };
nameservers = [ "2a00:51c0::5fd7:b906" "95.215.185.7" ]; nameservers = [
"2a00:51c0::5fd7:b906"
"95.215.185.7"
];
firewall.enable = false; firewall.enable = false;
nftables = { nftables = {
enable = true; enable = true;
@ -131,7 +134,6 @@
}; };
}; };
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
@ -150,9 +152,6 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
# services.xserver.enable = true; # services.xserver.enable = true;
# Configure keymap in X11 # Configure keymap in X11
# services.xserver.xkb.layout = "us"; # services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape"; # services.xserver.xkb.options = "eurosign:e,caps:escape";
@ -196,7 +195,8 @@
" ... " ...
''; '';
}) })
wget subversion wget
subversion
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -247,4 +247,3 @@
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }

3
forgejo/forgejo.nix → infra/vm02116/forgejo.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
let let
domain = "git.fediversity.eu"; domain = "git.fediversity.eu";
in in
@ -91,4 +91,3 @@ in
}; };
}; };
} }

17
forgejo/hardware-configuration.nix → infra/vm02116/hardware-configuration.nix
View file

@ -1,23 +1,28 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { lib, ... }:
{ {
imports = [ ]; imports = [ ];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "sr_mod" "xen_blkfront" ]; boot.initrd.availableKernelModules = [
"ata_piix"
"uhci_hcd"
"sr_mod"
"xen_blkfront"
];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853"; device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/2CE2-1173"; device = "/dev/disk/by-uuid/2CE2-1173";
fsType = "vfat"; fsType = "vfat";
}; };