Integrate vm02116 (Forgejo) and vm02187 (Wiki) to the infra/ directory and deployments (#11)

infra/README.org

@@ -7,12 +7,18 @@ Their configuration can be updated via NixOps4. Run
 nixops4 deployments list
 #+end_src
 
-to see the available deployments. Given a deployment (eg. ~actions-runners~), run
+to see the available deployments. Given a deployment (eg. ~git~), run
 
 #+begin_src sh
 nixops4 apply <deployment>
 #+end_src
 
+* Deployments
+
+- ~git~ :: Machines hosting our Git infrastructure, eg. Forgejo and its actions
+  runners
+- ~web~ :: Machines hosting our online content, eg. the website or the wiki
+
 * Procolix machines
 
 These machines are hosted on the Procolix Proxmox instance, to which
@@ -20,6 +26,8 @@ non-Procolix members of the project do not have access. They host our stable
 infrastructure.
 
 | Machine | Description            | Deployment |
-|---------+------------------------+-----------------|
+|---------+------------------------+------------|
-| vm02179 | Forgejo actions runner | actions-runners |
+| vm02116 | Forgejo                | ~git~        |
-| vm02186 | Forgejo actions runner | actions-runners |
+| vm02179 | Forgejo actions runner | ~git~        |
+| vm02186 | Forgejo actions runner | ~git~        |
+| vm02187 | Wiki                   | ~web~        |

infra/flake-part.nix

@@ -1,12 +1,30 @@
 { inputs, ... }:
 
 {
-  nixops4Deployments.actions-runners =
+  nixops4Deployments.git =
     { providers, ... }:
     {
       providers.local = inputs.nixops4-nixos.modules.nixops4Provider.local;
 
       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 = {
           type = providers.local.exec;
           imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ];
@@ -44,4 +62,29 @@
         };
       };
     };
+
+  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 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN24ZfdQNklKkIqfMg/+0vqENuDcy6fhT6SfAq01ae83";
+          };
+          nixpkgs = inputs.nixpkgs;
+          nixos.module = {
+            imports = [
+              ./vm02187/configuration.nix
+              ./vm02187/hardware-configuration.nix
+            ];
+          };
+        };
+      };
+    };
 }

infra/vm02116/configuration.nix

@@ -2,11 +2,11 @@
 # 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`).
 
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [ # Include the results of the hardware scan.
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     # This will install and configure Forgejo
     ./forgejo.nix
@@ -53,7 +53,10 @@
       address = "2a00:51c0:12:1201::1";
       interface = "eth0";
     };
-    nameservers = [ "2a00:51c0::5fd7:b906" "95.215.185.7" ];
+    nameservers = [
+      "2a00:51c0::5fd7:b906"
+      "95.215.185.7"
+    ];
     firewall.enable = false;
     nftables = {
       enable = true;
@@ -131,7 +134,6 @@
     };
   };
 
-
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
@@ -150,9 +152,6 @@
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
 
-
-  
-
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
   # services.xserver.xkb.options = "eurosign:e,caps:escape";
@@ -179,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:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -196,7 +200,8 @@
         " ...
       '';
     })
-    wget subversion
+    wget
+    subversion
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -223,11 +228,6 @@
   # Or disable the firewall altogether.
   # 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,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
   #
@@ -247,4 +247,3 @@
   system.stateVersion = "24.05";
 
 }
-

infra/vm02116/forgejo.nix

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

infra/vm02116/hardware-configuration.nix

@@ -1,23 +1,28 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, ... }:
 
 {
   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.kernelModules = [ ];
   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";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/2CE2-1173";
+    device = "/dev/disk/by-uuid/2CE2-1173";
     fsType = "vfat";
   };
 

infra/vm02187/configuration.nix

@@ -1,13 +1,12 @@
-
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  imports =
+  imports = [
-    [ # Include the results of the hardware scan.
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
@@ -62,7 +61,9 @@
   services.nginx = {
     enable = true;
     virtualHosts."wiki.fediversity.eu" = {
-      basicAuth = { fediv = "SecretSauce123!"; };
+      basicAuth = {
+        fediv = "SecretSauce123!";
+      };
       forceSSL = true;
       enableACME = true;
     };
@@ -106,7 +107,10 @@
       address = "2a00:51c0:12:1201::1";
       interface = "eth0";
     };
-    nameservers = [ "95.215.185.6" "95.215.185.7" ];
+    nameservers = [
+      "95.215.185.6"
+      "95.215.185.7"
+    ];
     firewall.enable = false;
     nftables = {
       enable = true;
@@ -184,7 +188,6 @@
     };
   };
 
-
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
 
@@ -192,7 +195,13 @@
   i18n.defaultLocale = "en_US.UTF-8";
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.root.hashedPassword = "$y$j9T$WXvLAUqArJJusuC017FCW0$.rfMOeyx/BsClkJFi5hLcynrSk.njWmfiB6Uy.9th3A";
+  users.users.root = {
+    hashedPassword = "$y$j9T$WXvLAUqArJJusuC017FCW0$.rfMOeyx/BsClkJFi5hLcynrSk.njWmfiB6Uy.9th3A";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEElREJN0AC7lbp+5X204pQ5r030IbgCllsIxyU3iiKY"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJg5TlS1NGCRZwMjDgBkXeFUXqooqRlM8fJdBAQ4buPg"
+    ];
+  };
 
   users.users.procolix = {
     isNormalUser = true;
@@ -202,8 +211,7 @@
       "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAotfCIjLoDlHOe+++kVS1xiBPaS8mC5FypgrxDrDVst6SHxMTca2+IScMajzUZajenvNAoZOwIsyAPacT8OHeyFvV5Y7G874Qa+cZVqJxLht9gdXxr1GNabU3RfhhCh272dUeIKIqfgsRsM2HzdnZCMDavS1Yo+f+RhhHhnJIua+NdVFo21vPrpsz+Cd0M1NhojARLajrTHvEXW0KskUnkbfgxT0vL9jeRZxdgMS+a9ZoR5dbzOxQHWfbP8N04Xc+7CweMlvKwlWuAE/xDb5XLNHorfGWFvZuVhptJN8jPaaVS25wsmsF5IbaAuSZfzCtBdFQhIloUhy0L6ZisubHjQ== procolix@sshnode1"
       "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuT3C0f3nyQ7SwUvXcFmEYEgwL+crY6iK0Bhoi9yfn4soz3fhfMKyKSwc/0RIlRnrz3xnkyJiV0vFeU7AC1ixbGCS3T9uc0G1x0Yedd9n2yR8ZJmkdyfjZ5KE4YvqZ3f6UZn5Mtj+7tGmyp+ee+clLSHzsqeyDiX0FIgFmqiiAVJD6qeKPFAHeWz9b2MOXIBIw+fSLOpx0rosCgesOmPc8lgFvo+dMKpSlPkCuGLBPj2ObT4sLjc98NC5z8sNJMu3o5bMbiCDR9JWgx9nKj+NlALwk3Y/nzHSL/DNcnP5vz2zbX2CBKjx6ju0IXh6YKlJJVyMsH9QjwYkgDQVmy8amQ== procolix@sshnode2"
     ];
-    packages = with pkgs; [
+    packages = with pkgs; [ ];
-    ];
   };
 
   # List packages installed in system profile. To search, run:
@@ -231,11 +239,6 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
-  # 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 value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -245,4 +248,3 @@
   system.stateVersion = "24.05"; # Did you read the comment?
 
 }
-

infra/vm02187/hardware-configuration.nix

@@ -1,27 +1,35 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [
+    "ata_piix"
+    "uhci_hcd"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
+    device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/6AB5-4FA8";
+    device = "/dev/disk/by-uuid/6AB5-4FA8";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ ];